Browse Source

fix:修改拟人化变量

jimmyyem 3 weeks ago
parent
commit
9dfbcaef15
2 changed files with 8 additions and 8 deletions
  1. 4 4
      crontask/send_wx.go
  2. 4 4
      internal/logic/sop_task/publish_sop_task_logic.go

+ 4 - 4
crontask/send_wx.go

@@ -179,7 +179,7 @@ func containsPlaceholder(s string) bool {
 
 func varReplace(s string, contactInfo *ent.Contact) string {
 	nickname := ""
-	var cname, carea, cbirthday, cbirtharea, cidcard_no, ctitle, csex, cage string
+	var cname, carea, cbirthday, cbirtharea, cidcard_no, ctitle, sex, cage string
 	if contactInfo != nil {
 		nickname = contactInfo.Nickname
 		carea = contactInfo.Carea
@@ -189,9 +189,9 @@ func varReplace(s string, contactInfo *ent.Contact) string {
 		cidcard_no = contactInfo.CidcardNo
 		ctitle = contactInfo.Ctitle
 		if contactInfo.Sex == 1 {
-			csex = "男"
+			sex = "男"
 		} else if contactInfo.Sex == 2 {
-			csex = "女"
+			sex = "女"
 		}
 		age := contactInfo.Cage
 		cage = strconv.Itoa(age)
@@ -203,7 +203,7 @@ func varReplace(s string, contactInfo *ent.Contact) string {
 	s = strings.Replace(s, "${cbirtharea}", cbirtharea, -1)
 	s = strings.Replace(s, "${cidcard_no}", cidcard_no, -1)
 	s = strings.Replace(s, "${ctitle}", ctitle, -1)
-	s = strings.Replace(s, "${csex}", csex, -1)
+	s = strings.Replace(s, "${sex}", sex, -1)
 	s = strings.Replace(s, "${cage}", cage, -1)
 	return s
 }

+ 4 - 4
internal/logic/sop_task/publish_sop_task_logic.go

@@ -436,7 +436,7 @@ func splitString(input string) []string {
 
 func varReplace(s string, contactInfo *ent.Contact) string {
 	nickname := ""
-	var cname, carea, cbirthday, cbirtharea, cidcard_no, ctitle, csex, cage string
+	var cname, carea, cbirthday, cbirtharea, cidcard_no, ctitle, sex, cage string
 	if contactInfo != nil {
 		nickname = contactInfo.Nickname
 		carea = contactInfo.Carea
@@ -446,9 +446,9 @@ func varReplace(s string, contactInfo *ent.Contact) string {
 		cidcard_no = contactInfo.CidcardNo
 		ctitle = contactInfo.Ctitle
 		if contactInfo.Sex == 1 {
-			csex = "男"
+			sex = "男"
 		} else if contactInfo.Sex == 2 {
-			csex = "女"
+			sex = "女"
 		}
 		age := contactInfo.Cage
 		cage = strconv.Itoa(age)
@@ -461,7 +461,7 @@ func varReplace(s string, contactInfo *ent.Contact) string {
 	s = strings.Replace(s, "${cbirtharea}", cbirtharea, -1)
 	s = strings.Replace(s, "${cidcard_no}", cidcard_no, -1)
 	s = strings.Replace(s, "${ctitle}", ctitle, -1)
-	s = strings.Replace(s, "${csex}", csex, -1)
+	s = strings.Replace(s, "${sex}", sex, -1)
 	s = strings.Replace(s, "${cage}", cage, -1)
 	return s
 }