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 f7d97ac..389808f 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 @@ -9,6 +9,7 @@ import java.util.Date; public class TbUserCouponVo { private Integer id; private Integer shopId; + private String shopName; private BigDecimal fullAmount; private BigDecimal discountAmount; private Integer couponId; diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index 3cf29fe..d7f9b81 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -39,6 +39,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu SELECT inRecord.shop_id as shopId, + shop.shop_Name as shopName, CASE WHEN inRecord.type = 1 THEN inRecord.NAME WHEN inRecord.type = 2 THEN pro.NAME @@ -84,6 +87,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu inRecord.use_end_time as endTime FROM tb_activate_in_record inRecord + LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId}