From 2d17c6c55e328c1fb17f04f6279a88469fade3f2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 25 Mar 2019 18:05:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/schedule/MsgSendingSchedule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index c7b603df9..03d245f8b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -49,8 +49,8 @@ public class MsgSendingSchedule { logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list)); for (WxMsg msg : list) { //sendmsg(msg); - wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); - wxMsg.setReceiver(msg.getPhones()); + msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); + msg.setReceiver(msg.getPhones()); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null); } logger.info("sendmsg定时任务结束"); From e0fa3e65b74189bf06606ea1d4e4280f2fffd19a Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 25 Mar 2019 18:20:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMsgRecordController.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java index d44e484f5..cc6739071 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java @@ -35,30 +35,30 @@ public class WxMsgRecordController extends BaseController { private SendCallBackSmsServiceImpl msgSendService; -// @GetMapping(value = "/test") -// public ResultData test() throws Exception{ -// String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00"); -// WxMsg wxMsg = new WxMsg(); -// wxMsg.setIsright(0); -// wxMsg.setSendtime(systemTime); -// wxMsg.setId(270060355273621504l); -// List list = wxMsgMapper.findList(wxMsg); -// logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list)); -// for (WxMsg msg : list) { -// //sendmsg(msg); -// msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); -// msg.setReceiver(msg.getPhones()); -// mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null); -// } -// + @GetMapping(value = "/test") + public ResultData test(Long id) throws Exception{ + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00"); + WxMsg wxMsg = new WxMsg(); + wxMsg.setIsright(0); + wxMsg.setSendtime(systemTime); + wxMsg.setId(id); + List list = wxMsgMapper.findList(wxMsg); + logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list)); + for (WxMsg msg : list) { + //sendmsg(msg); + msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); + msg.setReceiver(msg.getPhones()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null); + } + // String s = "{\"tenantId\":\"456\",\"uuid\":\"0a410e4e-c0ef-461e-bea8-7bd222e7c7b7\",\"delayTimeLevel\":0,\"id\":270060355273621504,\"modelId\":220401934081720320,\"msg\":\"狂欢双十一:更多礼品等你来领取\",\"sendtime\":\"2019-03-25 16:00:00\",\"createtime\":\"2019-03-25 15:30:16\",\"expectSendNumber\":1,\"phones\":\"18601973448\",\"signature\":\"富茂科技\",\"isright\":0,\"name\":\"狂欢双十一\",\"excelpath\":\"\",\"label\":\"\",\"status\":0,\"way\":1}"; // WxMsg wxMsg = (WxMsg) JsonUtil.readValue(s,WxMsg.class); // wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); // wxMsg.setReceiver("18601973448"); // wxMsg.setTenantId("456"); // msgSendService.send(wxMsg); -// return new ResultData(); -// } + return new ResultData(); + } /** * 重新发送失败的消息 From 11903372d5919231e0e45b5a3be3bd84ee64e556 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 25 Mar 2019 18:30:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2cd2c16fe..96fce619f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -180,6 +180,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(wxMerchant.getTenantId()); + wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); return wxMerchant;