BUG修复0706_1450

UI/src/pages/sellmanage/channelCode.js

@@ -2911,7 +2911,7 @@ class BirdGridPermissionPage extends React.Component {
                     outline: "none"
                   }}
                 >
-                  {item.Tagname}
+                  {item.TagName}
                 </button>
               );
             })}

UI/src/utils/config.js

@@ -5,12 +5,13 @@ const APIV4 = 'http://192.168.50.32:8005'
 
 const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
 const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
-const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
-const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
+// const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
+// const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
 
 // const APIV3Auth = 'http://192.168.50.32:8031'
 // const WXAPIV5= 'http://localhost:7000'
-// const WXMpAPI= 'http://localhost:8081'
+const WXMpAPI= 'http://localhost:8081'
+const staticMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',

mpwechatApp/src/main/java/com/liangjian11/wx/mp/controller/WxFansTagController.java

@@ -80,13 +80,14 @@ public class WxFansTagController {
                     tag.setTagValue(wxUserTag.getId().toString());
                     tag.setTagName(wxUserTag.getName());
                     tag.setAppId(appid);
+                    tag.setTagTypeId("24");
                     tagService.save(tag);
                 }
             }
 
             // 本地有但微信方没有，删除本地的标签
             for (String tagName : tagNameList) {
-                tagService.delete(appid, tagName);
+                tagService.deleteAll(appid, tagName);
             }
 
             ResultInfo body = tagService.queryTagList(data);
@@ -185,12 +186,10 @@ public class WxFansTagController {
 
     @GetMapping("/queryAll")
     public ResultInfo queryAll(@PathVariable String appid) {
-        return tagService.queryAll(appid);
+        return new ResultInfo(ResultInfo.TYPE_RESULT_SUCCESS, 1, "查询成功", tagService.queryAll(appid));
     }
 
 
-//
-
 //    /**
 //     * 获取标签下的粉丝，未分页
 //     * @param appid

mpwechatApp/src/main/java/com/liangjian11/wx/mp/service/TagService.java

@@ -33,5 +33,5 @@ public interface TagService extends IService<EsTagInfo> {
      * @param appid
      * @param tagName
      */
-    void delete(String appid, String tagName);
+    void deleteAll(String appid, String tagName);
 }

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

@@ -82,8 +82,12 @@ public class TagServiceImpl   extends ServiceImpl<TagMapper, EsTagInfo> implemen
     }
 
     @Override
-    public void delete(String appid, String tagName) {
-
+    @Transactional(transactionManager = "fooManager")
+    public void deleteAll(String appid, String tagName) {
+        UpdateWrapper<EsTagInfo> wrapper = new UpdateWrapper<>();
+        wrapper.eq("appid", appid);
+        wrapper.eq("tagname", tagName);
+        tagMapper.delete(wrapper);
     }
 
 

mpwechatApp/src/main/resources/application-pgdev.properties

@@ -5,7 +5,7 @@ project.weburl = http://192.168.50.32:13001/mpwechat
 material.Locations = D:\\public\\material
 material.href= /public/material
 #\u670D\u52A1\u540D
-spring.application.name = mpwechatT
+spring.application.name = mpwechatWHC
 
 #spring cloud eureka
 eureka.client.service-url.defaultZone = http://liangjian:360lj.comOauth2passwd@192.168.50.32:11002/eureka/