From c0ad62aaff8d22b4d7298f9ea9ff979c8e289c6d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Sep 2024 17:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/TbActivateInRecordMapper.java          |  2 +-
 .../dao/TbActivateOutRecordMapper.java         |  2 +-
 .../cashierservice/entity/vo/UserCouponVo.java |  1 +
 .../service/impl/TbUserCouponsServiceImpl.java | 13 +++++++------
 .../mapper/TbActivateInRecordMapper.xml        | 18 +++++++++++-------
 .../mapper/TbActivateOutRecordMapper.xml       | 13 +++++++++----
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
index 86ad0ee..df4b1d5 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
@@ -33,7 +33,7 @@ public interface TbActivateInRecordMapper {
     List<TbActivateInRecord> queryAll(TbActivateInRecord tbActivateInRecord);
 
     List<TbProduct> queryByVipIdAndShopId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
-    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
+    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("shopName")String shopName);
     int queryByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
     List<TbActivateInRecord> queryAllByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
index 23c1983..7b8b5ba 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
@@ -30,7 +30,7 @@ public interface TbActivateOutRecordMapper {
      */
     List<TbActivateOutRecord> queryAll(TbActivateOutRecord tbActivateOutRecord);
 
-    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
+    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId, @Param("shopName") String shopName);
 
 
     /**
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 553002f..8dfec49 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 shopName;
     /**
      * 优惠金额
      */
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
index bcf02ec..5236c6c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
@@ -1,9 +1,7 @@
 package com.chaozhanggui.system.cashierservice.service.impl;
 
-import com.chaozhanggui.system.cashierservice.dao.TbActivateInRecordMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbActivateOutRecordMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbUserCouponsMapper;
+import com.chaozhanggui.system.cashierservice.dao.*;
+import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
 import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto;
 import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo;
 import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo;
@@ -36,6 +34,8 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
     private TbActivateOutRecordMapper outRecordMapper;
     @Autowired
     private TbShopUserMapper tbShopUserMapper;
+    @Autowired
+    private TbShopInfoMapper tbShopInfoMapper;
 
 
     /**
@@ -52,12 +52,13 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
         List<ShopUserListVo> tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString());
         if (!CollectionUtils.isEmpty(tbShopUsers)) {
             tbShopUsers.forEach(s -> {
+                TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(s.getShopId().intValue());
                 if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 0)) {
-                    List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
+                    List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName());
                     result.addAll(unuseCoupon);
                 }
                 if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 1)) {
-                    List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
+                    List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName());
                     result.addAll(useCoupon);
                 }
             });
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index d5e9e89..6d9ad84 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -40,15 +40,19 @@
     </select>
 
     <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
-        SELECT tb_product.name                     as detail,
-               0                                   as status,
-               sum(tb_activate_in_record.over_num) as num,
-               2                                   as type
+        SELECT tb_product.name as detail,
+        0 as status,
+        sum(tb_activate_in_record.over_num) as num,
+        <choose>
+            <when test="shopName != null and shopName != ''">#{shopName}</when>
+            <otherwise>''</otherwise>
+        </choose> AS shopName,
+        2 as type
         FROM tb_activate_in_record
-                 LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
+        LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
         WHERE vip_user_id = #{vipUserId}
-          and tb_activate_in_record.shop_id = #{shopId}
-          and num!=0
+        and tb_activate_in_record.shop_id = #{shopId}
+        and num!=0
         group by tb_activate_in_record.pro_id
     </select>
 
diff --git a/src/main/resources/mapper/TbActivateOutRecordMapper.xml b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
index 278b4fd..9e50eca 100644
--- a/src/main/resources/mapper/TbActivateOutRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
@@ -29,10 +29,15 @@
 
 
     <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
-        SELECT tb_product.NAME                AS detail,
-               1                              AS status,
-               tb_activate_out_record.use_num AS num,
-               2                              AS type
+        SELECT tb_product.NAME AS detail,
+        1 AS status,
+        tb_activate_out_record.use_num AS num,
+        <choose>
+            <when test="shopName != null and shopName != ''">#{shopName}</when>
+            <otherwise>''</otherwise>
+        </choose>
+        AS shopName,
+        2 AS type
         FROM tb_activate_out_record
                  LEFT JOIN tb_product ON tb_activate_out_record.pro_id = tb_product.id
                  LEFT JOIN tb_activate_in_record ON tb_activate_in_record.id = tb_activate_out_record.give_id