Просмотр исходного кода

[宣传活动][修改][添加活动结束时间]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5c24e35f7e
4 измененных файлов: 10 добавлений и 5 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java
  4. +3
    -2
      mallinkService/src/main/resources/mapper/WxCampaignMapper.xml

+ 2
- 0
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 '活动开始时间';

+ 4
- 2
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") @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit")
private Integer 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") @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit")
private Integer useCredit; private Integer useCredit;
@io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java Просмотреть файл

@@ -103,7 +103,7 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService {
String phone = join.getPhone(); String phone = join.getPhone();
//活动名 //活动名
String party = campaign.getTitle(); String party = campaign.getTitle();
String time = DateUtils.date2String(campaign.getActivityTime());
String time = DateUtils.date2String(campaign.getActivityStartTime());
Map<String, String> msgReplaceMap = new HashMap(); Map<String, String> msgReplaceMap = new HashMap();
msgReplaceMap.put("person", person); msgReplaceMap.put("person", person);
msgReplaceMap.put("party", party); msgReplaceMap.put("party", party);


+ 3
- 2
mallinkService/src/main/resources/mapper/WxCampaignMapper.xml Просмотреть файл

@@ -24,7 +24,8 @@
<result column="html" jdbcType="VARCHAR" property="html"/> <result column="html" jdbcType="VARCHAR" property="html"/>
<result column="person_limit" jdbcType="INTEGER" property="personLimit"/> <result column="person_limit" jdbcType="INTEGER" property="personLimit"/>
<result column="activity_time" jdbcType="TIMESTAMP" property="activityTime"/>
<result column="activity_start_time" jdbcType="TIMESTAMP" property="activityStartTime"/>
<result column="activity_end_time" jdbcType="TIMESTAMP" property="activityEndTime"/>
<result column="use_credit" jdbcType="INTEGER" property="useCredit"/> <result column="use_credit" jdbcType="INTEGER" property="useCredit"/>
<result column="credit" jdbcType="INTEGER" property="credit"/> <result column="credit" jdbcType="INTEGER" property="credit"/>
<result column="question" jdbcType="VARCHAR" property="question"/> <result column="question" jdbcType="VARCHAR" property="question"/>
@@ -36,7 +37,7 @@
<sql id="allColumns"> <sql id="allColumns">
`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`, `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`, `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`
</sql> </sql>


<sql id="allCHeadColumns"> <sql id="allCHeadColumns">


Загрузка…
Отмена
Сохранить