From e2f02286ef52366b669a635b1de3b144667eea45 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 13:19:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D][=E4=BF=AE=E6=94=B9][=E7=9F=AD=E4=BF=A1=E6=A8=A1?= =?UTF-8?q?=E6=9D=BFsql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906051300__ADD_MSG_MODEL.sql | 18 ++++++++++-------- .../migration/V201906051310__ADD_MSG_MODEL.sql | 18 ++++++++++++++++++ .../java/com/iformall/enums/EnumMsgModel.java | 3 ++- .../impl/WxCampaignJoinServiceImpl.java | 8 ++++---- 4 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql index a8fe1bbb8..cae336216 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql @@ -1,16 +1,18 @@ insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(87,'456','17','限时活动','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(87,'456','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(117,'1001','17','限时活动','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(117,'1001','17','限时活动报名成功','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(217,'1002','17','限时活动','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(217,'1002','17','限时活动报名成功','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(317,'1003','17','限时活动','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(317,'1003','17','限时活动报名成功','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(417,'1004','17','限时活动','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(417,'1004','17','限时活动报名成功','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(517,'1005','17','限时活动','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(517,'1005','17','限时活动报名成功','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(617,'1006','17','限时活动','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(617,'1006','17','限时活动报名成功','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(717,'1007','17','限时活动','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(717,'1007','17','限时活动报名成功','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(1000000001,'789','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql new file mode 100644 index 000000000..550de04a7 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql @@ -0,0 +1,18 @@ +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(88,'456','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(118,'1001','18','限时活动参加提醒','长融世贸广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(218,'1002','18','限时活动参加提醒','同保楼 同福街','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(318,'1003','18','限时活动参加提醒','杭州东站西子国际','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(418,'1004','18','限时活动参加提醒','莱迪1086商业中心','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(518,'1005','18','限时活动参加提醒','永修铜锣湾广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(618,'1006','18','限时活动参加提醒','欧堡利亚海悦城','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(718,'1007','18','限时活动参加提醒','澳林广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(1000000002,'789','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 71bd8df77..ae421dc72 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -22,7 +22,8 @@ public enum EnumMsgModel { ACCEPT_SHARING_ACCOUNT_NOTIFY_MANAGER(14, "商户分账账户使用回执"), REJECT_SHARING_ACCOUNT_NOTIFY_MANAGER(15, "商户分账账户不使用回执"), DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT(16, "商户分账账户删除提醒"), - TIME_LIMIT_CAMPAIGN(17, "限时活动"), + TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS(17, "限时活动报名成功"), + TIME_LIMIT_CAMPAIGN_NOTIFY(18, "限时活动参与提醒"), ; public static EnumMsgModel getEnum(Integer code) { 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 3617f9e50..2294427ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -105,20 +105,20 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { logger.info("活动发送短信开始"); logger.info("》》》》》》》》》》》"); //人名 - String name = join.getName(); - name = StringUtils.isNotEmpty(name) ? name : ""; + String person = join.getName(); + person = StringUtils.isNotEmpty(person) ? person : ""; //找出用户手机号 String phone = join.getPhone(); //活动名 String party = campaign.getTitle(); String time = DateUtils.date2String(campaign.getActivityTime()); Map msgReplaceMap = new HashMap(); - msgReplaceMap.put("name", name); + msgReplaceMap.put("person", person); msgReplaceMap.put("party", party); msgReplaceMap.put("time", time); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS.getCode()); wxMsgRecord.setReceiver(phone); wxMsgRecord.setTenantId(join.getTenantId()); wxMsgRecord.setDynamicContentMap(msgReplaceMap);