From 9e95bde5da1b0be2c22386e6077ac218fc9a0826 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, 9 Nov 2024 09:31:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BA=97=E9=93=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/TbUserCouponVo.java        | 1 +
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 ++-
 src/main/resources/mapper/TbActivateInRecordMapper.xml         | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java
index ee2c289..f7d97ac 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java
@@ -8,6 +8,7 @@ import java.util.Date;
 @Data
 public class TbUserCouponVo {
     private Integer id;
+    private Integer shopId;
     private BigDecimal fullAmount;
     private BigDecimal discountAmount;
     private Integer couponId;
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 2158e13..3bcf84b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1261,7 +1261,8 @@ public class PayService {
         log.info("更新购物车:{}", cartCount);
 
         //更新子单状态
-        mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getOrderId, orderInfo.getId())
+        mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
+                .eq(TbOrderDetail::getOrderId, orderInfo.getId())
                 .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
                 .in(TbOrderDetail::getStatus, "unpaid")
                 .set(TbOrderDetail::getStatus, "closed"));
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index c5eafbf..67fd5c0 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -38,6 +38,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
 
     <select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
         SELECT
+            inRecord.shop_id as shopId,
             inRecord.id as id,
             inRecord.full_amount as fullAmount,
             inRecord.discount_amount as discountAmount,
@@ -72,6 +73,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
 
     <select id="queryByVipIdAndShopIdExpire" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
         SELECT
+            inRecord.shop_id as shopId,
             CASE
                 WHEN inRecord.type = 1 THEN inRecord.NAME
                 WHEN inRecord.type = 2 THEN pro.NAME