优惠卷列表 添加 店铺名称

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