From 2a398bedded4afc55ebb23a6de07fe5a45dac958 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 10 Oct 2024 11:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/PayService.java    | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 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 51ca21b..77f88e9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -14,6 +14,7 @@ import com.chaozhanggui.system.cashierservice.entity.dto.ReturnGroupOrderDto;
 import com.chaozhanggui.system.cashierservice.entity.dto.ShopEatTypeInfoDTO;
 import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo;
 import com.chaozhanggui.system.cashierservice.exception.MsgException;
+import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper;
 import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper;
 import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper;
 import com.chaozhanggui.system.cashierservice.model.PayReq;
@@ -174,6 +175,8 @@ public class PayService {
     private MpOrderDetailMapper mpOrderDetailMapper;
     @Autowired
     private MpOrderInfoMapper mpOrderInfoMapper;
+    @Autowired
+    private MpCashierCartMapper mpCashierCartMapper;
 
     public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService) {
         this.shopSongOrderService = shopSongOrderService;
@@ -462,12 +465,17 @@ public class PayService {
         orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
         //更新购物车状态
-        int cartCount = tbCashierCartMapper.updateStatusByOrderId(orderId, "final");
+        int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
+                .eq(TbCashierCart::getOrderId, orderId)
+                .eq(TbCashierCart::getUseType, orderInfo.getUseType())
+                .eq(TbCashierCart::getStatus, "create")
+                .set(TbCashierCart::getStatus, "final"));
 
+        mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderId)
+                .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
+                .eq(TbOrderDetail::getStatus, "unpaid")
+                .set(TbOrderDetail::getStatus, "closed"));
 
-        tbOrderDetailMapper.updateStatusByOrderId(Integer.valueOf(orderId), "closed");
-
-        tbOrderDetailMapper.updateStatusByOrderIdAndStatus(Integer.valueOf(orderId), "closed");
         outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed");
         log.info("更新购物车:{}", cartCount);
 
@@ -1063,12 +1071,21 @@ public class PayService {
         }
 
         if ("paying".equals(orderInfo.getStatus())) {
-            int cartCount = tbCashierCartMapper.updateStatusByOrderId(orderInfo.getId().toString(), "final");
 
+
+            int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getOrderId, orderInfo.getId())
+                    .eq(TbCashierCart::getUseType, orderInfo.getUseType())
+                    .eq(TbCashierCart::getStatus, "create")
+                    .set(TbCashierCart::getStatus, "final"));
             log.info("更新购物车:{}", cartCount);
 
             //更新子单状态
-            tbOrderDetailMapper.updateStatusByOrderIdAndStatus(orderInfo.getId(), "closed");
+
+            mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderInfo.getId())
+                    .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
+                    .eq(TbOrderDetail::getStatus, "unpaid")
+                    .set(TbOrderDetail::getStatus, "closed"));
 
             //修改主单状态
             orderInfo.setStatus("closed");