From c5d09e82fd24373449f1f3c4dfa97b15e9d893ae Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 27 Sep 2024 10:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=B7=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0shopId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/UserCouponVo.java            | 1 +
 src/main/resources/mapper/TbActivateInRecordMapper.xml           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
index 8dfec49..4e2d67b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
@@ -14,6 +14,7 @@ public class UserCouponVo {
      * 卷描述
      */
     private String detail;
+    private String shopId;
     private String shopName;
     /**
      * 优惠金额
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index 0512964..930d826 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -52,6 +52,7 @@
         SELECT tb_product.name as detail,
         0 as status,
         sum(tb_activate_in_record.over_num) as num,
+        tb_activate_in_record.shop_id as shopId,
         <choose>
             <when test="shopName != null and shopName != ''">#{shopName}</when>
             <otherwise>''</otherwise>