bug: fix break change

src/main/java/com/huiju/estateagents/entity/TaMiniappTemplate.java

@@ -54,5 +54,13 @@ public class TaMiniappTemplate implements Serializable {
      */
     private Integer fieldNum;
 
+    /**
+     * 是否订阅消息
+     */
+    private Boolean isSubscribe;
 
+    /**
+     * 模板字段列表 | 分隔
+     */
+    private String tplFields;
 }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -76,94 +76,144 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
-        List<String> data = new ArrayList<String>(){{
-            add(name);
-            add(phone);
-            add(content);
-            add(DateUtils.cutSecond(dt));
-        }};
-
-        ResponseBean res = sendSubscribeMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
-        if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_NOTICE, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_NOTICE);
+
             // TODO
-            // 使用短信发送
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { name, content, DateUtils.cutSecond(dt) };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
+
+            sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
+            return;
         }
     }
     
     @Override
     public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-//        List<WxMaSubscribeData> data = new ArrayList<>();
-//        data.add(new WxMaSubscribeData("keyword1", result, "#fffff"));
-//        data.add(new WxMaSubscribeData("keyword2", activityName, "#fffff"));
-//        data.add(new WxMaSubscribeData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-
-        // WARN: break change
-        List<String> data = new ArrayList<String>(){{
-            add(activityName);
-            add(result);
-            add(DateUtils.cutSecond(dt));
-        }};
-
-        ResponseBean res = sendSubscribeMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
-        if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_HELP, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_HELP);
+
             // TODO
-            // 使用短信发送
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { activityName, result };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+            sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
+            return;
         }
     }
-    
+
     @Override
     public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-//        List<WxMaSubscribeData> data = new ArrayList<>();
-//        data.add(new WxMaSubscribeData("keyword1", result, "#fffff"));
-//        data.add(new WxMaSubscribeData("keyword2", activityName, "#fffff"));
-//        data.add(new WxMaSubscribeData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-
-        // WARN: break change
-        List<String> data = new ArrayList<String>(){{
-            add(activityName);
-            add(result);
-            add(DateUtils.cutSecond(dt));
-        }};
-
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_GROUP, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_GROUP);
 
-        ResponseBean res = sendSubscribeMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
-        if (res.getCode() != ResponseBean.CODE_SUCCESS) {
             // TODO
-            // 使用短信发送
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { activityName, result };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+            sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
+            return;
         }
     }
 
     @Override
     public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
-        List<String> data = new ArrayList<String>(){{
-            add(custName);
-            add(StringUtils.ifNull(phone, "未知"));
-            add(StringUtils.ifNull(sex, "未知"));
-            add(fromName);
-            add(bizType);
-            add(content);
-        }};
-
-        ResponseBean res = sendSubscribeMessage("mainbiz", toUser, link, data);
-        if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+        TaMiniappTemplate tpl = getTplByType("mainbiz", toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "mainbiz");
+
             // TODO
-            // 使用短信发送
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { custName, phone, sex, fromName, bizType, content };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword5", bizType, "#fffff"));
+            data.add(new WxMaTemplateData("keyword6", content, "#fffff"));
+
+            sendMessage("mainbiz", toUser, link, data);
+            return;
         }
     }
 
     @Override
     public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
-        List<String> data = new ArrayList<String>(){{
-            add(custName);
-            add(StringUtils.ifNull(phone, "未知"));
-            add(StringUtils.ifNull(sex, "未知"));
-            add(fromName);
-        }};
-
-        ResponseBean res = sendSubscribeMessage("newCustomer", toUser, link, data);
-        if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+        TaMiniappTemplate tpl = getTplByType("newCustomer", toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "newCustomer");
+
             // TODO
-            // 使用短信发送
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { custName, phone, sex, fromName };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
+
+            sendMessage("newCustomer", toUser, link, data);
+            return;
         }
     }
 
@@ -289,20 +339,22 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
-    private ResponseBean sendSubscribeMessage(String tplName, TaPerson toUser, String link, List<String> data) {
+    private ResponseBean sendSubscribeMessage(TaMiniappTemplate tpl, TaPerson toUser, String link, String[] data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {
             log.error("人员 {} 无对应来源小程序信息", toUser);
             return ResponseBean.error("消息接收人无 appid 信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        TaMiniappTemplate tpl = getTplByType(tplName, toUser.getMiniappId());
         if (null == tpl) {
-            log.error("模板 {} 不存在", tplName);
-            return ResponseBean.error("消息模板不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("小程序未设置消息模板", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        List<WxMaSubscribeData> sendData = createMessageData(data, tpl.getFieldNum());
+        if (StringUtils.isEmpty(tpl.getTplFields())) {
+            return ResponseBean.error("小程序消息模板未设置字段内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<WxMaSubscribeData> sendData = createMessageData(data, tpl.getTplFields());
 
         WxMaSubscribeMessage message = WxMaSubscribeMessage.builder()
                 .templateId(tpl.getTplId())
@@ -322,13 +374,15 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
-    private List<WxMaSubscribeData> createMessageData(List<String> list, Integer count) {
+    private List<WxMaSubscribeData> createMessageData(String[] list, String fieldsStr) {
         List<WxMaSubscribeData> data = new ArrayList<>();
-        if (list == null || list.size() == 0 || count == null || count == 0) return data;
+        if (list == null || list.length == 0 || StringUtils.isEmpty(fieldsStr)) return data;
+
+        String[] fileds = fieldsStr.split("\\|");
 
-        int length = count > list.size() ? list.size() : count;
+        int length = fileds.length > list.length ? list.length : fileds.length;
         for (int i = 0; i < length; i++) {
-            data.add(new WxMaSubscribeData("keyword"+ (i+1), list.get(i), "#fffff"));
+            data.add(new WxMaSubscribeData(fileds[i], list[i], "#fffff"));
         }
         return data;
     }