bugfix

src/main/java/com/caimei365/tools/model/dto/message/WechatTemplateMessage.java

@@ -259,20 +259,19 @@ public class WechatTemplateMessage {
         json.put("miniprogram", miniProgram);
 
         JSONObject data = new JSONObject();
-        data.put("first", first);
-        data.put("remark", remark);
-        keyWords.add(data);
         if ("2".equals(templateType)) {          //类目模板消息 mapKeyWords
             String jsonData = StringUtils.join(keyWords, ",");
             if(jsonData.contains("},{")){
                 jsonData = jsonData.replace("},{", ",");
             }
             data=JSONObject.parseObject(jsonData);
-        } else {                                 //模板消息 keyWords
+        } else {
+            data.put("first", first);//模板消息 keyWords
             for (int i = 0; i < keyWords.size(); i++) {
                 String key = "keyword" + (i + 1);
                 data.put(key, keyWords.get(i));
             }
+            data.put("remark", remark);
         }
         json.put("data", data);
         return json.toJSONString();

src/main/resources/mapper/BaseMapper.xml

@@ -210,7 +210,7 @@
         FROM cm_behavior_record b
         LEFT JOIN club c ON b.userID = c.userID
         LEFT JOIN serviceprovider sp ON c.spID = sp.serviceProviderID
-        WHERE b.userId !=0 and c.spId!=1342
+        WHERE b.userId !=0 and sp.status=90 and c.spId!=1342
         and b.pageType in (6, 8, 11)
         and DATE (b.accessTime) = DATE (#{accessTime})
         GROUP BY c.spId