Merge branch 'eta/1.3' into debug

controllers/eta_business/eta_business.go

@@ -399,6 +399,7 @@ func (this *EtaBusinessController) Add() {
 		br.ErrMsg = "生成商家编码失败, Err: " + e.Error()
 		return
 	}
+	codeEncrypt := utils.MD5(fmt.Sprintf("%s%s", businessCode, utils.BusinessCodeSalt))
 
 	now := time.Now().Local()
 	// 若当前时间不在首次签约时间内, 也算作已终止, 进入合约期时会由定时任务改为首次签约
@@ -418,6 +419,7 @@ func (this *EtaBusinessController) Add() {
 	businessItem := new(eta_business.EtaBusiness)
 	businessItem.BusinessName = req.BusinessName
 	businessItem.BusinessCode = businessCode
+	businessItem.CodeEncrypt = codeEncrypt
 	businessItem.CreditCode = req.CreditCode
 	businessItem.RegionType = req.RegionType
 	businessItem.Province = req.Province

models/eta_business/eta_business.go

@@ -19,6 +19,7 @@ type EtaBusiness struct {
 	EtaBusinessId    int       `orm:"column(eta_business_id);pk"`
 	BusinessName     string    `description:"商家名称"`
 	BusinessCode     string    `description:"商家编码"`
+	CodeEncrypt      string    `description:"商家编码加密"`
 	CreditCode       string    `description:"社会统一信用码"`
 	RegionType       string    `description:"所属区域：国内；海外"`
 	Province         string    `description:"省份"`

services/task.go

@@ -2,6 +2,8 @@ package services
 
 import (
 	"fmt"
+	"hongze/hz_crm_api/models/eta_business"
+	"hongze/hz_crm_api/utils"
 )
 
 func Task() {
@@ -11,5 +13,25 @@ func Task() {
 
 	go AutoInsertAdminOperateRecordToDB()
 
+	//go FixEtaBusinessCodeEncrypt()
+
 	fmt.Println("task end")
 }
+
+// FixEtaBusinessCodeEncrypt 修复商家编码
+func FixEtaBusinessCodeEncrypt() {
+	ob := new(eta_business.EtaBusiness)
+	list, e := ob.GetItemsByCondition("", make([]interface{}, 0), []string{}, "")
+	if e != nil {
+		fmt.Println(e.Error())
+		return
+	}
+
+	for _, v := range list {
+		v.CodeEncrypt = utils.MD5(fmt.Sprintf("%s%s", v.BusinessCode, utils.BusinessCodeSalt))
+		if e = v.Update([]string{"CodeEncrypt"}); e != nil {
+			fmt.Println(e.Error())
+			return
+		}
+	}
+}

utils/constants.go

@@ -508,3 +508,6 @@ const (
 	SOURCE_CRM_FLAG = 1
 	SOURCE_ETA_FLAG = 2
 )
+
+// BusinessCodeSalt 商家编码盐值
+const BusinessCodeSalt = "dr7WY0OZgGR7upw1"