From 3367a9f350ca56ab0ea26011530210f5858c7792 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 06 九月 2024 10:43:35 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 9660450..71d5a97 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -40,6 +40,7 @@
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.menber.MemberGrowthRecordService;
import com.mzl.flower.service.point.CustomerPointService;
@@ -153,6 +154,9 @@
@Autowired
private RedisLockService lockService;
+
+ @Autowired
+ private CouponRecordService couponRecordService;
public void changeFlower2Cart(CartSaveDTO dto) {
String userId = SecurityUtils.getUserId();
@@ -560,7 +564,9 @@
private CouponRecordDO useCouponRecord(String orderId, BigDecimal amount, String couponRecordId){
if(StringUtils.isNotEmpty(couponRecordId)){
- //TODO 优惠券使用和验证，如果不符合使用条件需要抛出异常。需调用优惠券使用方法
+ //优惠券使用和验证，如果不符合使用条件需要抛出异常。需调用优惠券使用方法
+ couponRecordService.useCoupon(couponRecordId, orderId, amount);
+ return couponRecordService.getCouponRecordById(couponRecordId);
}
return null;
--
Gitblit v1.9.3