From e1b4e2500a3663c8f50a038d3358f0de8908beeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 23 Nov 2024 11:28:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9C=B8=E7=8E=8B=E9=A4=90=E8=BF=94?=
 =?UTF-8?q?=E8=BF=98=E8=AE=A2=E5=8D=95=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/PayService.java    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 27b0864..9671cf8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -192,6 +192,7 @@ public class PayService {
     private final TbShopCouponService shopCouponService;
     private final MpMemberInMapper mpMemberInMapper;
     private final TbMemberPointsServiceImpl memberPointsService;
+    private final CartService cartService;
 
     @Qualifier("tbShopCouponService")
     @Autowired
@@ -204,13 +205,14 @@ public class PayService {
     private TbFreeDineRecordMapper tbFreeDineRecordMapper;
     private final TbFreeDineRecordService freeDineRecordService;
 
-    public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService, MpMemberInMapper mpMemberInMapper, TbMemberPointsServiceImpl memberPointsService, TbFreeDineRecordService freeDineRecordService) {
+    public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService, MpMemberInMapper mpMemberInMapper, TbMemberPointsServiceImpl memberPointsService, CartService cartService, TbFreeDineRecordService freeDineRecordService) {
         this.shopSongOrderService = shopSongOrderService;
         this.mpShopTableService = mpShopTableService;
         this.freeDineConfigService = freeDineConfigService;
         this.shopCouponService = shopCouponService;
         this.mpMemberInMapper = mpMemberInMapper;
         this.memberPointsService = memberPointsService;
+        this.cartService = cartService;
         this.freeDineRecordService = freeDineRecordService;
     }
 
@@ -386,6 +388,15 @@ public class PayService {
     }
 
     private BigDecimal getFreeDineOrderInfo(MemberInDTO payDTO, TbUserInfo userInfo) {
+
+        // 取消券
+        UseCouponDTO useCouponDTO = new UseCouponDTO();
+        useCouponDTO.setOrderId(payDTO.getOrderId());
+        useCouponDTO.setUserCouponInfos(new ArrayList<>());
+        useCouponDTO.setPointsNum(null);
+        useCouponDTO.setShopId(payDTO.getShopId());
+        cartService.useCoupon(useCouponDTO);
+
         TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
                 .eq(TbOrderInfo::getId, payDTO.getOrderId())
                 .in(TbOrderInfo::getStatus, TableConstant.OrderInfo.Status.UNPAID.getValue(), TableConstant.OrderInfo.Status.PAYING.getValue()));
@@ -419,13 +430,13 @@ public class PayService {
         }
 
         // 返还优惠券
-        returnCoupon(orderInfo, shopCouponService, mpCashierCartMapper);
+//        returnCoupon(orderInfo, shopCouponService, mpCashierCartMapper);
 
         BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
 
 
-        // 霸王餐积分抵扣
-        if (payDTO.getPointsNum() != null) {
+        // 霸王餐积分抵扣 预留
+        if (false && payDTO.getPointsNum() != null) {
             OrderDeductionPointsDTO memberUsablePoints = memberPointsService.getMemberUsablePoints(Long.valueOf(userInfo.getId()), shouldPayAmount);
             if (!memberUsablePoints.getUsable()) {
                 throw new MsgException(memberUsablePoints.getUnusableReason());