🐛 #1699 企业微信模块修复添加企业客户标签接口

* 外部联系人客户详情新增增加字段

增加字段：remark_corp_name，addWay，oper_userid

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改测试类

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 客户标签组查询列表功能修改

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改测试类

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改 add_way字段错误

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改添加企业客户标签后无返回信息

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 外部联系人客户详情新增增加字段

增加字段：remark_corp_name，addWay，oper_userid

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改测试类

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改测试类

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改 add_way字段错误

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改添加企业客户标签后无返回信息

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改错误

Signed-off-by: huangxiaoming <huangxm129@163.com>

* 修改冲突

Signed-off-by: huangxiaoming <huangxm129@163.com>

Author: huangxm129

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java

@@ -239,7 +239,7 @@ public WxCpUserExternalTagGroupList getCorpTagList(String[] tagId) throws WxErro
   public WxCpUserExternalTagGroupInfo addCorpTag(WxCpUserExternalTagGroupInfo tagGroup) throws WxErrorException{
 
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(ADD_CORP_TAG);
-    final String result = this.mainService.post(url,tagGroup.toJson());
+    final String result = this.mainService.post(url,tagGroup.getTagGroup().toJson());
     return WxCpUserExternalTagGroupInfo.fromJson(result);
   }
 
@@ -262,7 +262,7 @@ public WxCpBaseResp delCorpTag(String[] tagId, String[] groupId) throws WxErrorE
       json.add("tag_id",new Gson().toJsonTree(tagId).getAsJsonArray());
     }
     if(ArrayUtils.isNotEmpty(groupId)){
-      json.add("group_id",new Gson().toJsonTree(tagId).getAsJsonArray());
+      json.add("group_id",new Gson().toJsonTree(groupId).getAsJsonArray());
     }
 
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(DEL_CORP_TAG);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalTagGroupInfo.java

@@ -15,24 +15,35 @@
 @Setter
 public class WxCpUserExternalTagGroupInfo extends WxCpBaseResp {
 
-  @SerializedName("group_id")
-  private String groupId;
+  @SerializedName("tag_group")
+  private TagGroup tagGroup;
 
-  @SerializedName("group_name")
-  private String groupName;
+  @Getter
+  @Setter
+  public static class TagGroup {
+
+    @SerializedName("group_id")
+    private String groupId;
+
+    @SerializedName("group_name")
+    private String groupName;
 
-  @SerializedName("create_time")
-  private Long createTime;
+    @SerializedName("create_time")
+    private Long createTime;
 
-  @SerializedName("order")
-  private Integer order;
+    @SerializedName("order")
+    private Integer order;
 
-  @SerializedName("deleted")
-  private Boolean deleted;
+    @SerializedName("deleted")
+    private Boolean deleted;
 
+    @SerializedName("tag")
+    private List<Tag> tag;
 
-  @SerializedName("tag")
-  private List<Tag> tag;
+    public String toJson() {
+      return WxGsonBuilder.create().toJson(this);
+    }
+  }
 
   @Getter
   @Setter

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java

@@ -117,20 +117,20 @@ public void testAddCorpTag() throws WxErrorException {
 
     List<WxCpUserExternalTagGroupInfo.Tag> list = new ArrayList<>();
     WxCpUserExternalTagGroupInfo.Tag  tag = new  WxCpUserExternalTagGroupInfo.Tag();
-    tag.setName("测试标签2");
+    tag.setName("测试标签20");
     tag.setOrder(1);
     list.add(tag);
 
-    WxCpUserExternalTagGroupInfo tagGroup = new WxCpUserExternalTagGroupInfo();
+    WxCpUserExternalTagGroupInfo tagGroupInfo = new WxCpUserExternalTagGroupInfo();
+    WxCpUserExternalTagGroupInfo.TagGroup tagGroup = new WxCpUserExternalTagGroupInfo.TagGroup();
     tagGroup.setGroupName("其他");
     tagGroup.setOrder(1);
     tagGroup.setTag(list);
+    tagGroupInfo.setTagGroup(tagGroup);
 
-    WxCpUserExternalTagGroupInfo result = this.wxCpService.getExternalContactService().addCorpTag(tagGroup);
+    WxCpUserExternalTagGroupInfo result = this.wxCpService.getExternalContactService().addCorpTag(tagGroupInfo);
 
-
-
-    System.out.println(result);
+    System.out.println(result.toJson());
     assertNotNull(result);
   }
 
@@ -146,8 +146,8 @@ public void testEditCorpTag() throws WxErrorException {
   @Test
   public void testDelCorpTag() throws WxErrorException {
 
-    String tagId[] = {"et2omCCwAA6PtGsfeEOQMENl3Ub1FA6A"};
-    String groupId[] = {};
+    String tagId[] = {};
+    String groupId[] = {"et2omCCwAAM3WzL00QpK9xARab3HGkAg"};
 
     WxCpBaseResp result = this.wxCpService.getExternalContactService().delCorpTag(tagId,groupId);