From 4a9b86773a11e4bbe3e6729252366a5bb8069a68 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 17:38:51 +0800 Subject: [PATCH 01/30] xingxingdiandeng --- .../iformall/service/msg/impl/SendCallBackSmsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 46aba1d01..43d2ded03 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -110,7 +110,7 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { EnumVerifyCode.NO.getCode().toString(), modelId, null,wxMsgModel.getModelCode(),outId,wxMsgConfig.getSmsChannel()); - + logger.info("--send--"+result); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); From 2f761c1878e7a5a9ee18c84e6937cb1228e31402 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 17:57:18 +0800 Subject: [PATCH 02/30] xingxingdiandeng --- .../iformall/service/msg/impl/SendCallBackSmsServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 43d2ded03..5123969cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -110,8 +110,6 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { EnumVerifyCode.NO.getCode().toString(), modelId, null,wxMsgModel.getModelCode(),outId,wxMsgConfig.getSmsChannel()); - logger.info("--send--"+result); - JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); String batchNo = jsonObjectResult.get("data").toString(); From e3fd8751b8134309e23bfa238d3cc469056e0037 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 18:06:25 +0800 Subject: [PATCH 03/30] xingxingdiandeng --- .../src/main/java/com/iformall/sms/aliyun/AliyunSMS.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java index 44ddf8086..322caaaa8 100644 --- a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java +++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java @@ -67,6 +67,7 @@ public class AliyunSMS implements SMSExcutor { */ public Result sendSms(SMS sms) { if (null == sms || StringUtils.isBlank(sms.getTemplateCode())) { + log.error("发送短信----模板code 为 null"); return null; } IAcsClient acsClient = getClient(); From 9257ee6d38be49cccac62b1c5cc92ac935b2559d Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 6 Nov 2020 11:06:04 +0800 Subject: [PATCH 04/30] xingxingdiandeng --- .../controller/msg/WxMsgController.java | 15 ++++ .../java/com/iformall/common/ErrorCode.java | 1 + .../com/iformall/enums/EnumTemplateType.java | 24 ++++--- .../service/WxTemplateMsgService.java | 10 +-- .../service/impl/WxMsgServiceImpl.java | 3 + .../impl/WxTemplateMsgServiceImpl.java | 70 ++++++++++++++++--- .../mapper/WxCouponChannelMapper.xml | 3 +- 7 files changed, 101 insertions(+), 25 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 0dcf44be5..37a5daa2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -91,6 +91,21 @@ public class WxMsgController extends BaseController { return new ResultData(); } + @ApiOperation("推送模板") + @PostMapping("pushTemp") + @SystemControllerLog(description = "moban tuisong") + public ResultData pushTemp(@RequestBody WxTemplateMsg wxTemplateMsg) { + logger.debug("[" + getIpAddr() + "] WxMsgController::tuisong"); + if(wxTemplateMsg.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + wxTemplateMsg.updateTenantInfo(getTenantInfo()); +// if(null == wxTemplateMsg.getOnOff()){ +// wxTemplateMsg.setOnOff(1); +// } + return wxTemplateMsgService.pushTemp(wxTemplateMsg); + } + @ApiOperation("新增接口") @PostMapping("add") @SystemControllerLog(description = "标签短信-新增") diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index d5a5e8377..2cc59dbc3 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -359,6 +359,7 @@ public enum ErrorCode{ TEMPLATE_NOT_FOUND(12090, "模板不存在"), TEMPLATE_FORMID_NOT_FOUND(12091, "formId不存在"), TEMPLATE_DATA_ERROR(12092, "数据格式错误"), + TEMPLATE_ADD_ERROR(12093, "添加模板错误"), /** * diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index d34b89861..6e9c6e3aa 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -7,16 +7,16 @@ public enum EnumTemplateType { // 1-核销成功消息, 2-核销失败消息 - VERIFY_SUCCESS(1, "核销成功消息"), // 小程序 - VERIFY_FAIL(2, "核销失败消息"), // 小程序 - PRESS_SUCCESS(3, "砍价成功消息"), // 小程序 + VERIFY_SUCCESS(1, "核销成功消息",""), // 小程序 + VERIFY_FAIL(2, "核销失败消息",""), // 小程序 + PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序 - ACTIVITY_REMIND(4, "活动开始提醒"), // 小程序 - LIVE_REMIND(5, "直播开播提醒"), // 小程序 + ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序 + LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序 - AUDIT_MESSAGE(101, "公众号审核结果通知"), // 公众号 - VERIFY_RESULT(102, "公众号卡券核销通知"), // 公众号 - GIFT_MESSAGE(103, "公众号购票成功通知"), // 公众号 + AUDIT_MESSAGE(101, "公众号审核结果通知",""), // 公众号 + VERIFY_RESULT(102, "公众号卡券核销通知",""), // 公众号 + GIFT_MESSAGE(103, "公众号购票成功通知",""), // 公众号 ; public static EnumTemplateType getEnum(Integer code) { @@ -30,10 +30,12 @@ public enum EnumTemplateType { private Integer code; private String message; + private String tid; - EnumTemplateType(Integer code, String message) { + EnumTemplateType(Integer code, String message, String tid) { this.code = code; this.message = message; + this.tid = tid; } public Integer getCode() { @@ -43,4 +45,8 @@ public enum EnumTemplateType { public String getMessage() { return message; } + + public String getTid() { + return tid; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java b/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java index 716b983c1..e56774ec5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxTemplateMsg; import java.util.List; @@ -56,12 +57,7 @@ public interface WxTemplateMsgService { * @param id */ void deleteById(Long id); - - - - - - - + + ResultData pushTemp(WxTemplateMsg wxTemplateMsg); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index aa3cf5012..c70d836e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import java.text.DateFormat; import java.util.*; import java.util.stream.Collectors; @@ -128,6 +129,8 @@ public class WxMsgServiceImpl implements WxMsgService { //是否立即发送 if (wxMsg.getIsright().equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); + wxMsg.setSendtime(systemTime); if(wxMsg.getWay() == EnumSendWay.TAG.getCode()){ if (wxMsg.getExpectSendNumber().intValue() > 1000) { batchSendMsg(wxMsg, wxMsgConfig, null); 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 2ed7aa39c..a5e19c2a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -1,12 +1,24 @@ package com.iformall.service.impl; +import cn.binarywang.wx.miniapp.api.WxMaService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.enums.EnumPayWay; +import com.iformall.enums.EnumTemplateType; import com.iformall.mapper.WxTemplateMsgMapper; +import com.iformall.service.WxAppinfoService; import com.iformall.service.WxTemplateMsgService; +import com.iformall.service.wechat.FmOpenService; +import com.iformall.utils.MaUtil; +import me.chanjar.weixin.common.error.WxErrorException; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +34,14 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { @Autowired WxTemplateMsgMapper wxTemplateMsgMapper; + @Autowired + private boolean isFmOpen; + @Autowired + private WxAppinfoService wxAppinfoService; + + @Autowired + private FmOpenService openService; + @Override public void wxTemplateMsgInit(String tenantId) { @@ -85,12 +105,46 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { public void deleteById(Long id) { wxTemplateMsgMapper.deleteById(id); } - - - - - - - - + + @Override + public ResultData pushTemp(WxTemplateMsg wxTemplateMsg) { + WxTemplateMsg byId = this.getById(wxTemplateMsg.getId()); + if(byId == null){ + return new ResultData(ErrorCode.TEMPLATE_NOT_FOUND); + } + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(wxTemplateMsg, EnumPayWay.PAY_WAY_WECHAT); + WxMaService wxMaService = null; + if(isFmOpen) { + wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); + } else { + WxAppinfo appInfo = wxAppinfoService.getByAppId(appinfo.getAppId()); + wxMaService = MaUtil.getWeappService(appInfo); + } + String s = ""; + if(byId.getType() == EnumTemplateType.ACTIVITY_REMIND.getCode()){ + try { + s = wxMaService.getSubscribeService().addTemplate(EnumTemplateType.ACTIVITY_REMIND.getTid(), + Lists.newArrayList(13, 5, 12, 1, 11), ""); + } catch (WxErrorException e) { + return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); + } + + }else if(byId.getType() == EnumTemplateType.LIVE_REMIND.getCode()){ + try { + s = wxMaService.getSubscribeService().addTemplate(EnumTemplateType.LIVE_REMIND.getTid(), + Lists.newArrayList(1, 3, 4, 5),""); + } catch (WxErrorException e) { + return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); + } + } + if(StringUtils.isBlank(s)){ + return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); + } + + byId.setTemplateId(s); + this.saveOrUpdate(byId); + return new ResultData(); + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index efe8fd6e7..7f4a97d6d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -22,7 +22,7 @@ - distinct cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code + distinct cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`show_begin_time`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code @@ -175,6 +175,7 @@ + From 3a6f54dbc367e1781d71e5ac0abf1b49e8d3f1f4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 6 Nov 2020 11:35:45 +0800 Subject: [PATCH 05/30] xingxingdiandeng --- .../controller/msg/WxMsgController.java | 2 +- .../com/iformall/enums/EnumTemplateType.java | 6 +++--- .../iformall/mapper/WxTemplateMsgMapper.java | 1 + .../iformall/service/WxTemplateMsgService.java | 2 ++ .../service/impl/WxTemplateMsgServiceImpl.java | 18 +++++++++--------- .../resources/mapper/WxTemplateMsgMapper.xml | 8 ++++++++ 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 37a5daa2c..28e2e8d41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -71,7 +71,7 @@ public class WxMsgController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); wxTemplateMsg.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxTemplateMsgService.listAsPage(wxTemplateMsg, pageNum, pageSize); + final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index 6e9c6e3aa..3e5236d7a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -7,9 +7,9 @@ public enum EnumTemplateType { // 1-核销成功消息, 2-核销失败消息 - VERIFY_SUCCESS(1, "核销成功消息",""), // 小程序 - VERIFY_FAIL(2, "核销失败消息",""), // 小程序 - PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序 + VERIFY_SUCCESS(1, "核销成功消息",""), // 小程序(作废) + VERIFY_FAIL(2, "核销失败消息",""), // 小程序(作废) + PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序(作废) ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序 LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序 diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java index 6bd36fec4..fca40f672 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java @@ -8,4 +8,5 @@ public interface WxTemplateMsgMapper extends CommonMapper { List findList(WxTemplateMsg wxTemplateMsg); + List findListForMiniApp(WxTemplateMsg record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java b/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java index e56774ec5..b5d420c16 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java @@ -60,4 +60,6 @@ public interface WxTemplateMsgService { ResultData pushTemp(WxTemplateMsg wxTemplateMsg); + + PageInfo listAsPageForMiniApp(WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize); } 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 a5e19c2a0..42416a428 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -48,19 +48,14 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { WxTemplateMsg wxTemplateMsg = new WxTemplateMsg(); wxTemplateMsg.setTenantId(tenantId); wxTemplateMsg.setTemplateId(""); - wxTemplateMsg.setType(1); - wxTemplateMsg.setCustomParam("{\"index\":[\"keyword1\",\"keyword2\",\"keyword3\",\"keyword4\",\"keyword5\",\"keyword6\",\"keyword7\"]," + - "\"keyword1\":\"可抵{keyword1}元\",\"keyword2\":\"{keyword2}\",\"keyword3\":\"{keyword3}\",\"keyword4\":\"{keyword4}\"," + - "\"keyword5\":\"{keyword5}元\",\"keyword6\":\"{keyword6}\",\"keyword7\":\"猜也猜不到的优惠,只有幸运的人才能看到,就是你," + - "{keyword7}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n\",\"emphasis\":\"keyword1.DATA\"}"); + wxTemplateMsg.setType(EnumTemplateType.ACTIVITY_REMIND.getCode()); + wxTemplateMsg.setCustomParam("{\"index\": [\"thing13\", \"date5\", \"thing12\", \"thing1\", \"thing11\"], \"emphasis\": \"\"}"); wxTemplateMsg.setCreateDate(new Date()); wxTemplateMsg.setUpdateDate(new Date()); wxTemplateMsgMapper.insert(wxTemplateMsg); wxTemplateMsg.setId(null); - wxTemplateMsg.setType(2); - wxTemplateMsg.setCustomParam("{\"index\":[\"keyword1\",\"keyword2\",\"keyword3\",\"keyword4\"],\"keyword1\":\"可抵{keyword1}元\"," + - "\"keyword2\":\"{keyword2}\",\"keyword3\":\"{keyword3}\",\"keyword4\":\"猜也猜不到的优惠,只有幸运的人才能看到,就是你," + - "{keyword4}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n\",\"emphasis\":\"keyword1.DATA\"}"); + wxTemplateMsg.setType(EnumTemplateType.LIVE_REMIND.getCode()); + wxTemplateMsg.setCustomParam("{\"index\": [\"thing1\", \"date3\", \"thing4\", \"thing5\"], \"emphasis\": \"\"}"); wxTemplateMsgMapper.insert(wxTemplateMsg); } @@ -146,5 +141,10 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { return new ResultData(); } + @Override + public PageInfo listAsPageForMiniApp(WxTemplateMsg record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxTemplateMsgMapper.findListForMiniApp(record)); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml index e0214c84e..9f20cfbf8 100644 --- a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml @@ -64,5 +64,13 @@ + + From 2439a65965c14187eecc8f95dc5436f31aa22417 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 6 Nov 2020 14:30:28 +0800 Subject: [PATCH 06/30] bug --- .../main/java/com/iformall/controller/msg/WxMsgController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 28e2e8d41..af1e096a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -128,6 +128,9 @@ public class WxMsgController extends BaseController { @SystemControllerLog(description = "标签短信-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxMsgController::delete"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } wxMsgService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } From 76a15d08bf551cca4181f7cde0c7db149fe24939 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 6 Nov 2020 14:38:46 +0800 Subject: [PATCH 07/30] bug --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index de32f6904..f969bdff8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -224,7 +224,7 @@ + + + + + update wx_c_user set msg_count = msg_count+1 + where 1=1 + + and `id` = #{id} + + + and `open_id` = #{openId} + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + + update wx_c_user set msg_count = msg_count-1 + where msg_count > 0 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `open_id` in + + #{openId} + + + - update wx_c_user set msg_count = msg_count+1 + update wx_c_user set msg_count = msg_count+2 where 1=1 and `id` = #{id} @@ -260,13 +260,10 @@ update wx_c_user set msg_count = msg_count-1 - where msg_count > 0 + where msg_count > 0updateMsgCountDown and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `open_id` in #{openId} From 4cf675397cc2d0593fcad35d4c7f8f485539d324 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 10:10:33 +0800 Subject: [PATCH 13/30] bug --- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 86a5e2b5b..e9b6fff97 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -260,7 +260,7 @@ update wx_c_user set msg_count = msg_count-1 - where msg_count > 0updateMsgCountDown + where msg_count > 0 and `tenant_id` = #{tenantId} From a975bbcf266c02e16cbf32753dd5b6babbf2fe5a Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 10:32:11 +0800 Subject: [PATCH 14/30] bug --- .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 2 +- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 8bc96a700..4ebf9c976 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -39,5 +39,5 @@ public interface WxCUserMapper extends CommonMapper { void updateMsgCount(WxCUser user); - void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("openId")String[] split); + void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("array")String[] split); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index e9b6fff97..7f6c081c1 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -258,14 +258,14 @@ - + update wx_c_user set msg_count = msg_count-1 where msg_count > 0 and `tenant_id` = #{tenantId} and `open_id` in - + #{openId} From ac4cafdf82cc93ea84ebc87377c015deaf4a5a2b Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 10:43:26 +0800 Subject: [PATCH 15/30] bug --- .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 4ebf9c976..853ffcff6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -39,5 +39,5 @@ public interface WxCUserMapper extends CommonMapper { void updateMsgCount(WxCUser user); - void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("array")String[] split); + void updateMsgCountDown(@Param("tenantId")String tenantId, String[] split); } From 590496f10f7c85b70b7f7894f84289cc533ea483 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 10:48:53 +0800 Subject: [PATCH 16/30] bug --- .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 853ffcff6..954d407cd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -39,5 +39,5 @@ public interface WxCUserMapper extends CommonMapper { void updateMsgCount(WxCUser user); - void updateMsgCountDown(@Param("tenantId")String tenantId, String[] split); + void updateMsgCountDown(@Param("tenantId")String tenantId, String[] array); } From b2b2544a0c02f4e476fb7e2261eb65dedf6f0d60 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 10:59:16 +0800 Subject: [PATCH 17/30] bug --- .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 2 +- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 3 +++ .../iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java | 3 ++- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 954d407cd..8df7c87a2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -39,5 +39,5 @@ public interface WxCUserMapper extends CommonMapper { void updateMsgCount(WxCUser user); - void updateMsgCountDown(@Param("tenantId")String tenantId, String[] array); + void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("openIds")List list); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index b0421dc1b..21ea3a9c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -441,6 +441,9 @@ public class WxMsgServiceImpl implements WxMsgService { wxCUserQ.updateTenantInfo(tenantEntity); PageInfo openIdPage = wxCUserService.listOpenIdAsPage(wxCUserQ, 1, 1000); wxMsg.setExpectSendNumber((int) openIdPage.getTotal()); + if(openIdPage.getTotal() == 0){ + return; + } String phones = StringUtils.join(openIdPage.getList(), ","); smartAppMsg.setTo(phones); mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index fce0ad070..1062303eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -115,7 +116,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { // wxMaService.getMsgService().sendTemplateMsg(templateMessage); String[] split = smartAppMsg.getTo().split(","); - wxCUserMapper.updateMsgCountDown(tenantEntity.getTenantId(),split); + wxCUserMapper.updateMsgCountDown(tenantEntity.getTenantId(),Arrays.asList(split)); for (String to:split) { subscribeMessage = WxMaSubscribeMessage.builder() diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 7f6c081c1..aacc8adf2 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -265,7 +265,7 @@ and `tenant_id` = #{tenantId} and `open_id` in - + #{openId} From 402bf02bf8af9b69f88344b780012c54217c2d94 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 11:12:48 +0800 Subject: [PATCH 18/30] bug --- .../iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java | 2 +- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index 1062303eb..eabaa0888 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -70,7 +70,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { WxTemplateMsg msgQ = new WxTemplateMsg(); msgQ.updateTenantInfo(tenantEntity); msgQ.setType(smartAppMsg.getTemplateType()); - List list = wxTemplateMsgMapper.selectList(new QueryWrapper(msgQ)); + List list = wxTemplateMsgMapper.findList(msgQ); if (list.size() > 0) { msg = list.get(0); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index aacc8adf2..01a75bd25 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -258,14 +258,14 @@ - + update wx_c_user set msg_count = msg_count-1 where msg_count > 0 and `tenant_id` = #{tenantId} and `open_id` in - + #{openId} From 7679dc46530d5f34cf59099bd96fbade7bd31e2b Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 11:25:14 +0800 Subject: [PATCH 19/30] bug --- .../src/main/resources/mapper/WxTemplateMsgMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml index 9f20cfbf8..438f995dc 100644 --- a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml @@ -6,6 +6,8 @@ + + @@ -13,7 +15,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`template_id`,`type`,`create_date`,`update_date`,`on_off` + `id`,`tenant_id`,`parent_tenant_id`,`template_id`,`type`,`custom_param`,`create_date`,`update_date`,`on_off` From ab05ee4820b89d2159a26c1da98cd5d89ad35e68 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 11:33:22 +0800 Subject: [PATCH 20/30] bug --- .../iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index eabaa0888..76b6b5d75 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -52,7 +52,9 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { public void send(BaseMsg baseMsg) throws Exception{ SmartAppMsg smartAppMsg = (SmartAppMsg)baseMsg; - TenantEntity tenantEntity = smartAppMsg.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(smartAppMsg.getTenantId()); + tenantEntity.setParentTenantId(smartAppMsg.getParentTenantId()); WxTemplateMsg msg = null; WxMaSubscribeMessage subscribeMessage; From 1b9f7c421d4f357561ef402d32909c856be50bad Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 16:04:32 +0800 Subject: [PATCH 21/30] bug --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 2 ++ .../iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 21ea3a9c5..5fad88183 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -381,6 +381,8 @@ public class WxMsgServiceImpl implements WxMsgService { smartAppMsg.setTemplateType(wxTemplateMsg.getType()); JSONObject customParam = JSON.parseObject(wxMsg.getMsg()); + String goToPage = customParam.getString("goToPage"); + smartAppMsg.setGotopage(goToPage); if(wxTemplateMsg.getType() == EnumTemplateType.ACTIVITY_REMIND.getCode()){ /** * 活动名称:{{thing13.DATA}} diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index 76b6b5d75..def197751 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -124,6 +124,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { subscribeMessage = WxMaSubscribeMessage.builder() .templateId(msg.getTemplateId()) .toUser(to) + .page(smartAppMsg.getGotopage()) .lang(WxMaConstants.MiniprogramLang.ZH_CN) .miniprogramState(WxMaConstants.MiniprogramState.FORMAL) .page(smartAppMsg.getGotopage()) From 37527180599e0309a42e307db42d9c20063bd887 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 16:31:50 +0800 Subject: [PATCH 22/30] bug --- .../src/main/java/com/iformall/schedule/MsgSendingSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index e2c81334c..31f72f31c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -54,7 +54,7 @@ public class MsgSendingSchedule { logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list)); for (WxMsg msg : list) { //sendmsg(msg); - wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); + msg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); if(wxMsg.getWay() == EnumSendWay.TAG.getCode()){ msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); msg.setReceiver(msg.getPhones()); From 9ed979453991c1cd3ddadd3a0ea56ac307f018c8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 16:44:53 +0800 Subject: [PATCH 23/30] bug --- .../service/msg/impl/SendSmartAppMsgServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index def197751..56e2691f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -18,6 +18,7 @@ import com.iformall.service.WxAppinfoService; import com.iformall.service.msg.MsgSendService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.MaUtil; +import me.chanjar.weixin.common.error.WxErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -131,7 +132,11 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { .data(dataTempList) .build(); - wxMaService.getMsgService().sendSubscribeMsg(subscribeMessage); + try { + wxMaService.getMsgService().sendSubscribeMsg(subscribeMessage); + } catch (Exception e) { + logger.error("openId:"+to+"-----发送订阅消息失败"); + } } From 7cebcb2255fe65f45f8ac8359d9c153306f9b3e9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 16:47:25 +0800 Subject: [PATCH 24/30] bug --- .../iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index 56e2691f3..1631ca59e 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -122,7 +122,8 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { wxCUserMapper.updateMsgCountDown(tenantEntity.getTenantId(),Arrays.asList(split)); for (String to:split) { - subscribeMessage = WxMaSubscribeMessage.builder() + try { + subscribeMessage = WxMaSubscribeMessage.builder() .templateId(msg.getTemplateId()) .toUser(to) .page(smartAppMsg.getGotopage()) @@ -132,7 +133,6 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { .data(dataTempList) .build(); - try { wxMaService.getMsgService().sendSubscribeMsg(subscribeMessage); } catch (Exception e) { logger.error("openId:"+to+"-----发送订阅消息失败"); From 38832a0796b5b44b74ccd6bf39641741ff74692c Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 16:55:58 +0800 Subject: [PATCH 25/30] bug --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 5fad88183..ca15bbf0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -382,6 +382,9 @@ public class WxMsgServiceImpl implements WxMsgService { smartAppMsg.setTemplateType(wxTemplateMsg.getType()); JSONObject customParam = JSON.parseObject(wxMsg.getMsg()); String goToPage = customParam.getString("goToPage"); + if(StringUtils.isBlank(goToPage)){ + goToPage = "pages/index/index?type=in";//默认首页 + } smartAppMsg.setGotopage(goToPage); if(wxTemplateMsg.getType() == EnumTemplateType.ACTIVITY_REMIND.getCode()){ /** From 4635317302302919e406cef8120d8ca2005b4ea6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 Nov 2020 18:15:33 +0800 Subject: [PATCH 26/30] bug --- .../com/iformall/service/impl/WxTemplateMsgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 42416a428..5950d8e85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -119,7 +119,7 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { if(byId.getType() == EnumTemplateType.ACTIVITY_REMIND.getCode()){ try { s = wxMaService.getSubscribeService().addTemplate(EnumTemplateType.ACTIVITY_REMIND.getTid(), - Lists.newArrayList(13, 5, 12, 1, 11), ""); + Lists.newArrayList(13, 5, 12, 1, 11), EnumTemplateType.ACTIVITY_REMIND.getMessage()); } catch (WxErrorException e) { return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); } @@ -127,7 +127,7 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { }else if(byId.getType() == EnumTemplateType.LIVE_REMIND.getCode()){ try { s = wxMaService.getSubscribeService().addTemplate(EnumTemplateType.LIVE_REMIND.getTid(), - Lists.newArrayList(1, 3, 4, 5),""); + Lists.newArrayList(1, 3, 4, 5),EnumTemplateType.LIVE_REMIND.getMessage()); } catch (WxErrorException e) { return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); } From 9f8ca45d04fdf877eefa0955461f733268b28776 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 12 Nov 2020 09:49:18 +0800 Subject: [PATCH 27/30] bug --- .../com/iformall/service/impl/WxTemplateMsgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5950d8e85..3ca737ec0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -136,8 +136,8 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); } - byId.setTemplateId(s); - this.saveOrUpdate(byId); + wxTemplateMsg.setTemplateId(s); + this.saveOrUpdate(wxTemplateMsg); return new ResultData(); } From ef1ac128851507e803652586e064b83d7eea3f2e Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 12 Nov 2020 09:58:25 +0800 Subject: [PATCH 28/30] bug --- .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 2 +- .../service/msg/impl/SendSmartAppMsgServiceImpl.java | 2 +- .../src/main/resources/mapper/WxCUserMapper.xml | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 8df7c87a2..23af87b8b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -39,5 +39,5 @@ public interface WxCUserMapper extends CommonMapper { void updateMsgCount(WxCUser user); - void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("openIds")List list); + void updateMsgCountDown(@Param("tenantId")String tenantId, @Param("openId")String openId); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index 1631ca59e..9fbe2b42e 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -119,7 +119,6 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { // wxMaService.getMsgService().sendTemplateMsg(templateMessage); String[] split = smartAppMsg.getTo().split(","); - wxCUserMapper.updateMsgCountDown(tenantEntity.getTenantId(),Arrays.asList(split)); for (String to:split) { try { @@ -134,6 +133,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { .build(); wxMaService.getMsgService().sendSubscribeMsg(subscribeMessage); + wxCUserMapper.updateMsgCountDown(tenantEntity.getTenantId(),to); } catch (Exception e) { logger.error("openId:"+to+"-----发送订阅消息失败"); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 01a75bd25..bb8521154 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -258,19 +258,16 @@ - + update wx_c_user set msg_count = msg_count-1 where msg_count > 0 and `tenant_id` = #{tenantId} - and `open_id` in - - #{openId} - + and `open_id` = #{openId} - select from wx_c_user where `app_id` = #{appId} and `open_id` = #{openId} From 50bf81acd5550846cc858168edb7d49a18753b12 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 12 Nov 2020 10:10:13 +0800 Subject: [PATCH 29/30] bug --- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index bb8521154..cd4ca2b36 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -267,7 +267,7 @@ and `open_id` = #{openId} - select from wx_c_user where `app_id` = #{appId} and `open_id` = #{openId} From 3a45e4c6dea9f91ce699d1e191876d6bec2d2f46 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 12 Nov 2020 17:39:38 +0800 Subject: [PATCH 30/30] bug --- .../V202011120001__numericalGather.sql | 18 ++++++++++++++++++ .../java/com/iformall/domain/po/msg/WxMsg.java | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202011120001__numericalGather.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V202011120001__numericalGather.sql b/mallinkAdmin/src/main/resources/db/migration/V202011120001__numericalGather.sql new file mode 100644 index 000000000..cb8658cf9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202011120001__numericalGather.sql @@ -0,0 +1,18 @@ +--加商户收银数据采集菜单 +INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (209, '商户收银数据采集', 2, 'Y', NULL, 1, NULL, NULL, 'numericalGather', 'icon-shouyintai', 0, 205); + +--销售类型加权限 +update mall_sale_type set menus = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004]' where id=1; +update mall_sale_type set menus = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 931, 932, 951, 961]' where id=2; +update mall_sale_type set menus = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 931, 932]' where id=3; + +--所有广场管理员角色加权限 +INSERT INTO `mall_role_permission`(`id`, `tenant_id`, `parent_tenant_id`, `permission_id`, `role_id`) + select CEILING(RAND()*90000000000+10000000000) ,mui.tenant_id,mui.parent_tenant_id,209,mur.role_id +from mall_user_info mui +left join mall_user_role mur on mui.id = mur.uid +where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id; + + + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index db7629a21..904f0e48e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -83,11 +83,13 @@ public class WxMsg extends BaseMsg { public void updateTenantInfo(TenantEntity tenantEntity) { setTenantId(tenantEntity.getTenantId()); + setParentTenantId(tenantEntity.getParentTenantId()); } public TenantEntity getTenantInfo() { return new TenantEntity() {{ setTenantId(tenantId); + setParentTenantId(parentTenantId); }}; } }