diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql new file mode 100644 index 000000000..e81f2edac --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql @@ -0,0 +1,2 @@ +alter table wx_campaign add column `activity_end_time` datetime COMMENT '活动结束时间', +change column `activity_time` activity_start_time datetime COMMENT '活动开始时间'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 85a773c45..bddc6bbe0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -76,8 +76,10 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") private Integer personLimit; - @io.swagger.annotations.ApiModelProperty(value = "活动时间", name = "activityTime") - private Date activityTime; + @io.swagger.annotations.ApiModelProperty(value = "活动开始时间", name = "activityStartTime") + private Date activityStartTime; + @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") + private Date activityEndTime; @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") private Integer useCredit; @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index 725d2953d..8de9cc1f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -103,7 +103,7 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { String phone = join.getPhone(); //活动名 String party = campaign.getTitle(); - String time = DateUtils.date2String(campaign.getActivityTime()); + String time = DateUtils.date2String(campaign.getActivityStartTime()); Map msgReplaceMap = new HashMap(); msgReplaceMap.put("person", person); msgReplaceMap.put("party", party); diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 400c6f554..8a31870ec 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -24,7 +24,8 @@ - + + @@ -36,7 +37,7 @@ `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, - `person_limit`,`activity_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type` + `person_limit`,`activity_start_time`,`activity_end_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type`