From a9f9e30089f51d2342b6f46d7f2892b10a654dc5 Mon Sep 17 00:00:00 2001 From: huangxm129 <40385667+huangxm129@users.noreply.github.com> Date: Thu, 6 Aug 2020 09:35:29 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20#1699=20=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=A8=A1=E5=9D=97=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 外部联系人客户详情新增增加字段 增加字段：remark_corp_name，addWay，oper_userid Signed-off-by: huangxiaoming * 修改测试类 Signed-off-by: huangxiaoming * 客户标签组查询列表功能修改 Signed-off-by: huangxiaoming * 修改测试类 Signed-off-by: huangxiaoming * 修改 add_way字段错误 Signed-off-by: huangxiaoming * 修改添加企业客户标签后无返回信息 Signed-off-by: huangxiaoming * 外部联系人客户详情新增增加字段 增加字段：remark_corp_name，addWay，oper_userid Signed-off-by: huangxiaoming * 修改测试类 Signed-off-by: huangxiaoming * 修改测试类 Signed-off-by: huangxiaoming * 修改 add_way字段错误 Signed-off-by: huangxiaoming * 修改添加企业客户标签后无返回信息 Signed-off-by: huangxiaoming * 修改错误 Signed-off-by: huangxiaoming * 修改冲突 Signed-off-by: huangxiaoming --- .../impl/WxCpExternalContactServiceImpl.java | 4 +-- .../cp/bean/WxCpUserExternalTagGroupInfo.java | 35 ++++++++++++------- .../WxCpExternalContactServiceImplTest.java | 16 ++++----- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java index f9058f017..b38c6b868 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java @@ -239,7 +239,7 @@ public class WxCpExternalContactServiceImpl implements WxCpExternalContactServic 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 class WxCpExternalContactServiceImpl implements WxCpExternalContactServic 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); diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalTagGroupInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalTagGroupInfo.java index 16d20d7ec..d0aa9fe32 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalTagGroupInfo.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalTagGroupInfo.java @@ -15,24 +15,35 @@ import java.util.List; @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("create_time") - private Long createTime; + @SerializedName("group_id") + private String groupId; - @SerializedName("order") - private Integer order; + @SerializedName("group_name") + private String groupName; - @SerializedName("deleted") - private Boolean deleted; + @SerializedName("create_time") + private Long createTime; + @SerializedName("order") + private Integer order; - @SerializedName("tag") - private List tag; + @SerializedName("deleted") + private Boolean deleted; + + @SerializedName("tag") + private List tag; + + public String toJson() { + return WxGsonBuilder.create().toJson(this); + } + } @Getter @Setter diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java index 2c63496f3..df086037a 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java @@ -117,20 +117,20 @@ public class WxCpExternalContactServiceImplTest { List 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 class WxCpExternalContactServiceImplTest { @Test public void testDelCorpTag() throws WxErrorException { - String tagId[] = {"et2omCCwAA6PtGsfeEOQMENl3Ub1FA6A"}; - String groupId[] = {}; + String tagId[] = {}; + String groupId[] = {"et2omCCwAAM3WzL00QpK9xARab3HGkAg"}; WxCpBaseResp result = this.wxCpService.getExternalContactService().delCorpTag(tagId,groupId);