From e19550fc28b7a0beb59a92f2f6ef4be0891a3e66 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 13 Nov 2024 17:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TbActivateOutRecordMapper.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/mapper/TbActivateOutRecordMapper.xml b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
index df0e2e1..ad5530f 100644
--- a/src/main/resources/mapper/TbActivateOutRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
@@ -31,6 +31,7 @@
 
     <select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
         SELECT
+            shop.shop_name as shopName,
             CASE
                 WHEN outRecord.type = 1 THEN inRecord.name
                 WHEN outRecord.type = 2 THEN pro.NAME
@@ -39,6 +40,7 @@
             outRecord.use_num-outRecord.ref_num as num
         FROM
             tb_activate_out_record outRecord
+                INNER JOIN tb_shop_info shop on outRecord.shop_id = shop.id
                 INNER JOIN tb_activate_in_record inRecord
                     on outRecord.give_id = inRecord.id
                     <if test="shopId != null and shopId != ''">