Merge #126

126: 引入新请求类型，修复「添加企业客户标签」功能 r=xen0n a=rudy-tao

新增omitempty，防止请求时报空字符错误

Co-authored-by: rudy <40810931+chenyutaoa@users.noreply.github.com>

docs/apis.md

@@ -85,7 +85,7 @@ Name|Request Type|Response Type|Access Token|URL|Doc
 Name|Request Type|Response Type|Access Token|URL|Doc
 :---|------------|-------------|------------|:--|:--
 `execExternalContactListCorpTags`|`reqExternalContactListCorpTags`|`respExternalContactListCorpTags`|+|`POST /cgi-bin/externalcontact/get_corp_tag_list`|[获取企业标签库](https://work.weixin.qq.com/api/doc/90000/90135/92117)
-`execExternalContactAddCorpTag`|`reqExternalContactAddCorpTag`|`respExternalContactAddCorpTag`|+|`POST /cgi-bin/externalcontact/add_corp_tag`|[添加企业客户标签](https://work.weixin.qq.com/api/doc/90000/90135/92117)
+`execExternalContactAddCorpTag`|`reqExternalContactAddCorpTagGroup`|`respExternalContactAddCorpTag`|+|`POST /cgi-bin/externalcontact/add_corp_tag`|[添加企业客户标签](https://work.weixin.qq.com/api/doc/90000/90135/92117)
 `execExternalContactEditCorpTag`|`reqExternalContactEditCorpTag`|`respExternalContactEditCorpTag`|+|`POST /cgi-bin/externalcontact/edit_corp_tag`|[编辑企业客户标签](https://work.weixin.qq.com/api/doc/90000/90135/92117)
 `execExternalContactDelCorpTag`|`reqExternalContactDelCorpTag`|`respExternalContactDelCorpTag`|+|`POST /cgi-bin/externalcontact/del_corp_tag`|[删除企业客户标签](https://work.weixin.qq.com/api/doc/90000/90135/92117)
 `execExternalContactMarkTag`|`reqExternalContactMarkTag`|`respExternalContactMarkTag`|+|`POST /cgi-bin/externalcontact/mark_tag`|[标记客户企业标签](https://work.weixin.qq.com/api/doc/90000/90135/92118)

docs/external_contact.md

@@ -377,3 +377,20 @@ Name|JSON|Type|Doc
 Name|JSON|Type|Doc
 :---|:---|:---|:--
 `MediaID`|`media_id`|`string`| 文件的media_id
+
+### `ExternalContactAddCorpTag` 企业客户标签
+
+Name|JSON|Type|Doc
+:---|:---|:---|:--
+`Name`|`name,omitempty`|`string`| 标签名称
+`Order`|`order,omitempty`|`uint32`| 标签排序的次序值，order值大的排序靠前。有效的值范围是[0, 2^32)
+
+### `ExternalContactAddCorpTagGroup` 企业客户标签组
+
+Name|JSON|Type|Doc
+:---|:---|:---|:--
+`GroupID`|`group_id,omitempty`|`string`| 标签组id
+`GroupName`|`group_name,omitempty`|`string`| 标签组名称
+`Order`|`order,omitempty`|`uint32`| 标签组排序的次序值，order值大的排序靠前。有效的值范围是[0, 2^32)
+`Tag`|`tag,omitempty`|`[]ExternalContactAddCorpTag`| 标签组内的标签列表
+`AgentID`|`agentid,omitempty`|`int64`| 授权方安装的应用agentid。仅旧的第三方多应用套件需要填此参数

external_contact.go

@@ -59,12 +59,12 @@ func (c *WorkwxApp) ListExternalContactCorpTags(tagIDs ...string) ([]ExternalCon
 }
 
 // AddExternalContactCorpTag 添加企业客户标签
-func (c *WorkwxApp) AddExternalContactCorpTag(req ExternalContactCorpTagGroup) ([]ExternalContactCorpTagGroup, error) {
-	resp, err := c.execExternalContactAddCorpTag(reqExternalContactAddCorpTag{
-		ExternalContactCorpTagGroup: req,
+func (c *WorkwxApp) AddExternalContactCorpTag(req ExternalContactAddCorpTagGroup) (ExternalContactCorpTagGroup, error) {
+	resp, err := c.execExternalContactAddCorpTag(reqExternalContactAddCorpTagGroup{
+		ExternalContactAddCorpTagGroup: req,
 	})
 	if err != nil {
-		return nil, err
+		return ExternalContactCorpTagGroup{}, err
 	}
 	return resp.TagGroup, nil
 }

models.go

@@ -523,7 +523,7 @@ func (x reqExternalContactAddCorpTag) intoBody() ([]byte, error) {
 type respExternalContactAddCorpTag struct {
 	respCommon
 	// 标签组列表
-	TagGroup []ExternalContactCorpTagGroup `json:"tag_group"`
+	TagGroup ExternalContactCorpTagGroup `json:"tag_group"`
 }
 
 // reqExternalContactEditCorpTag 编辑企业客户标签
@@ -1272,3 +1272,21 @@ type AddMsgTemplateDetail struct {
 	FailList []string `json:"fail_list"`
 	MsgID    string   `json:"msgid"`
 }
+
+// reqExternalContactAddCorpTag 添加企业客户标签
+type reqExternalContactAddCorpTagGroup struct {
+	ExternalContactAddCorpTagGroup
+}
+
+var _ bodyer = reqExternalContactAddCorpTagGroup{}
+
+func (x reqExternalContactAddCorpTagGroup) intoBody() ([]byte, error) {
+	result, err := json.Marshal(x.ExternalContactAddCorpTagGroup)
+	if err != nil {
+		// should never happen unless OOM or similar bad things
+		// TODO: error_chain
+		return nil, err
+	}
+
+	return result, nil
+}