From d95895772e1bb0bade3e2b36871e3dcf61e0415e Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 16 Sep 2019 14:17:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=E6=95=B0=E6=8D=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/DataInitController.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java index 41d0558ff..cc1ce4e7e 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -40,7 +40,6 @@ public class DataInitController { @GetMapping("/init") public ResultData init() { - try { addBirthDayMsgModel(); } catch (Exception e) { @@ -54,16 +53,26 @@ public class DataInitController { /** * 增加会员生日短信模板 */ - @Transactional + @Transactional(rollbackFor = Exception.class) public void addBirthDayMsgModel() { List list = signatureMapper.selectAll(); Map tenantOfSignature = list.stream().collect(Collectors.toMap(WxMsgSignature::getTenantId, WxMsgSignature::getName)); + IdWorker idWorker = IdWorker.get(); + addBirthDayMsgModelToMall(tenantOfSignature, EnumMsgModel.COUPON_BIRTHDAY_OPENED, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + addBirthDayMsgModelToMall(tenantOfSignature, EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + } + + private void addBirthDayMsgModelToMall(Map tenantOfSignature, EnumMsgModel type, IdWorker idWorker, String content) { + //查找已经添加过的接口列表 + WxMsgValidationcodeModel query = new WxMsgValidationcodeModel(); + query.setMsgType(1); + query.setType(type.getCode()); + List dbModelList = modelMapper.select(query); + Map dbModelMap = dbModelList.stream().collect(Collectors.toMap(WxMsgValidationcodeModel::getTenantId, WxMsgValidationcodeModel::getName)); List malls = mallMapper.selectAll(); - IdWorker idWorker = IdWorker.get(); - malls.forEach(wxMall -> { - addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); - addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, "会员生日券未开启', '富茂中心', '亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + malls.stream().filter(wxMall -> !dbModelMap.containsKey(wxMall.getTenantId())).forEach(wxMall -> { + addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, type, content); }); } @@ -76,7 +85,7 @@ public class DataInitController { model.setSignature(tenantOfSignature.get(wxMall.getTenantId())); model.setContent(content); model.setCreatetime(new Date()); - model.setStatus(0); + model.setStatus(1); model.setMinutes(0); model.setOpen(0); model.setMsgType(1);