From f74a80c250a79a0903c2e9a4ac5d2bfc9ad9650b Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 23 Mar 2023 16:40:00 +0800 Subject: [PATCH] //init --- .../iformall/service/WxBusinessService.java | 6 ++ .../WxMsgValidationcodeModelService.java | 7 --- .../service/WxPayAccountBillService.java | 6 ++ .../service/impl/WxBusinessServiceImpl.java | 15 +++++ .../WxMsgValidationcodeModelServiceImpl.java | 58 ------------------- .../impl/WxPayAccountBillServiceImpl.java | 8 +++ .../impl/WxProjectConfigServiceImpl.java | 8 ++- .../impl/WxTemplateMsgServiceImpl.java | 1 - 8 files changed, 41 insertions(+), 68 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 0fd23cff2..ac7672a94 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -12,6 +12,12 @@ import java.util.Map; public interface WxBusinessService { + /** + * + * @param tenantInfo + */ + void businessInit(TenantEntity tenantInfo); + /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java index 80b6c6c5c..6a9a1122d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java @@ -9,13 +9,6 @@ import java.util.List; public interface WxMsgValidationcodeModelService { - /** - * wx_msg_validationcode_model 初始化 - * - * @param tenantId - * @return - */ - void wxMsgValidationcodeModelInit(String tenantId, String signature,String emailBgImg); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java index 8e0616ec6..76a237c92 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java @@ -7,6 +7,12 @@ import com.iformall.domain.po.WxPayAccountBill; public interface WxPayAccountBillService { + /** + * + * @param tenantInfo + */ + void payAccountBillInit(TenantEntity tenantInfo); + /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 0ab31e19f..ede08a837 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.mapper.WxBusinessMapper; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxBusinessService; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; @@ -42,6 +43,20 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Autowired private WxPropertyContractMapper wxPropertyContractMapper; + @Override + public void businessInit(TenantEntity tenantInfo) { + Date now = new Date(); + WxBusiness record = new WxBusiness(); + record.setId(Constant.default_business); + record.setFinalTenantId(tenantInfo.getFinalTenantId()); + record.setTitle("其他"); + record.setType(1); + record.setCreateDate(now); + record.setUpdateDate(now); + record.setIsSystem(EnumYesOrNo.YES.getCode()); + wxBusinessMapper.insert(record); + } + @Override public PageInfo listAsPage(WxBusiness record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBusinessMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index fa2f7ceeb..aeb377148 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -38,64 +38,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM @Autowired WxMsgConfigMapper wxMsgConfigMapper; - @Override - @Transactional(rollbackFor = {Exception.class}) - public void wxMsgValidationcodeModelInit(String tenantId, String signature, String emailBgImg) { -// DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// String nowTimestr = format.format(new Date()); -// final IdWorker idWorker = IdWorker.get(); -// String initSql = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `msg_type`, `model_code`) values " + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '2', '代办通知', '富茂', '{userName}提交了一个{bustype}待您审批,电脑登陆管理后台查看您的待办。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194900032')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '3', '审批通知', '富茂', '{userName}同意编号{contract}的{bustype}审批,已呈送至{toUserName},登录{page}查看审批进度。', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '4', '通过审批通知', '富茂', '编号{contract}的合同已通过审批,请登录{page} 跟进后续工作。', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '5', '驳回通知', '富茂', '编号{contract}的合同审批被驳回,请登录{page} 查看审批明细。', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '6', '验证码', '富茂', '{s6}(动态验证码),请在5分钟内填写', '" + nowTimestr + "', '1', '5', null, '1', 'SMS_194910023')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '7', '账单待缴模板', '富茂', '您当期的待缴账单为{price}元,截止日期为{date} ,请登录{app}小程序查看账单并交费。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194900024')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '8', '账单欠缴模板', '富茂', '截止今日您的账单共计欠缴{price}元,请登录{app}小程序查看账单并交费。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194910026')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '9', '场景投放', '富茂', '亲爱的vip,悄悄地送您一张{title},请到{app}微信小程序中使用吧!', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194920015')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '11', '商户分账账户新增通知商户', '富茂', '您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '13', '商户分账账户变更通知商户', '富茂', '您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '14', '商户分账账户不使用回执', '富茂', '商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '15', '商户分账账户使用回执', '富茂', '商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '16', '商户分账账户删除提醒', '富茂', '{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户', '" + nowTimestr + "', '1', '0', null, '1', null)," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '17', '限时活动报名成功', '富茂', '亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194900027')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '18', '限时活动参加提醒', '富茂', '亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194920016')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '28', '会员生日券开启', '富茂', '亲爱的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194915025')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '29', '会员生日券未开启', '富茂', '亲爱的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194900031')," + -// " ( '" + idWorker.nextId() + "', '" + tenantId + "', '30', '系统发卡', '富茂', '亲爱的,您收到一张【{title}】,兑换码:{pw}。请于30天内打开微信小程序:{app}兑换!进店详询。', '" + nowTimestr + "', '1', '0', null, '1', 'SMS_194920021');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql); -// String initSql1 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '10', '审批通过通知', '富茂', " + -// " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
\\n
\\n
\\n\\n\\n', " + -// " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql1); -// String initSql2 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '11', '待缴账单通知', '富茂', " + -// " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n \\n
\\n
待缴账单通知
\\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\\n
\\n
\\n
\\n 租金账单\\n
\\n
账单类型
\\n
账单金额(元)
\\n
缴费时间
\\n
\\n {billList}\\n
\\n
\\n
\\n
遇到问题?
\\n
\\n 请联系商管负责人:\\n {linkName}{linkPhone}\\n
\\n
\\n
\\n
\\n\\n\\n'," + -// " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql2); -// String initSql3 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '12', '审批通知', '富茂', " + -// "'\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通知
\\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\\n
\\n
\\n\\n\\n', " + -// "'" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql3); -// String initSql4 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '13', '欠缴账单通知', '富茂', " + -// " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n \\n
\\n
欠缴账单通知
\\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\\n
\\n
\\n
\\n 租金账单\\n
\\n
账单类型
\\n
账单金额(元)
\\n
缴费时间
\\n
逾期天数
\\n
\\n {billList}\\n
\\n
\\n
\\n
遇到问题?
\\n
\\n 请联系商管负责人:\\n {linkName}{linkPhone}\\n
\\n
\\n
\\n
\\n\\n\\n'," + -// "'" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql4); -// String initSql5 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// " values ( '" + idWorker.nextId() + "', '" + tenantId + "', '14', '待办通知', '富茂'," + -// " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n \\n
\\n
待办通知
\\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\\n
\\n
\\n
\\n
申请时间:
\\n
{applyTime}
\\n
\\n
\\n
申请进度:
\\n
\\n \\n {taskList}\\n
\\n
\\n
\\n
\\n
遇到问题?
\\n
\\n 请联系申请人:\\n {linkName}{linkPhone}\\n
\\n
\\n
\\n
\\n\\n\\n'," + -// " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql5); -// String initSql6 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `msg_type`)" + -// " values ( '" + idWorker.nextId() + "', '" + tenantId + "', '15', '驳回通知', '富茂', " + -// " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n \\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\\n
\\n
\\n
\\n 驳回人:\\n {name}\\n
\\n
\\n 驳回原因:\\n {remark}\\n
\\n
\\n
\\n
遇到问题?
\\n
\\n 请联系驳回人:\\n {linkName}{linkPhone}\\n
\\n
\\n
\\n
\\n\\n\\n'," + -// " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "', '2');"; -// wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql6); - } - @Override public PageInfo listAsPage(WxMsgValidationcodeModel record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeModelMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java index ef30ea7a9..a9a32bd27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java @@ -29,6 +29,14 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { @Autowired WxBillPropertyMapper wxBillPropertyMapper; + @Override + public void payAccountBillInit(TenantEntity tenantInfo) { + WxPayAccountBill record = new WxPayAccountBill(); + record.setId(Long.parseLong(tenantInfo.getTenantId())); + record.updateTenantInfo(tenantInfo); + wxPayAccountBillMapper.insert(record); + } + @Override public PageInfo listAsPage(WxPayAccountBill record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountBillMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 860d0c5a8..e6aca8d0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -66,6 +66,8 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { WxFlowService wxFlowService; @Autowired MallUserInfoService userInfoService; + @Autowired + WxBusinessService wxBusinessService; @Autowired @Qualifier("objectCommonRedisTemplate") @@ -149,12 +151,14 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { wxTemplateMsgService.wxTemplateMsgInit(wxMall.getTenantId()); // # 19. wx_question wxQuestionService.wxQuestionInit(wxMall.getTenantId()); - //# 20. wx_msg_validationcode_model, 数据重新一下 - wxMsgValidationcodeModelService.wxMsgValidationcodeModelInit(wxMall.getTenantId(), wxMall.getName(), wxMall.getImgUrlH()); //wx_flow_config wxFlowService.wxFlowConfigInit(wxMall.getTenantId()); //wx_msg_config(默认aliyun) wxMsgConfigService.wxMsgConfigInit(wxMall.getTenantInfo()); + //wx_business + wxBusinessService.businessInit(wxMall.getTenantInfo()); + //wx_pay_account_bill + wxPayAccountBillService.payAccountBillInit(wxMall.getTenantInfo()); } wxMallService.update(wxMall); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index b5dcde541..185c1c96b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -70,7 +70,6 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { wxTemplateMsg.setType(EnumTemplateType.SEND_COUPON_REMIND.getCode()); wxTemplateMsg.setCustomParam("{\"index\": [\"thing1\", \"time3\", \"time4\", \"thing5\"], \"emphasis\": \"\"}"); wxTemplateMsgMapper.insert(wxTemplateMsg); - wxTemplateMsg.setId(null); wxTemplateMsg.setType(EnumTemplateType.CARD_BALANCE_CHANGE.getCode()); wxTemplateMsg.setCustomParam("{\"index\": [\"thing7\", \"amount1\", \"amount2\", \"amount4\", \"thing6\"], \"emphasis\": \"\"}");