From 3a6f54dbc367e1781d71e5ac0abf1b49e8d3f1f4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 6 Nov 2020 11:35:45 +0800 Subject: [PATCH] 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 @@ + +