From d01fa6a0deccd247f1d5a94c9a138be8f07edec8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 14 Oct 2020 15:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/msg/WxMsgRecordController.java | 3 +- .../java/com/iformall/mq/MqBaseConsumer.java | 3 +- .../com/iformall/enums/EnumMsgRecordType.java | 3 +- .../impl/WxCouponOrderServiceImpl.java | 6 ++- .../service/impl/WxOrderPressServiceImpl.java | 3 +- .../msg/impl/SendSmartAppMsgServiceImpl.java | 44 ++++++++++++++----- .../controller/msg/WxMsgRecordController.java | 3 +- 7 files changed, 48 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 9c456eb7c..43c391a07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -90,7 +90,8 @@ public class WxMsgRecordController extends BaseController { wxMsg.setReceiver(wxMsgRecord.getReceiver()); wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }else if(EnumMsgRecordType.SMART_APP.getCode().equals(wxMsgRecord.getMsgType())){ +// }else if(EnumMsgRecordType.SMART_APP.getCode().equals(wxMsgRecord.getMsgType())){ + }else if(EnumMsgRecordType.SMART_APP_TO.getCode().equals(wxMsgRecord.getMsgType())){ //微信小程序 SmartAppMsg wxMsg = (SmartAppMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),SmartAppMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index db08e30cb..7de12a2a5 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -67,7 +67,8 @@ public class MqBaseConsumer { //邮件 MailMsg msg = (MailMsg)JsonUtil.readValue(message,MailMsg.class); sendEmailService.send(msg); - } else if(EnumMsgRecordType.SMART_APP.getCode().equals(baseMsg.getMsgType())){ +// } else if(EnumMsgRecordType.SMART_APP.getCode().equals(baseMsg.getMsgType())){ + } else if(EnumMsgRecordType.SMART_APP_TO.getCode().equals(baseMsg.getMsgType())){ //微信小程序-模板消息 SmartAppMsg msg = (SmartAppMsg)JsonUtil.readValue(message,SmartAppMsg.class); sendSmartAppMsgService.send(msg); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java index 3db9a9338..1d7181d26 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java @@ -7,7 +7,8 @@ public enum EnumMsgRecordType { SMS(1, "短信"), SMS_CALLBACK(2, "业务短信"), EMAIL(3, "邮件"), - SMART_APP(4, "小程序"), + SMART_APP(4, "小程序"),//模板消息作废 + SMART_APP_TO(44, "小程序"),//订阅消息 PUBLIC(5, "公众号"), SYSTEM(6, "系统通知"), SMART_APP_UNIFORM(7, "小程序统一消息"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 889e1ca6e..adf751344 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -954,7 +954,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { * 温馨提示 {{keyword7.DATA}} */ smartAppMsg = new SmartAppMsg(); - smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); +// smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); + smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP_TO.getCode()); smartAppMsg.setAppId(user.getAppId()); smartAppMsg.updateTenantInfo(couponOrder); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_SUCCESS.getCode()); @@ -989,7 +990,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { * 备注 {{keyword4.DATA}} */ smartAppMsg = new SmartAppMsg(); - smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); +// smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); + smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP_TO.getCode()); smartAppMsg.setAppId(user.getAppId()); smartAppMsg.updateTenantInfo(couponOrder); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_FAIL.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 767a4be5f..aed2ab8db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -226,7 +226,8 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { System.out.println(calendar.get(Calendar.DATE));// 加1之后的日期Top System.out.println(); smartAppMsg = new SmartAppMsg(); - smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); +// smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); + smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP_TO.getCode()); smartAppMsg.setAppId(user.getAppId()); smartAppMsg.setTenantId(user.getTenantId()); smartAppMsg.setTemplateType(EnumTemplateType.PRESS_SUCCESS.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 8e4392258..fef5760c3 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 @@ -1,8 +1,10 @@ package com.iformall.service.msg.impl; import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; +import cn.binarywang.wx.miniapp.constant.WxMaConstants; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -50,7 +52,8 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { TenantEntity tenantEntity = smartAppMsg.getTenantInfo(); WxTemplateMsg msg = null; - WxMaTemplateMessage templateMessage; + WxMaSubscribeMessage subscribeMessage; +// WxMaTemplateMessage templateMessage; WxMaService wxMaService = null; if(isFmOpen) { @@ -79,24 +82,45 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { String emphasis = customParam.getString("emphasis"); // build template data list - List dataTempList = new ArrayList<>(); List dataList = smartAppMsg.getDataList(); JSONArray indexArr = customParam.getJSONArray("index"); + + List dataTempList = new ArrayList<>(); for(int i=0;i dataTempList = new ArrayList<>(); +// for(int i=0;i