From 1435648771156449a26e72b83c890e89174d855a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 8 May 2019 19:00:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E5=88=86=E8=B4=A6=E8=B4=A6?= =?UTF-8?q?=E6=88=B7][=E6=B7=BB=E5=8A=A0][=E5=8F=91=E9=80=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=9B=B8=E5=85=B3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905081900__UPDATE_MSG_MODEL.sql | 102 ++++++++++++++++++ ...201905081901__UPDATE_SHARIING_RECEIVER.sql | 5 + .../java/com/iformall/enums/EnumMsgModel.java | 6 ++ .../iformall/enums/EnumProfitSharingUse.java | 5 +- .../WxProfitSharingReceiverServiceImpl.java | 98 +++++++++++++++-- .../main/resources/mapper/WxShopMapper.xml | 3 +- 6 files changed, 208 insertions(+), 11 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql new file mode 100644 index 000000000..fd021b472 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql @@ -0,0 +1,102 @@ +#商户分账账户新增通知商管 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(80,'456','10','商户分账账户新增通知商管','富茂','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(110,'1001','10','商户分账账户新增通知商管','长融世贸广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(210,'1002','10','商户分账账户新增通知商管','同保楼 同福街','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(310,'1003','10','商户分账账户新增通知商管','杭州东站西子国际','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(410,'1004','10','商户分账账户新增通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(510,'1005','10','商户分账账户新增通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(610,'1006','10','商户分账账户新增通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(710,'1007','10','商户分账账户新增通知商管','澳林广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); +#商户分账账户新增通知商户 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(81,'456','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(111,'1001','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(211,'1002','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(311,'1003','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(411,'1004','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(511,'1005','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(611,'1006','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(711,'1007','11','商户分账账户新增通知商户','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +#商户分账账户变更通知商管 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(82,'456','12','商户分账账户变更通知商管','富茂','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(112,'1001','12','商户分账账户变更通知商管','长融世贸广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(212,'1002','12','商户分账账户变更通知商管','同保楼 同福街','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(312,'1003','12','商户分账账户变更通知商管','杭州东站西子国际','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(412,'1004','12','商户分账账户变更通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(512,'1005','12','商户分账账户变更通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(612,'1006','12','商户分账账户变更通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(712,'1007','12','商户分账账户变更通知商管','澳林广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); +#商户分账账户变更通知商户 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(83,'456','13','商户分账账户变更通知商户','富茂','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(113,'1001','13','商户分账账户变更通知商户','长融世贸广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(213,'1002','13','商户分账账户变更通知商户','同保楼 同福街','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(313,'1003','13','商户分账账户变更通知商户','杭州东站西子国际','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(413,'1004','13','商户分账账户变更通知商户','莱迪1086商业中心','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(513,'1005','13','商户分账账户变更通知商户','永修铜锣湾广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(613,'1006','13','商户分账账户变更通知商户','欧堡利亚海悦城','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(713,'1007','13','商户分账账户变更通知商户','澳林广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); +#商户分账账户使用回执 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(84,'456','14','商户分账账户不使用回执','富茂','商管已同意{account}作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(114,'1001','14','商户分账账户不使用回执','长融世贸广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(214,'1002','14','商户分账账户不使用回执','同保楼 同福街','商管已同意]{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(314,'1003','14','商户分账账户不使用回执','杭州东站西子国际','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(414,'1004','14','商户分账账户不使用回执','莱迪1086商业中心','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(514,'1005','14','商户分账账户不使用回执','永修铜锣湾广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(615,'1006','14','商户分账账户不使用回执','欧堡利亚海悦城','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(716,'1007','14','商户分账账户不使用回执','澳林广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); +#商户分账账户不使用回执 +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(85,'456','15','商户分账账户使用回执','富茂','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(115,'1001','15','商户分账账户使用回执','长融世贸广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(215,'1002','15','商户分账账户使用回执','同保楼 同福街','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(315,'1003','15','商户分账账户使用回执','杭州东站西子国际','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(415,'1004','15','商户分账账户使用回执','莱迪1086商业中心','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(515,'1005','15','商户分账账户使用回执','永修铜锣湾广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(615,'1006','15','商户分账账户使用回执','欧堡利亚海悦城','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(715,'1007','15','商户分账账户使用回执','澳林广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql new file mode 100644 index 000000000..b301981d5 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql @@ -0,0 +1,5 @@ +alter table wx_profit_sharing_receiver +modify column is_use smallint(2) default 2 comment '是否使用0使用1不使用2申请'; +update wx_profit_sharing_receiver set is_use =0 where status=0; +update wx_profit_sharing_receiver set is_use =1 where status=1; + diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 9c118be3c..833933e3d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -15,6 +15,12 @@ public enum EnumMsgModel { BILL_WAIT_PAY(7, "账单待缴通知"), BILL_OWE(8, "账单欠缴通知"), COUPON_SEND(9, "场景投放"), + ADD_SHARING_ACCOUNT_NOTIFY_MANAGER(10, "商户分账账户新增通知商管"), + ADD_SHARING_ACCOUNT_NOTIFY_MERCHANT(11, "商户分账账户新增通知商户"), + UPDATE_SHARING_ACCOUNT_NOTIFY_MANAGER(12, "商户分账账户变更通知商管"), + UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT(13, "商户分账账户变更通知商户"), + ACCEPT_SHARING_ACCOUNT_NOTIFY_MANAGER(14, "商户分账账户使用回执"), + REJECT_SHARING_ACCOUNT_NOTIFY_MANAGER(15, "商户分账账户不使用回执"), ; public static EnumMsgModel getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingUse.java b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingUse.java index 28414d0da..343924321 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingUse.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingUse.java @@ -4,8 +4,9 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumProfitSharingUse { - YES(1, "使用"), - NO(0, "不使用"),; + YES(0, "使用"), + NO(1, "不使用"), + APPLY(2, "申请"),; public static EnumProfitSharingUse getEnum(Integer code) { for (EnumProfitSharingUse value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index dc86cb625..ff178bb78 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -11,27 +11,29 @@ import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.enums.EnumAppType; -import com.iformall.enums.EnumProfitSharingReceiverStatus; -import com.iformall.enums.EnumProfitSharingReceiverType; -import com.iformall.enums.EnumProfitSharingType; +import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.enums.*; import com.iformall.mapper.WxAppinfoMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxPayAccountMapper; import com.iformall.mapper.WxProfitSharingReceiverMapper; +import com.iformall.mq.MqBaseProducer; import com.iformall.pay.WxPayment; import com.iformall.pay.WxProfitSharing; import com.iformall.pay.WxProfitSharingReceiverP; import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.utils.BeanUtils; +import com.iformall.utils.DateUtils; import com.iformall.utils.Utility; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Service @@ -54,6 +56,10 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv WxAppinfoMapper wxAppinfoMapper; @Autowired WxPayAccountMapper wxPayAccountMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired + private MqBaseProducer mqBaseProducer; @Override public PageInfo listAsPage(WxProfitSharingReceiver record, Integer pageIndex, Integer pageSize) { @@ -112,7 +118,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setCreateTime(new Date()); receiver.setUpdateTime(new Date()); receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); - + receiver.setIsUse(EnumProfitSharingUse.APPLY.getCode()); //passed from uplevel //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); //receiver.setReceiverComments(receiverParam.getReceiverComments()); @@ -162,9 +168,84 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } wxProfitSharingReceiverMapper.insertSelective(receiver); + + WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); + wxProfitSharingReceiver.setMerchantId(receiver.getMerchantId()); + wxProfitSharingReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + int size = wxProfitSharingReceiverMapper.select(receiver).size(); + + if (size == 0) { + //发送添加短信 + sendMsgByType(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MANAGER.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + sendMsgByType(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + } else { + //添加变更短信 + sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MANAGER.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + } return new ResultData(returnMap); } + private void sendMsgByType(Integer type, Long merchantId, String account, String tenantId) { + WxMerchantVo wxMerchantVo = new WxMerchantVo(); + wxMerchantVo.setId(merchantId); + List listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); + if (listCVo.isEmpty()) { + logger.info("更新商户分账账户发短信时未找到商户:" + merchantId); + return; + } + WxMerchantVo wxMerchant = listCVo.get(0); + //商户手机号 + String merchantName = wxMerchant.getMerchantName(); + Set managerPhone = wxMerchant.getShopVoList().parallelStream().map(s -> s.getLinkPhone()) + .filter(phone -> StringUtils.isNotEmpty(phone)).collect(Collectors.toSet()); + if (type.equals(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MANAGER.getCode()) || + type.equals(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MANAGER.getCode())) { + //添加时发给商管 变更时发送商管 + for (String phone : managerPhone) { + sendMsg(phone, null, merchantName, null, type, tenantId); + } + } + if (type.equals(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode()) || + type.equals(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode())) { + //添加时发送商户 + String phone = wxMerchant.getMerchantLinkPhone(); + String time = DateUtils.getSystemTime("yyyy年MM月dd日HH时mm分"); + sendMsg(phone, account, merchantName, time, type, tenantId); + } + } + + private void sendMsg(String phone, String account, String merchant, String time, Integer modelType, String tenantId) { + // 发送短信 + logger.info("》》》》》》》》》》》"); + logger.info("商户分账账户发送短信开始"); + logger.info("》》》》》》》》》》》"); + + Map msgReplaceMap = new HashMap(); + if (StringUtils.isNotEmpty(account)) { + msgReplaceMap.put("account", account); + + } + if (StringUtils.isNotEmpty(merchant)) { + msgReplaceMap.put("merchant", merchant); + + } + if (StringUtils.isNotEmpty(time)) { + msgReplaceMap.put("time", time); + } + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(modelType); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info("》》》》》》》》》》》"); + logger.info("商户分账账户发送短信结束"); + logger.info("》》》》》》》》》》》"); + } + @Override public ResultData delReceiver(WxMerchant merchant) { WxAppinfo appInfo = new WxAppinfo(); @@ -263,6 +344,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv oldReceiver.setMerchantId(merchant.getId()); oldReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); oldReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); + oldReceiver.setReceiverAccount(receiver.getReceiverAccount()); oldReceiver.setReceiverType(receiver.getReceiverType()); oldReceiver.setTrueName(receiver.getTrueName()); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 3bf5c0113..3d66d8c5d 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -525,10 +525,11 @@ +