Browse Source

模板消息

liaoyongfei 4 years ago
parent
commit
5f2dc176b2

+ 3 - 3
UI/src/pages/sellmanage/templateMessage/index.js

@@ -442,7 +442,7 @@ class TemplateMessage extends React.Component {
         name: "批量删除",
         onClick: (dataArr) => {
           if (dataArr.length == 0) {
-            message.warning('請勾選模板消息列表');
+            message.warning('请勾选模板消息列表');
           } else {
             request({
               url: WXMpAPI + `/wx/message/deleteTemplateMsg/${self.props.wxAppIdValue}?idList=` + dataArr,
@@ -465,9 +465,9 @@ class TemplateMessage extends React.Component {
         { title: "推送主題", data: "theme", type: "text", query: false },
         { title: "推送时间", data: "sendTime", type: "datetime", editor: {}, query: true },
         { title: "推送对象", data: "tagNames", type: "text", editor: {}, query: true },
-        { title: "推送人", data: "persons", type: "text", query: false },
+        { title: "推送人", data: "persons", type: "text", query: false },
         {
-          title: "狀態", data: "state", type: "number", query: false,
+          title: "状态", data: "state", type: "number", query: false,
           render: state =>
             state == 0 ?
               <div>草稿</div> : state == 1 ?

+ 3 - 0
mpwechatApp/src/main/java/com/liangjian11/wx/mp/modle/TemplateMessage.java

@@ -76,6 +76,9 @@ public class TemplateMessage extends Model<TemplateMessage> {
     @TableField(exist = false)
     private String example;
 
+    @TableField(exist = false)
+    private String title;
+
     @TableField(exist = false)
     private String stateName;
 

+ 24 - 12
mpwechatApp/src/main/java/com/liangjian11/wx/mp/service/impl/TemplateMessageServiceImpl.java

@@ -164,24 +164,28 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
         message=messageList.get(0);
         TemplateMessage templateMessage;
         if(templateMsgId==null ||templateMsgId.equals(0)){
-            List<String>fields= getSendDataTemp(message.getContent());
+            Map<String,List<String>> map = getSendDataTemp(message.getContent());
+            List<String> listPrefix = map.get("listPrefix");
+            List<String> listField = map.get("listField");
             JSONObject jo =new JSONObject();
             JSONObject j1;
             JSONArray ja =new JSONArray();
             JSONObject ja1;
-            for(String field:fields){
+            for(int i=0;i<listField.size();i++){
                 j1=new JSONObject();
-                ja1=new JSONObject();
                 j1.put("value","");
                 j1.put("color","#000000");
-                jo.put(field,j1);
+                j1.put("prefix",listPrefix.get(i));
+                jo.put(listField.get(i),j1);
+                ja1=new JSONObject();
                 ja1.put("value","");
                 ja1.put("color","#000000");
-                ja1.put("lable",field);
-                ja1.put("message",field+"未填写");
+                ja1.put("lable",listField.get(i));
+                ja1.put("message",listField.get(i)+"未填写");
+                ja1.put("prefix",listPrefix.get(i));
                 ja.add(ja1);
             }
-            templateMessage=new TemplateMessage(String.join(",",fields),jo.toJSONString(),message.getMsgId(),appId,templateId);
+            templateMessage=new TemplateMessage(String.join(",",listField),jo.toJSONString(),message.getMsgId(),appId,templateId);
             templateMessage.setContentValueList(ja);
             templateMessage.setExample(message.getExample());
             templateMessage.setContent(message.getContent());
@@ -199,6 +203,7 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
                 ja1.put("value",jaValue.get("value")!=null?jaValue.get("value").toString():"");
                 ja1.put("color",jaValue.get("color")!=null?jaValue.get("color").toString():"#000000");
                 ja1.put("message",field+"未填写");
+                ja1.put("prefix",jaValue.get("prefix")!=null?jaValue.get("prefix").toString():"");
                 ja.add(ja1);
             }
             templateMessage.setContentValueList(ja);
@@ -298,18 +303,25 @@ public class TemplateMessageServiceImpl extends ServiceImpl<TemplateMessageMappe
         return new ResultInfo(ResultInfo.TYPE_RESULT_SUCCESS,200,"参数验证通过");
     }
 
-    private static List<String> getSendDataTemp(String content) {
-        List<String> list = new ArrayList<>();
+    private static Map<String,List<String>> getSendDataTemp(String content) {
+        List<String> listPrefix = new ArrayList<>();
+        List<String> listField = new ArrayList<>();
         int beginWord = content.indexOf("{{");
         int endWord = -1;
         String word;
+        String prefix;
         while (beginWord > -1) {
-            endWord = content.indexOf("}}")+2;
+            endWord = content.indexOf("}}") + 2;
             word = content.substring(beginWord, endWord);
+            prefix = content.substring(0, beginWord).replace("\r", "").replace("\n", "");
             content = content.substring(endWord);
-            list.add(word.replace("{{","").replace("}}","").replace(".DATA",""));
+            listField.add(word.replace("{{", "").replace("}}", "").replace(".DATA", ""));
+            listPrefix.add(prefix);
             beginWord = content.indexOf("{{");
         }
-        return list;
+        Map<String, List<String>> map = new HashMap<>();
+        map.put("listField", listField);
+        map.put("listPrefix", listPrefix);
+        return map;
     }
 }

+ 2 - 1
mpwechatApp/src/main/resources/mapper/TemplateMessageMapper.xml

@@ -26,10 +26,11 @@
 
         <result column="content" property="content"></result>
         <result column="example" property="example"></result>
+        <result column="title" property="title"></result>
     </resultMap>
 
     <select id="getListOfPage" resultMap="templateMessageMap">
-        SELECT  <include refid="templateMessageSQL"></include> ,message.content, message.example
+        SELECT  <include refid="templateMessageSQL"></include> ,message.content, message.example, message.title
         from templateMessage
         join message on templateMessage.messageId = message.msg_id
         ${filterSql}