From 0248da88320d1799127e60bcbe3b020b16fe64ed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 11:01:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A1=AE=E8=AE=A4=E5=90=8E=E5=8F=AA?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=80=E6=AC=A1=E7=9F=AD=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906131029__ALTER_ACTIVITY.sql | 2 ++ .../iformall/schedule/ActivitySchedule.java | 1 + .../com/iformall/domain/po/WxActivity.java | 3 ++ .../iformall/domain/po/WxActivityJoin.java | 6 ++++ .../java/com/iformall/enums/EnumSendMsg.java | 35 +++++++++++++++++++ .../iformall/mapper/WxActivityJoinMapper.java | 3 ++ .../impl/WxActivityJoinServiceImpl.java | 11 ++++-- .../resources/mapper/WxActivityJoinMapper.xml | 13 ++++++- .../resources/mapper/WxActivityMapper.xml | 12 +++++-- 9 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql b/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql new file mode 100644 index 000000000..b5aec7703 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql @@ -0,0 +1,2 @@ +alter table wx_activity ADD COLUMN `send_msg` smallint(2) DEFAULT 0 COMMENT '是否发送短信1是0否'; +alter table wx_activity_join ADD COLUMN `send_msg` smallint(2) DEFAULT 0 COMMENT '是否发送短信1是0否'; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 425abb7a0..f25ba26ff 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -57,6 +57,7 @@ public class ActivitySchedule { wxActivityJoin.setTenantId(activity.getTenantId()); wxActivityJoin.setActivityId(activity.getId()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + wxActivityJoin.setSendMsg(EnumSendMsg.YES.getCode()); List list = wxActivityJoinMapper.findList(wxActivityJoin); for (WxActivityJoin activityJoin : list) { send(activity, activityJoin); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 44476af33..66155b3cf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -81,6 +81,9 @@ public class WxActivity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "图片说明", name = "imgDetail") private String imgDetail; + @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") + private Integer sendMsg; + @Transient @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 41f7d14f7..83a42f24e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -11,6 +11,9 @@ import javax.persistence.Transient; import java.util.Date; import java.util.List; +/** + * @author gongbiao + */ @Table(name = "wx_activity_join") @Data @ToString(callSuper = true) @@ -76,6 +79,9 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") + private Integer sendMsg; + @io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl") private String img_url; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java b/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java new file mode 100644 index 000000000..b8f7e7146 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumSendMsg { + + YES(1, "已发送"), + NO(0, "未发送"); + + public static EnumSendMsg getEnum(Integer code) { + for (EnumSendMsg value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumSendMsg(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index 6fa357902..28a74da2a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxActivityJoin; import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -14,4 +15,6 @@ public interface WxActivityJoinMapper extends CommonMapper void cfindList(WxActivityJoin wxActivityJoin); + void updateSendMsg(Map param); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 25f823853..a5117a9f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -108,11 +108,18 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sendMsg(WxActivityJoin wxActivityJoin) { - WxActivity campaign = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + activity.setSendMsg(EnumSendMsg.YES.getCode()); + activity.setUpdateTime(new Date()); + wxActivityMapper.updateByPrimaryKeySelective(activity); List joinList = wxActivityJoinMapper.select(wxActivityJoin); for (WxActivityJoin join : joinList) { - sendMessage(join, campaign); + sendMessage(join, activity); } + Map param = new HashMap<>(2); + param.put("sendMsg", EnumSendMsg.YES.getCode()); + param.put("joinList", joinList); + wxActivityJoinMapper.updateSendMsg(param); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 9c5210727..0dac58226 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -18,12 +18,13 @@ + `id`,`tenant_id`,`user_id`,`activity_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, - `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url` + `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url`,`send_msg` @@ -54,6 +55,9 @@ and `activity_id` = #{activityId} + + and `send_msg` = #{sendMsg} + and id in @@ -86,5 +90,12 @@ order by ${sortColumns} + + + update wx_activity_join set send_msg = #{send_msg} where id in + + #{join.id} + + diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 8df7273a2..c1da23160 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -24,12 +24,14 @@ + `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, - `use_credit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`,`img_detail` + `use_credit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`, + `img_detail`,`send_msg` @@ -82,6 +84,10 @@ and `create_time` between #{starttime} and #{endtime} + + and `send_msg` = #{sendMsg} + + and id in @@ -101,7 +107,9 @@