作者 yangfu

审核短信通知修改

@@ -11,6 +11,8 @@ import ( @@ -11,6 +11,8 @@ import (
11 type AuditCompanyCommand struct { 11 type AuditCompanyCommand struct {
12 // 企业id 12 // 企业id
13 CompanyId int64 `cname:"企业id" json:"companyId" valid:"Required"` 13 CompanyId int64 `cname:"企业id" json:"companyId" valid:"Required"`
  14 + // 手机号
  15 + Phone string `cname:"手机号" json:"phone" valid:"Required"`
14 // 审核状态 16 // 审核状态
15 Status int `cname:"审核状态" json:"status" valid:"Required"` 17 Status int `cname:"审核状态" json:"status" valid:"Required"`
16 // 备注 18 // 备注
@@ -8,6 +8,7 @@ import ( @@ -8,6 +8,7 @@ import (
8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/query" 8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/query"
9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
10 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" 10 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
  11 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/sms_serve"
11 ) 12 )
12 13
13 // 企业 14 // 企业
@@ -54,10 +55,18 @@ func (companyService *CompanyService) AuditCompany(cmd *command.AuditCompanyComm @@ -54,10 +55,18 @@ func (companyService *CompanyService) AuditCompany(cmd *command.AuditCompanyComm
54 if err != nil { 55 if err != nil {
55 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 56 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
56 } 57 }
  58 + smsServe := sms_serve.NewHttplibHttplibSmsServe()
57 if cmd.Status == domain.CompanyAuthenticated { 59 if cmd.Status == domain.CompanyAuthenticated {
58 - 60 + var tmpPhone []rune = []rune(cmd.Phone)
  61 + for i := 0; i < 4; i++ {
  62 + tmpPhone[i+3] = rune('*')
  63 + }
  64 + err = smsServe.SendNoticeSms(cmd.Phone, 5007040, map[string]interface{}{"phone": string(tmpPhone)})
59 } else if cmd.Status == domain.CompanyUnauthenticated { 65 } else if cmd.Status == domain.CompanyUnauthenticated {
60 - 66 + err = smsServe.SendNoticeSms(cmd.Phone, 5006964, map[string]interface{}{"reason": cmd.Remark})
  67 + }
  68 + if err != nil {
  69 + return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
61 } 70 }
62 return struct{}{}, nil 71 return struct{}{}, nil
63 } 72 }
@@ -64,7 +64,7 @@ func (smsServe HttplibSmsServe) SendSms(phone string) error { @@ -64,7 +64,7 @@ func (smsServe HttplibSmsServe) SendSms(phone string) error {
64 } 64 }
65 65
66 //SendSms 公共短信验证码服务 发送验证码 66 //SendSms 公共短信验证码服务 发送验证码
67 -func (smsServe HttplibSmsServe) SendNoticeSms(phone string, tplId int, tplValues []string) error { 67 +func (smsServe HttplibSmsServe) SendNoticeSms(phone string, tplId int, tplValues map[string]interface{}) error {
68 url := smsServe.baseUrL + "/service/sendNoticeSms" 68 url := smsServe.baseUrL + "/service/sendNoticeSms"
69 method := "post" 69 method := "post"
70 req := smsServe.CreateRequest(url, method) 70 req := smsServe.CreateRequest(url, method)
@@ -4,10 +4,11 @@ import ( @@ -4,10 +4,11 @@ import (
4 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/command" 4 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/command"
5 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/query" 5 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/query"
6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/service" 6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/background/company/service"
  7 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego/controllers"
7 ) 8 )
8 9
9 type CompanyController struct { 10 type CompanyController struct {
10 - baseController 11 + controllers.BaseController
11 } 12 }
12 13
13 // func (controller *CompanyController) CreateCompany() { 14 // func (controller *CompanyController) CreateCompany() {
@@ -51,7 +52,7 @@ func (controller *CompanyController) SearchCompany() { @@ -51,7 +52,7 @@ func (controller *CompanyController) SearchCompany() {
51 listCompanyQuery := &query.ListCompanyQuery{} 52 listCompanyQuery := &query.ListCompanyQuery{}
52 controller.Unmarshal(listCompanyQuery) 53 controller.Unmarshal(listCompanyQuery)
53 cnt, data, err := companyService.ListCompany(listCompanyQuery) 54 cnt, data, err := companyService.ListCompany(listCompanyQuery)
54 - controller.returnPageListData(cnt, data, err, listCompanyQuery.PageNumber) 55 + controller.ReturnPageListData(cnt, data, err, listCompanyQuery.PageNumber)
55 } 56 }
56 57
57 func (controller *CompanyController) AuditCompany() { 58 func (controller *CompanyController) AuditCompany() {