diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java index cfb3b12..ade834b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java @@ -75,6 +75,8 @@ public class TbActivateInRecord implements Serializable { private String couponJson; + private String source; + public Integer getId() { return id; @@ -220,5 +222,12 @@ public class TbActivateInRecord implements Serializable { this.couponJson = couponJson; } + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index be4a7a1..5d88fe3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -468,6 +468,7 @@ public class MemberService { record.setSourceFlowId(flowId); record.setUseStartTime(start); record.setUseEndTime(end); + record.setSource("activate"); record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,null)); actGiveRecords.add(record); } else if (tbShopCoupon.getType() == 2) { @@ -487,6 +488,7 @@ public class MemberService { record.setSourceFlowId(flowId); record.setUseStartTime(start); record.setUseEndTime(end); + record.setSource("activate"); record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,actPro)); actGiveRecords.add(record); } diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index 2f66bf6..8e742aa 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -21,11 +21,12 @@ + id - , vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json + , vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json, `source` @@ -105,22 +109,22 @@ insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, - use_end_time, create_time, update_time, coupon_json) + use_end_time, create_time, update_time, coupon_json, source) values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num}, #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, #{createTime}, - #{updateTime}, #{couponJson}) + #{updateTime}, #{couponJson}, #{source}) insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, - coupon_json) + coupon_json,source) values (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId}, #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime}, - #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson}) + #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson},#{entity.source})