Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

UI/src/pages/sellmanage/pushMessage/index.js

@@ -445,19 +445,19 @@ class PushMessage extends React.Component {
               message1 = self.props.pushMessage.initData.items[key].message;
 
             }
-            if (self.state.msgComponent[key] && self.state.msgComponent[key].props.form
-              && ((self.state.msgComponent[key].props.form.getFieldValue('content')
-                || self.state.msgComponent[key].state.mediaId)
-                || self.state.msgComponent[key].props.form.getFieldValue('title')
-                || self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle'))) {
-              message1.content = self.state.msgComponent[key].props.form.getFieldValue('content')
-              message1.title = self.state.msgComponent[key].props.form.getFieldValue('title')
-              message1.description = self.state.msgComponent[key].props.form.getFieldValue('description')
-              message1.url = self.state.msgComponent[key].props.form.getFieldValue('url')
-              message1.miniAppTitle = self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle')
-              message1.miniProgramAppId = self.state.msgComponent[key].props.form.getFieldValue('miniProgramAppId')
-              message1.pagepath = self.state.msgComponent[key].props.form.getFieldValue('pagepath')
-            }
+            // if (self.state.msgComponent[key] && self.state.msgComponent[key].props.form
+            //   && ((self.state.msgComponent[key].props.form.getFieldValue('content')
+            //     || self.state.msgComponent[key].state.mediaId)
+            //     || self.state.msgComponent[key].props.form.getFieldValue('title')
+            //     || self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle'))) {
+            //   message1.content = self.state.msgComponent[key].props.form.getFieldValue('content')
+            //   message1.title = self.state.msgComponent[key].props.form.getFieldValue('title')
+            //   message1.description = self.state.msgComponent[key].props.form.getFieldValue('description')
+            //   message1.url = self.state.msgComponent[key].props.form.getFieldValue('url')
+            //   message1.miniAppTitle = self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle')
+            //   message1.miniProgramAppId = self.state.msgComponent[key].props.form.getFieldValue('miniProgramAppId')
+            //   message1.pagepath = self.state.msgComponent[key].props.form.getFieldValue('pagepath')
+            // }
 
             return (
               <div className={styles.connect} style={{ display: (key === self.state.currentState) ? "block" : "none" }}>

mpwechatApp/pom.xml

@@ -16,7 +16,7 @@
     <artifactId>mpwechatApp</artifactId>
     <packaging>jar</packaging>
 
-    <name>Wechat mp crm app with Spring Boot and WxJava</name>
+    <name>mpwechatApp</name>
     <description>基于 WxJava 和 Spring Boot 实现的微信公众号后端开发演示项目</description>
 
     <properties>

mpwechatApp/src/main/java/com/liangjian11/wx/mp/handler/MsgHandler.java

@@ -52,13 +52,13 @@ public class MsgHandler extends AbstractHandler {
             boolean isRepeat = false;
             if (messageRuleIdList != null && messageRuleIdList.size() > 0) {
                 List<Integer> messageIdList = new ArrayList<>();
-                Integer ruleId = messageRuleIdList.get(0).get("parentId");
-                messageIdList.add(Integer.valueOf(messageRuleIdList.get(0).get("messageId").toString()));
+                Integer ruleId = messageRuleIdList.get(0).get("parentid");
+                messageIdList.add(Integer.valueOf(messageRuleIdList.get(0).get("messageid").toString()));
                 for (int i = 1; i < messageRuleIdList.size(); i++) {
                     //两条不同规则则不推送
-                    if (!Integer.valueOf(messageRuleIdList.get(i).get("parentId").toString()).equals(ruleId))
+                    if (!Integer.valueOf(messageRuleIdList.get(i).get("parentid").toString()).equals(ruleId))
                         isRepeat = true;
-                    messageIdList.add(Integer.valueOf(messageRuleIdList.get(i).get("messageId").toString()));
+                    messageIdList.add(Integer.valueOf(messageRuleIdList.get(i).get("messageid").toString()));
                 }
                 if (!isRepeat) {
                     MsgHandler msgHandler = this;

mpwechatApp/src/main/java/com/liangjian11/wx/mp/service/impl/TagServiceImpl.java

@@ -64,7 +64,7 @@ public class TagServiceImpl   extends ServiceImpl<TagMapper, EsTagInfo> implemen
             Long wxTagid = Long.valueOf(tag.getTagValue());
             userTagService.tagDelete(wxTagid);
             // 删除对应标签
-            tagMapper.deleteById(String.valueOf(id));
+            tagMapper.deleteById(id);
             return ResultUtil.createSuccess("删除成功！");
         }else{
             return ResultUtil.createWarn("删除失败，该分组下还有粉丝！");