zhangchuanxing пре 6 дана
родитељ
комит
188df607c8
2 измењених фајлова са 15 додато и 2 уклоњено
  1. 11 1
      controllers/jinmencaijing.go
  2. 4 1
      models/response/jinmencaijing/jinmencaijing.go

+ 11 - 1
controllers/jinmencaijing.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"encoding/json"
 	jinmencaijingReq "hongze/hongze_open_api/models/request/jinmencaijing"
 	jinmencaijingReq "hongze/hongze_open_api/models/request/jinmencaijing"
 	"hongze/hongze_open_api/models/response/jinmencaijing"
 	"hongze/hongze_open_api/models/response/jinmencaijing"
+	"hongze/hongze_open_api/models/tables/company"
 	"hongze/hongze_open_api/models/tables/company_product"
 	"hongze/hongze_open_api/models/tables/company_product"
 	"hongze/hongze_open_api/models/tables/company_report_permission"
 	"hongze/hongze_open_api/models/tables/company_report_permission"
 	cygxActivity "hongze/hongze_open_api/models/tables/cygx/cygx_activity"
 	cygxActivity "hongze/hongze_open_api/models/tables/cygx/cygx_activity"
@@ -251,6 +252,7 @@ func (c *JinMenCaiJingController) ActivityWhiteCheck() {
 	resp := new(jinmencaijing.CygxActivityWhiteCheckResp)
 	resp := new(jinmencaijing.CygxActivityWhiteCheckResp)
 	if userTotal == 0 {
 	if userTotal == 0 {
 		c.OkDetailed(resp, "获取成功")
 		c.OkDetailed(resp, "获取成功")
+		return
 	} else {
 	} else {
 		user, err = wx_user.GetByUserMobile(deMobile)
 		user, err = wx_user.GetByUserMobile(deMobile)
 		if err != nil {
 		if err != nil {
@@ -258,6 +260,14 @@ func (c *JinMenCaiJingController) ActivityWhiteCheck() {
 			return
 			return
 		}
 		}
 	}
 	}
+	companyInfo, err := company.GetCompanyById(user.CompanyId)
+	if err != nil {
+		c.FailWithMessage("获取客户信息失败")
+		return
+	}
+	resp.RealName = user.RealName
+	resp.Position = user.Position
+	resp.CompanyName = companyInfo.CompanyName
 	if activityInfo.LimitPeopleNum > 0 {
 	if activityInfo.LimitPeopleNum > 0 {
 		total, err := company_product.CheckUserAaiPerssionByMobile(deMobile)
 		total, err := company_product.CheckUserAaiPerssionByMobile(deMobile)
 		if err != nil {
 		if err != nil {
@@ -343,7 +353,7 @@ func (c *JinMenCaiJingController) ActivitySignupDetail() {
 }
 }
 
 
 //func init() {
 //func init() {
-//	mobile := "15557271717"
+//	mobile := "15557270777"
 //	encryptMobile := string(utils.DesBase64Encrypt([]byte(mobile)))
 //	encryptMobile := string(utils.DesBase64Encrypt([]byte(mobile)))
 //	fmt.Println(encryptMobile)
 //	fmt.Println(encryptMobile)
 //}
 //}

+ 4 - 1
models/response/jinmencaijing/jinmencaijing.go

@@ -62,7 +62,10 @@ type CygxActivitySignupcancelResp struct {
 
 
 // 是否在白名单结构体
 // 是否在白名单结构体
 type CygxActivityWhiteCheckResp struct {
 type CygxActivityWhiteCheckResp struct {
-	IsWhite bool `json:"is_white" description:"是否在白名单里面"`
+	IsWhite     bool   `json:"is_white" description:"是否在白名单里面"`
+	RealName    string `json:"real_name" description:"姓名"`
+	Position    string `json:"position" description:"职位"`
+	CompanyName string `json:"company_name" description:"客户(公司)名称"`
 }
 }
 
 
 // 活动报名信息回显结构体
 // 活动报名信息回显结构体