Ver código fonte

fix:contact字段修改

jimmyyem 3 meses atrás
pai
commit
6a9048b8ce

+ 1 - 1
desc/wechat/label_relationship.api

@@ -82,7 +82,7 @@ type (
 		Cbirtharea *string `json:"cbirtharea,optional"`
 		CidcardNo *string `json:"cidcardNo,optional"`
 		Ctitle *string `json:"ctitle,optional"`
-		Cc *string `json:"c,optional"`
+		Cc *string `json:"cc,optional"`
 		Phone *string `json:"phone,optional"`
     }
     // The response data of label information | Label信息

+ 10 - 0
internal/logic/contact/create_contact_logic.go

@@ -46,6 +46,16 @@ func (l *CreateContactLogic) CreateContact(req *types.ContactInfo) (*types.BaseM
 		SetNotNilGname(req.Gname).
 		SetNotNilV3(req.V3).
 		SetOrganizationID(organizationId).
+		SetNotNilCtype(req.Ctype).
+		SetNotNilCname(req.Cname).
+		SetNotNilCarea(req.Carea).
+		SetNotNilCage(req.Cage).
+		SetNotNilCbirthday(req.Cbirtyday).
+		SetNotNilCbirtharea(req.Cbirtharea).
+		SetNotNilCc(req.Cc).
+		SetNotNilPhone(req.Phone).
+		SetNotNilCidcardNo(req.CidcardNo).
+		SetNotNilCtitle(req.Ctitle).
 		Save(l.ctx)
 
 	if err != nil {

+ 26 - 16
internal/logic/contact/get_contact_by_id_logic.go

@@ -50,22 +50,32 @@ func (l *GetContactByIdLogic) GetContactById(req *types.IDReq) (*types.ContactIn
 				CreatedAt: pointy.GetPointer(data.CreatedAt.UnixMilli()),
 				UpdatedAt: pointy.GetPointer(data.UpdatedAt.UnixMilli()),
 			},
-			Status:    &data.Status,
-			WxWxid:    &data.WxWxid,
-			Type:      &data.Type,
-			Wxid:      &data.Wxid,
-			Account:   &data.Account,
-			Nickname:  &data.Nickname,
-			Markname:  &data.Markname,
-			Headimg:   &data.Headimg,
-			Sex:       &data.Sex,
-			Starrole:  &data.Starrole,
-			Dontseeit: &data.Dontseeit,
-			Dontseeme: &data.Dontseeme,
-			Lag:       &data.Lag,
-			Gid:       &data.Gid,
-			Gname:     &data.Gname,
-			V3:        &data.V3,
+			Status:     &data.Status,
+			WxWxid:     &data.WxWxid,
+			Type:       &data.Type,
+			Wxid:       &data.Wxid,
+			Account:    &data.Account,
+			Nickname:   &data.Nickname,
+			Markname:   &data.Markname,
+			Headimg:    &data.Headimg,
+			Sex:        &data.Sex,
+			Starrole:   &data.Starrole,
+			Dontseeit:  &data.Dontseeit,
+			Dontseeme:  &data.Dontseeme,
+			Lag:        &data.Lag,
+			Gid:        &data.Gid,
+			Gname:      &data.Gname,
+			V3:         &data.V3,
+			Ctype:      &data.Ctype,
+			Cname:      &data.Cname,
+			Cage:       &data.Cage,
+			Carea:      &data.Carea,
+			Cc:         &data.Cc,
+			Phone:      &data.Phone,
+			Cbirtyday:  &data.Cbirthday,
+			Cbirtharea: &data.Cbirtharea,
+			CidcardNo:  &data.CidcardNo,
+			Ctitle:     &data.Ctitle,
 		},
 	}, nil
 }

+ 10 - 0
internal/logic/contact/get_contact_list_logic.go

@@ -168,6 +168,16 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
 				V3:                 &v.V3,
 				LabelRelationships: labelRelationships,
 				IsInBlockList:      &isInBlockList,
+				Ctype:              &v.Ctype,
+				Cname:              &v.Cname,
+				Cage:               &v.Cage,
+				Carea:              &v.Carea,
+				Cc:                 &v.Cc,
+				Phone:              &v.Phone,
+				Cbirtyday:          &v.Cbirthday,
+				Cbirtharea:         &v.Cbirtharea,
+				CidcardNo:          &v.CidcardNo,
+				Ctitle:             &v.Ctitle,
 			})
 	}
 

+ 9 - 0
internal/logic/contact/update_contact_logic.go

@@ -45,6 +45,15 @@ func (l *UpdateContactLogic) UpdateContact(req *types.ContactInfo) (*types.BaseM
 		SetNotNilGid(req.Gid).
 		SetNotNilGname(req.Gname).
 		SetNotNilV3(req.V3).
+		SetNotNilCname(req.Cname).
+		SetNotNilCarea(req.Carea).
+		SetNotNilCage(req.Cage).
+		SetNotNilCbirthday(req.Cbirtyday).
+		SetNotNilCbirtharea(req.Cbirtharea).
+		SetNotNilCc(req.Cc).
+		SetNotNilPhone(req.Phone).
+		SetNotNilCidcardNo(req.CidcardNo).
+		SetNotNilCtitle(req.Ctitle).
 		Exec(l.ctx)
 
 	if err != nil {

+ 1 - 1
internal/types/types.go

@@ -804,7 +804,7 @@ type ContactInfo struct {
 	Cbirtharea    *string `json:"cbirtharea,optional"`
 	CidcardNo     *string `json:"cidcardNo,optional"`
 	Ctitle        *string `json:"ctitle,optional"`
-	Cc            *string `json:"c,optional"`
+	Cc            *string `json:"cc,optional"`
 	Phone         *string `json:"phone,optional"`
 }