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 bb62be64b..730d16e8d 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -55,14 +55,14 @@ public class DataInitController { */ @Transactional(rollbackFor = Exception.class) public void addBirthDayMsgModel() { - List list = signatureMapper.selectAll(); - Map tenantOfSignature = list.stream().collect(Collectors.toMap(WxMsgSignature::getTenantId, WxMsgSignature::getName)); + //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}微信小程序领取您的专属生日礼物吧!"); + addBirthDayMsgModelToMall(EnumMsgModel.COUPON_BIRTHDAY_OPENED, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + addBirthDayMsgModelToMall(EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); } - private void addBirthDayMsgModelToMall(Map tenantOfSignature, EnumMsgModel type, IdWorker idWorker, String content) { + private void addBirthDayMsgModelToMall(EnumMsgModel type, IdWorker idWorker, String content) { //查找已经添加过的接口列表 WxMsgValidationcodeModel query = new WxMsgValidationcodeModel(); query.setMsgType(1); @@ -72,17 +72,17 @@ public class DataInitController { List malls = mallMapper.findList(new WxMall()); malls.stream().filter(wxMall -> !dbModelMap.containsKey(wxMall.getTenantId())).forEach(wxMall -> { - addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, type, content); + addBirthDayMsgModelItem(idWorker, wxMall, type, content); }); } - private void addBirthDayMsgModelItem(Map tenantOfSignature, IdWorker idWorker, WxMall wxMall, EnumMsgModel msgModel, String content) { + private void addBirthDayMsgModelItem(IdWorker idWorker, WxMall wxMall, EnumMsgModel msgModel, String content) { WxMsgValidationcodeModel model = new WxMsgValidationcodeModel(); model.setTenantId(wxMall.getTenantId()); model.setId(idWorker.nextId()); model.setType(msgModel.getCode()); model.setName(msgModel.getMessage()); - model.setSignature(tenantOfSignature.get(wxMall.getTenantId())); + model.setSignature(wxMall.getName()); model.setContent(content); model.setCreatetime(new Date()); model.setStatus(1);