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 ee2c289..12e598d 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 @@ -11,6 +11,7 @@ public class TbUserCouponVo { private BigDecimal fullAmount; private BigDecimal discountAmount; private Integer couponId; + private Integer shopId; private Integer proId; //优惠券名称 private String name; diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index c5eafbf..8b385f7 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -42,6 +42,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu inRecord.full_amount as fullAmount, inRecord.discount_amount as discountAmount, inRecord.coupon_id as couponId, + inRecord.shop_id as shopId, pro.id as proId, CASE WHEN inRecord.type = 1 THEN inRecord.NAME