From 1baa968ec54ff2a0f08bdeb6e8cebd987754ed74 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 三月 2025 18:06:27 +0800
Subject: [PATCH] 修改门店添加订单使用优惠券无效的bug

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java |    4 ++++
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java   |    7 ++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
index 98c50fd..75010a6 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.member.controller.console;
 
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.member.service.coupon.CouponService;
@@ -9,6 +10,7 @@
 import com.ruoyi.system.api.domain.dto.MerVerifyMemberCouponDto;
 import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
 import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +26,7 @@
  * @Date 2023/6/27 15:00
  * @Version 1.0
  */
+@Slf4j
 @RestController
 @RequestMapping("/coupon")
 public class CouponController extends BaseController {
@@ -110,6 +113,7 @@
      */
     @PostMapping("/useMemberCoupon")
     public R useMemberCoupon(@RequestBody String memberCouponIds){
+        log.info("修改优惠券使用状态:{}", JSON.toJSONString(memberCouponIds));
         memberCouponService.useMemberCoupon(memberCouponIds);
         return R.ok();
     }
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 2d4ade6..65d1676 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -2670,8 +2670,12 @@
             goodsRealPrice = goodsTotalPrice;
             //优惠券计算
             if (memberCouponId != null) {
-                appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
+                log.info("使用优惠券:{}", memberCouponId);
+                appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId.toString());
+                log.info("匹配的优惠券:{}", JSON.toJSONString(appMemberCouponVo));
                 if (null != appMemberCouponVo && (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId))) {
+                    log.info("可以使用优惠券:{}", JSON.toJSONString(appMemberCouponVo));
+                    couponType = appMemberCouponVo.getCouponType();
                     couponType = appMemberCouponVo.getCouponType();
                     if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) {
                         moneyThreshold = appMemberCouponVo.getMoneyThreshold();
@@ -2841,6 +2845,7 @@
         consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
         //减去优惠券
         if (StringUtils.isNotBlank(memberCouponSJ.toString())) {
+            log.info("修改优惠券使用状态:{}", JSON.toJSONString(memberCouponSJ));
             remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
         }
         //更新会员消费记录

--
Gitblit v1.7.1