Merge branch 'master' into CRM_12.9

go.mod

@@ -1,21 +1,45 @@
 module hongze/hongze_task
 
-go 1.16
+go 1.18
 
 require (
 	github.com/PuerkitoBio/goquery v1.8.0
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 // indirect
-	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/beego/beego/v2 v2.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/rdlucklib/rdluck_tools v1.0.2
-	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1
 	github.com/tealeg/xlsx v1.0.5
 	github.com/wenzhenxi/gorsa v0.0.0-20210524035706-528c7050d703
 	github.com/yidane/formula v0.0.0-20210902154546-0782e1736717
-	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
+
+require (
+	github.com/andybalholm/cascadia v1.3.1 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 // indirect
+	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 // indirect
+	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)

models/company/company.go

@@ -11,8 +11,8 @@ import (
 // TryOutToFormal 试用转正式
 func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -22,11 +22,22 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 			tx.Commit()
 		}
 	}()
+
+	// 套餐类型为0时, 不更新套餐类型
 	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
-	if err != nil {
-		return
+	if packageType == 0 {
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, startDate, endDate, companyId, productId).Exec()
+		if err != nil {
+			return
+		}
+	} else {
+		_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
+		if err != nil {
+			return
+		}
 	}
+
 	sql = `UPDATE company SET type=1,last_updated_time=NOW() WHERE company_id=? `
 	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
@@ -65,7 +76,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 		sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status,is_upgrade) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?,?) `
-		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式",pv.IsUpgrade).Exec()
+		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式", pv.IsUpgrade).Exec()
 		if err != nil {
 			return
 		}
@@ -73,11 +84,11 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 	return
 }
 
-//服务更新
+// 服务更新
 func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -140,8 +151,8 @@ func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int
 
 func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -219,10 +230,19 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 	//}
 
 	//更新客户产品信息
-	sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
-	if err != nil {
-		return
+	if packageType == 0 {
+		// 套餐类型为0时, 不更新套餐类型
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, companyId, productId).Exec()
+		if err != nil {
+			return
+		}
+	} else {
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
+		if err != nil {
+			return
+		}
 	}
 
 	contractPermission := make([]*company_contract.CompanyContractPermission, 0)

models/company_product.go

@@ -246,7 +246,7 @@ func GetSellersOpenId() (items []*Sellers, err error) {
 
 func GetRemindCompany(sellerId int, endDate string) (items []*CompanyProduct, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT b.end_date,b.contract_end_date,a.company_name,b.status,b.seller_id,b.seller_name FROM
+	sql := ` SELECT b.end_date,b.contract_end_date,a.company_id,a.company_name,b.status,b.seller_id,b.seller_name FROM
 	company a
 	INNER JOIN company_product AS b ON a.company_id = b.company_id 
 WHERE

models/company_remind_record.go

@@ -0,0 +1,30 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// CompanyRemindRecord 客户提醒记录
+type CompanyRemindRecord struct {
+	CompanyRemindRecordId int `orm:"column(company_remind_record_id);pk"`
+	Type             int `description:"过期类型，1:1天，2:7天，3:15天；4:30天"`
+	SellerId             int `description:"销售id"`
+	SellerName            string `description:"销售名称"`
+	CompanyId             int `description:"客户id"`
+	CompanyName            string `description:"客户名称"`
+	Status                string `description:"客户状态"`
+	EndDate               string `description:"到期日期"`
+	UniqueCode            string `description:"唯一code"`
+	CreateTime            time.Time
+}
+
+// AddMultiCompanyRemindRecord 批量添加客户提醒记录
+func AddMultiCompanyRemindRecord(list []*CompanyRemindRecord) (err error) {
+	if len(list) <= 0 {
+		return
+	}
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(list), list)
+	return
+}

models/data_manage/trade_position_analysis.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_task/utils"
 	"time"
@@ -90,27 +91,27 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 	return
 }
 
-
 func GetTradePositionTopByExchangeDataTime(exchange string, startDate, endDate string) (list []*TradePositionTop, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM trade_position_"+exchange+"_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
+	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 	return
 }
 
 func GetTradePositionTopCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT count(*) FROM trade_position_"+exchange+"_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
+	sql := "SELECT count(*) FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = o.Raw(sql, startDate, endDate).QueryRow(&count)
 	return
 }
 
 func GetTradePositionTopByExchangeSourceType(exchange string, dataTime string, sourceType int) (list []*TradePositionTop, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM trade_position_"+exchange+"_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
+	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
 	_, err = o.Raw(sql, dataTime, sourceType).QueryRows(&list)
 	return
 }
+
 type TradeTopClassify struct {
 	ClassifyName string //分类名称
 	ClassifyType string //分类名称下的类型
@@ -149,7 +150,7 @@ type UpdateDealValueChange struct {
 
 func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	p, err := o.Raw("UPDATE trade_position_"+exchange+"_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?").Prepare()
+	p, err := o.Raw("UPDATE trade_position_" + exchange + "_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?").Prepare()
 	if err != nil {
 		return
 	}
@@ -167,29 +168,38 @@ func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (e
 
 func DeletePositionTopByDataTime(exchange string, dataTime string, dealType int) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "delete from trade_position_"+exchange+"_Top WHERE data_time=? and deal_type=?"
+	sql := "delete from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
 	_, err = o.Raw(sql, dataTime, dealType).Exec()
 	return
 }
 
 func GetTradePositionTopByExchangeDataTimeType(exchange string, dataTime string, dealType int) (list []TradePositionTop, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "select * from trade_position_"+exchange+"_Top WHERE data_time=? and deal_type=?"
-	_, err = o.Raw(sql,dataTime, dealType).QueryRows(&list)
+	sql := "select * from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
+	_, err = o.Raw(sql, dataTime, dealType).QueryRows(&list)
 	return
 }
 
 func MultiInsertTradeBaseDataToTop(exchange string, startDate, endDate string) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	now := time.Now().Format(utils.FormatDateTime)
-	sql1 := `INSERT INTO trade_position_`+exchange+`_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,rank,?,? FROM base_from_trade_`+exchange+`_index where rank <50 and buy_short_name !="" and data_time between ? and ?`
+	sql1 := `INSERT INTO trade_position_` + exchange + `_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
+	SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,rank,?,? FROM base_from_trade_` + exchange + `_index where rank <50 and buy_short_name !="" and data_time between ? and ?`
 	_, err = o.Raw(sql1, now, now, startDate, endDate).Exec()
 	if err != nil {
 		return
 	}
-	sql2 := `INSERT INTO trade_position_`+exchange+`_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-SELECT classify_name,classify_type,sold_short_name,sold_value,sold_change,data_time,2,0,rank,?,? FROM base_from_trade_`+exchange+`_index where rank <50 and sold_short_name !="" and data_time between ? and ?`
+	sql2 := `INSERT INTO trade_position_` + exchange + `_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
+SELECT classify_name,classify_type,sold_short_name,sold_value,sold_change,data_time,2,0,rank,?,? FROM base_from_trade_` + exchange + `_index where rank <50 and sold_short_name !="" and data_time between ? and ?`
 	_, err = o.Raw(sql2, now, now, startDate, endDate).Exec()
 	return
 }
+
+// GetTradePositionTopOriginDataTimes 获取榜单原始数据日期-正序
+func GetTradePositionTopOriginDataTimes(exchange string) (dates []string, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT DISTINCT data_time FROM base_from_trade_%s_index ORDER BY data_time ASC`
+	sql = fmt.Sprintf(sql, exchange)
+	_, err = o.Raw(sql).QueryRows(&dates)
+	return
+}

models/db.go

@@ -109,6 +109,7 @@ func initCompany() {
 		new(CompanyEndDate),
 		new(CompanyProductUpdateLog), //客户产品状态变更表
 		new(CompanyViewStatistics),
+		new(CompanyRemindRecord),	// 客户提醒记录
 	)
 }
 

services/activity.go

@@ -112,8 +112,8 @@ func sendWxMsg(activityInfo *yb.Activity, remindType string) (err error) {
 	}
 
 	first := `您有一场【` + activityInfo.ActivityTypeName + `】将在` + timeStr + `后开始`
-	keyword1 := activityInfo.ActivityName
-	keyword2 := "- -"
+	keyword1 := activityInfo.ActivityTypeName + "-" + activityInfo.ActivityName
+	keyword2 := "将在" + timeStr + "后开始"
 	//keyword3 := `2021-10-18 16:30-17:00 星期一`
 	keyword3 := formatActivityTimeStr(activityInfo.StartTime, activityInfo.EndTime)
 

services/company_product.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-//客户自动冻结->试用两个月结束后，进入冻结
+// 客户自动冻结->试用两个月结束后，进入冻结
 func CompanyFreeze(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -56,7 +56,7 @@ func CompanyFreeze(cont context.Context) (err error) {
 	return
 }
 
-//客户自动流失->冻结超3个月未处理
+// 客户自动流失->冻结超3个月未处理
 func CompanyLoss(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -96,7 +96,7 @@ func CompanyLoss(cont context.Context) (err error) {
 	return
 }
 
-//正式客户自动试用->合同到期未续约转试用
+// 正式客户自动试用->合同到期未续约转试用
 func CompanyTryOut(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -168,7 +168,7 @@ func AddCompanyOperationRecord(companyId, sysUserId, productId, approveAdminId i
 	return
 }
 
-//客户老数据同步
+// 客户老数据同步
 func CompanyOldDataSync() {
 	companyItems, err := models.GetCompanyOldDataSync()
 	if err != nil {
@@ -250,7 +250,7 @@ func CompanyOldDataSync() {
 	}
 }
 
-//正式/试用客户--到期提醒
+// CompanyRemind 正式/试用客户--到期提醒
 func CompanyRemind(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -273,7 +273,7 @@ func CompanyRemind(cont context.Context) (err error) {
 	return
 }
 
-//30天后到期客户
+// CompanyRemind30Day 30天后到期客户
 func CompanyRemind30Day(seller *models.Sellers) {
 	var err error
 	defer func() {
@@ -281,9 +281,13 @@ func CompanyRemind30Day(seller *models.Sellers) {
 			go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "到期提醒失败：CompanyRemind;Err"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	remindEndDate := time.Now().AddDate(0, 0, 30).Format(utils.FormatDate)
+
+	companyRemindRecordList := make([]*models.CompanyRemindRecord, 0)
+	remindType := 4
+	uniqueCode := fmt.Sprint(seller.AdminId, time.Now().Format(utils.FormatDateUnSpace), remindType, utils.GetRandString(5))
 
 	//remindEndDate := "2020-12-31" //time.Now().AddDate(0, 0, 30).Format(utils.FormatDate)
+	remindEndDate := time.Now().AddDate(0, 0, 30).Format(utils.FormatDate)
 	companyItems, err := models.GetRemindCompany(seller.AdminId, remindEndDate)
 	if err != nil {
 		return
@@ -300,6 +304,20 @@ func CompanyRemind30Day(seller *models.Sellers) {
 		emailContents += `<tr><td>` + v.CompanyName + `</td><td>` + endTime + `</td><td>` + seller.RealName + `</td><td>` + v.Status + `</td></tr>`
 		msgContent += `客户：` + v.CompanyName + "；状态：" + v.Status + "\n"
 		isSend = true
+
+		// 数据入库
+		companyRemindRecordList = append(companyRemindRecordList, &models.CompanyRemindRecord{
+			//CompanyRemindRecordId: 0,
+			Type:        remindType,
+			SellerId:    seller.AdminId,
+			SellerName:  seller.RealName,
+			CompanyId:   v.CompanyId,
+			CompanyName: v.CompanyName,
+			Status:      v.Status,
+			EndDate:     endTime,
+			UniqueCode:  uniqueCode,
+			CreateTime:  time.Now(),
+		})
 	}
 	emailContents += "</table></br>"
 
@@ -310,7 +328,8 @@ func CompanyRemind30Day(seller *models.Sellers) {
 
 		if seller.OpenId != "" {
 			first := "您有【" + strconv.Itoa(len(companyItems)) + "】 客户将于30天后到期，请注意查看"
-			keyword1 := "到期前30天提醒"
+			//keyword1 := "到期前30天提醒"
+			keyword1 := fmt.Sprintf(`【%d】客户到期前30天提醒，点击查看`, len(companyItems))
 			keyword2 := remindEndDate
 			remark := msgContent
 
@@ -318,12 +337,17 @@ func CompanyRemind30Day(seller *models.Sellers) {
 			openIdItem := new(models.OpenIdList)
 			openIdItem.OpenId = seller.OpenId
 			openIdList = append(openIdList, openIdItem)
-			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, openIdList)
+			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, uniqueCode, openIdList)
 		}
 	}
+
+	// 数据入库
+	if len(companyRemindRecordList) > 0 {
+		models.AddMultiCompanyRemindRecord(companyRemindRecordList)
+	}
 }
 
-//15天后到期客户
+// CompanyRemind15Day 15天后到期客户
 func CompanyRemind15Day(seller *models.Sellers) {
 	var err error
 	defer func() {
@@ -331,6 +355,10 @@ func CompanyRemind15Day(seller *models.Sellers) {
 			go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "到期提醒失败：CompanyRemind;Err"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
+	companyRemindRecordList := make([]*models.CompanyRemindRecord, 0)
+	remindType := 3
+	uniqueCode := fmt.Sprint(seller.AdminId, time.Now().Format(utils.FormatDateUnSpace), remindType, utils.GetRandString(5))
+
 	remindEndDate := time.Now().AddDate(0, 0, 15).Format(utils.FormatDate)
 	companyItems, err := models.GetRemindCompany(seller.AdminId, remindEndDate)
 	if err != nil {
@@ -348,6 +376,20 @@ func CompanyRemind15Day(seller *models.Sellers) {
 		emailContents += `<tr><td>` + v.CompanyName + `</td><td>` + endTime + `</td><td>` + seller.RealName + `</td><td>` + v.Status + `</td></tr>`
 		msgContent += `客户：` + v.CompanyName + "；状态：" + v.Status + "\n"
 		isSend = true
+
+		// 数据入库
+		companyRemindRecordList = append(companyRemindRecordList, &models.CompanyRemindRecord{
+			//CompanyRemindRecordId: 0,
+			Type:        remindType,
+			SellerId:    seller.AdminId,
+			SellerName:  seller.RealName,
+			CompanyId:   v.CompanyId,
+			CompanyName: v.CompanyName,
+			Status:      v.Status,
+			EndDate:     endTime,
+			UniqueCode:  uniqueCode,
+			CreateTime:  time.Now(),
+		})
 	}
 	emailContents += "</table></br>"
 
@@ -358,7 +400,8 @@ func CompanyRemind15Day(seller *models.Sellers) {
 
 		if seller.OpenId != "" {
 			first := "您有【" + strconv.Itoa(len(companyItems)) + "】 客户将于15天后到期，请注意查看"
-			keyword1 := "到期前15天提醒"
+			//keyword1 := "到期前15天提醒"
+			keyword1 := fmt.Sprintf(`【%d】客户到期前15天提醒，点击查看`, len(companyItems))
 			keyword2 := remindEndDate
 			remark := msgContent
 
@@ -366,12 +409,17 @@ func CompanyRemind15Day(seller *models.Sellers) {
 			openIdItem := new(models.OpenIdList)
 			openIdItem.OpenId = seller.OpenId
 			openIdList = append(openIdList, openIdItem)
-			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, openIdList)
+			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, uniqueCode, openIdList)
 		}
 	}
+
+	// 数据入库
+	if len(companyRemindRecordList) > 0 {
+		models.AddMultiCompanyRemindRecord(companyRemindRecordList)
+	}
 }
 
-//7天后到期客户名称
+// CompanyRemind7Day 7天后到期客户名称
 func CompanyRemind7Day(seller *models.Sellers) {
 	var err error
 	defer func() {
@@ -379,6 +427,10 @@ func CompanyRemind7Day(seller *models.Sellers) {
 			go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "到期提醒失败：CompanyRemind;Err"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
+	companyRemindRecordList := make([]*models.CompanyRemindRecord, 0)
+	remindType := 2
+	uniqueCode := fmt.Sprint(seller.AdminId, time.Now().Format(utils.FormatDateUnSpace), remindType, utils.GetRandString(5))
+
 	remindEndDate := time.Now().AddDate(0, 0, 7).Format(utils.FormatDate)
 	companyItems, err := models.GetRemindCompany(seller.AdminId, remindEndDate)
 	if err != nil {
@@ -396,6 +448,20 @@ func CompanyRemind7Day(seller *models.Sellers) {
 		emailContents += `<tr><td>` + v.CompanyName + `</td><td>` + endTime + `</td><td>` + seller.RealName + `</td><td>` + v.Status + `</td></tr>`
 		msgContent += `客户：` + v.CompanyName + "；状态：" + v.Status + "\n"
 		isSend = true
+
+		// 数据入库
+		companyRemindRecordList = append(companyRemindRecordList, &models.CompanyRemindRecord{
+			//CompanyRemindRecordId: 0,
+			Type:        remindType,
+			SellerId:    seller.AdminId,
+			SellerName:  seller.RealName,
+			CompanyId:   v.CompanyId,
+			CompanyName: v.CompanyName,
+			Status:      v.Status,
+			EndDate:     endTime,
+			UniqueCode:  uniqueCode,
+			CreateTime:  time.Now(),
+		})
 	}
 	emailContents += "</table></br>"
 
@@ -406,7 +472,8 @@ func CompanyRemind7Day(seller *models.Sellers) {
 
 		if seller.OpenId != "" {
 			first := "您有【" + strconv.Itoa(len(companyItems)) + "】 客户将于7天后到期，请注意查看"
-			keyword1 := "到期前7天提醒"
+			//keyword1 := "到期前7天提醒"
+			keyword1 := fmt.Sprintf(`【%d】客户到期前7天提醒，点击查看`, len(companyItems))
 			keyword2 := remindEndDate
 			remark := msgContent
 
@@ -414,12 +481,17 @@ func CompanyRemind7Day(seller *models.Sellers) {
 			openIdItem := new(models.OpenIdList)
 			openIdItem.OpenId = seller.OpenId
 			openIdList = append(openIdList, openIdItem)
-			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, openIdList)
+			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, uniqueCode, openIdList)
 		}
 	}
+
+	// 数据入库
+	if len(companyRemindRecordList) > 0 {
+		models.AddMultiCompanyRemindRecord(companyRemindRecordList)
+	}
 }
 
-//到期当天提醒
+// CompanyRemind1Day到期当天提醒
 func CompanyRemind1Day(seller *models.Sellers) {
 	var err error
 	defer func() {
@@ -427,6 +499,10 @@ func CompanyRemind1Day(seller *models.Sellers) {
 			go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "到期提醒失败：CompanyRemind;Err"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
+	companyRemindRecordList := make([]*models.CompanyRemindRecord, 0)
+	remindType := 1
+	uniqueCode := fmt.Sprint(seller.AdminId, time.Now().Format(utils.FormatDateUnSpace), remindType, utils.GetRandString(5))
+
 	remindEndDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 	companyItems, err := models.GetRemindCompany(seller.AdminId, remindEndDate)
 	if err != nil {
@@ -444,6 +520,20 @@ func CompanyRemind1Day(seller *models.Sellers) {
 		emailContents += `<tr><td>` + v.CompanyName + `</td><td>` + endTime + `</td><td>` + seller.RealName + `</td><td>` + v.Status + `</td></tr>`
 		msgContent += `客户：` + v.CompanyName + "；状态：" + v.Status + "\n"
 		isSend = true
+
+		// 数据入库
+		companyRemindRecordList = append(companyRemindRecordList, &models.CompanyRemindRecord{
+			//CompanyRemindRecordId: 0,
+			Type:        remindType,
+			SellerId:    seller.AdminId,
+			SellerName:  seller.RealName,
+			CompanyId:   v.CompanyId,
+			CompanyName: v.CompanyName,
+			Status:      v.Status,
+			EndDate:     endTime,
+			UniqueCode:  uniqueCode,
+			CreateTime:  time.Now(),
+		})
 	}
 	emailContents += "</table></br>"
 
@@ -454,7 +544,8 @@ func CompanyRemind1Day(seller *models.Sellers) {
 
 		if seller.OpenId != "" {
 			first := "您有【" + strconv.Itoa(len(companyItems)) + "】 客户将于1天后到期，请注意查看"
-			keyword1 := "到期前1天提醒"
+			//keyword1 := "到期前1天提醒"
+			keyword1 := fmt.Sprintf(`【%d】客户到期前1天提醒，点击查看`, len(companyItems))
 			keyword2 := remindEndDate
 			remark := msgContent
 
@@ -462,9 +553,15 @@ func CompanyRemind1Day(seller *models.Sellers) {
 			openIdItem := new(models.OpenIdList)
 			openIdItem.OpenId = seller.OpenId
 			openIdList = append(openIdList, openIdItem)
-			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, openIdList)
+
+			SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, uniqueCode, openIdList)
 		}
 	}
+
+	// 数据入库
+	if len(companyRemindRecordList) > 0 {
+		models.AddMultiCompanyRemindRecord(companyRemindRecordList)
+	}
 }
 
 // StaticCompanyTryDay 定时任务每天更新客户试用总天数

services/company_report_permission.go

@@ -40,11 +40,12 @@ func CompanyReportPermissionTryOut(cont context.Context) (err error) {
 			productId = v.ProductId
 
 			//正式转试用用户产品权限
+			v.IsUpgrade = 0
 			v.Status = "试用"
 			v.StartDate = startDateTime.Format(utils.FormatDate)
 			v.EndDate = endDateTime.Format(utils.FormatDate)
 			v.ModifyTime = time.Now().Format(utils.FormatDate)
-			err = v.Update([]string{"Status", "StartDate", "EndDate", "ModifyTime"})
+			err = v.Update([]string{"IsUpgrade","Status", "StartDate", "EndDate", "ModifyTime"})
 			//err = models.CompanyReportPermissionTryOut(v.CompanyReportPermissionId, v.CompanyId, v.ProductId)
 			if err != nil {
 				utils.FileLog.Info("CompanyReportPermissionTryOut Err:%s" + err.Error())

services/data/base_edb_lib.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-//新增指标数据
+// 新增指标数据
 func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
@@ -102,7 +102,6 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 		urlStr = "google_travel/refresh"
 	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
 		urlStr = "mysteel_chemical/refresh"
-		urlStr = "mysteel_chemical/refresh"
 	case utils.DATA_SOURCE_EIA_STEO:
 		urlStr = "eia_steo/refresh"
 	case utils.DATA_SOURCE_PREDICT:
@@ -113,6 +112,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 		urlStr = "sci/refresh"
 	case utils.DATA_SOURCE_BAIINFO:
 		urlStr = "baiinfo/refresh"
+	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
+		urlStr = "national_statistics/refresh"
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))

services/data/edb_info.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 )
 
-//刷新同花顺数据
+// 刷新同花顺数据
 func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -78,7 +78,7 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-//刷新万得数据
+// 刷新万得数据
 func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -141,7 +141,7 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-//刷新彭博数据
+// 刷新彭博数据
 func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -929,7 +929,7 @@ func RefreshPredictDataFromCalculateAll() (err error) {
 	return err
 }
 
-//刷新手工指标数据
+// 刷新手工指标数据
 func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -939,7 +939,7 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 		}
 		wg.Done()
 	}()
-	
+
 	var condition string
 	var pars []interface{}
 	condition += " AND source=? "
@@ -956,7 +956,7 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 		//	return errors.New("RefreshManual：edbCode：" + v.EdbCode + ":" + err.Error())
 		//}
 		startDate := ``
-		if !v.StartDate.IsZero(){
+		if !v.StartDate.IsZero() {
 			startDate = v.StartDate.Format(utils.FormatDate)
 		}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
@@ -985,7 +985,7 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-//刷新隆众数据
+// 刷新隆众数据
 func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -1048,7 +1048,7 @@ func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-//刷新有色数据
+// 刷新有色数据
 func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -1111,7 +1111,7 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-//刷新钢联数据
+// 刷新钢联数据
 func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -1485,17 +1485,17 @@ func RefreshDataFromZz(wg *sync.WaitGroup) (err error) {
 
 // RefreshDataFromLt 刷新路透数据
 func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string,0)
+	errMsgList := make([]string, 0)
 	defer func() {
 		//if err != nil {
 		//	fmt.Println("RefreshDataFromLt Err:" + err.Error())
 		//	//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromLt ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		//	go alarm_msg.SendAlarmMsg("RefreshDataFromLt ErrMsg:"+err.Error(), 3)
 		//}
-		if len(errMsgList)>0{
-			fmt.Println("RefreshDataFromLt Err:" , errMsgList)
+		if len(errMsgList) > 0 {
+			fmt.Println("RefreshDataFromLt Err:", errMsgList)
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromLt ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-			go alarm_msg.SendAlarmMsg("RefreshDataFromLt ErrMsg:"+strings.Join(errMsgList,`<br/>`), 3)
+			go alarm_msg.SendAlarmMsg("RefreshDataFromLt ErrMsg:"+strings.Join(errMsgList, `<br/>`), 3)
 		}
 		wg.Done()
 	}()
@@ -1505,7 +1505,7 @@ func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
 	pars = append(pars, utils.DATA_SOURCE_LT)
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
 	if err != nil {
-		errMsgList = append(errMsgList,"GetEdbInfoByCondition:" + err.Error())
+		errMsgList = append(errMsgList, "GetEdbInfoByCondition:"+err.Error())
 		return errors.New("GetEdbInfoByCondition:" + err.Error())
 	}
 
@@ -1518,11 +1518,11 @@ func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
 		//}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
 		if err != nil {
-			errMsgList = append(errMsgList,"RefreshEdbData Err:" + err.Error())
+			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
 			continue
 		}
 		if resp.Ret != 200 {
-			errMsgList = append(errMsgList,"RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
 			continue
 		}
 		//更新指标的最新数据
@@ -1959,3 +1959,48 @@ func RefreshDataFromSci(wg *sync.WaitGroup) (err error) {
 	}
 	return err
 }
+
+// RefreshDataFromNationalStatistics 刷新统计局数据
+func RefreshDataFromNationalStatistics(wg *sync.WaitGroup) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromNationalStatistics Err:" + err.Error())
+			go alarm_msg.SendAlarmMsg("RefreshDataFromNationalStatistics ErrMsg:"+err.Error(), 3)
+		}
+		wg.Done()
+	}()
+	var condition string
+	var pars []interface{}
+	condition += ` AND source = ? `
+	pars = append(pars, utils.DATA_SOURCE_NATIONAL_STATISTICS)
+	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
+	if err != nil {
+		return errors.New("GetEdbInfoByCondition:" + err.Error())
+	}
+
+	for _, v := range items {
+		startDate := ""
+		if v.Frequency == "日度" {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		} else if v.Frequency == "周度" {
+			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
+		} else if v.Frequency == "月度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "季度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "年度" {
+			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
+		} else {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		}
+
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		if err != nil {
+			return errors.New("RefreshDataFromNationalStatistics Err:" + err.Error())
+		}
+		if resp.Ret != 200 {
+			return errors.New("RefreshDataFromNationalStatistics Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+		}
+	}
+	return err
+}

services/data/edb_info_notice.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-//指标更新通知
+// 指标更新通知
 func RefreshNotice() (err error) {
 	defer func() {
 		if err != nil {
@@ -19,9 +19,13 @@ func RefreshNotice() (err error) {
 	var condition string
 	var pars []interface{}
 
-	endDate := time.Now().AddDate(0, -6, 0)
+	endDate := time.Now().AddDate(0, -2, 0)
 	condition += ` AND end_date > ? `
 	pars = append(pars, endDate)
+
+	condition += ` AND end_date < ? `
+	pars = append(pars, time.Now().Format(utils.FormatDate))
+
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 1)
 	if err != nil {
 		return errors.New("GetEdbInfoByCondition:" + err.Error())
@@ -74,20 +78,20 @@ func RefreshNotice() (err error) {
     </thead>`
 	monthTableBody := `<tbody>`
 
-	allDiv := `<hr style="color: red">`
-	allDiv = `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;"><div>当前所有指标，按数据日期升序排列:</div>`
-	allTable := `<table border="1" style="border-collapse: collapse;">
-    <thead>
-    <tr>
-        <td>指标编码</td>
-        <td>指标名称</td>
-        <td>指标来源</td>
-		<td>频度</td>
-        <td>指标数据最后日期</td>
-        <td>指标数据更新日期</td>
-    </tr>
-    </thead>`
-	allTableBody := `<tbody>`
+	//allDiv := `<hr style="color: red">`
+	//allDiv = `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;"><div>当前所有指标，按数据日期升序排列:</div>`
+	//allTable := `<table border="1" style="border-collapse: collapse;">
+	//<thead>
+	//<tr>
+	//    <td>指标编码</td>
+	//    <td>指标名称</td>
+	//    <td>指标来源</td>
+	//	<td>频度</td>
+	//    <td>指标数据最后日期</td>
+	//    <td>指标数据更新日期</td>
+	//</tr>
+	//</thead>`
+	//allTableBody := `<tbody>`
 
 	dayDate := time.Now().AddDate(0, 0, -3)
 	weekDate := time.Now().AddDate(0, 0, -7)
@@ -107,7 +111,7 @@ func RefreshNotice() (err error) {
 			monthTableBody += getTableTr(v, 3)
 		}
 
-		allTableBody += getTableTr(v, 4)
+		//allTableBody += getTableTr(v, 4)
 	}
 	dayTable += dayTableBody
 	dayTable += ` </tbody></table></div>`
@@ -124,9 +128,9 @@ func RefreshNotice() (err error) {
 	noticeSendBody += monthDiv + monthTable
 	noticeSendBody += `<br/>`
 
-	allTable += allTableBody
-	allTable += ` </tbody></table></div>`
-	noticeSendBody += allDiv + allTable
+	//allTable += allTableBody
+	//allTable += ` </tbody></table></div>`
+	//noticeSendBody += allDiv + allTable
 
 	go utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, utils.RefreshEdbInfoEmailSendToUsers, "", "")
 	//utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, "317699326@qq.com", "", "")

services/data/future_good/base_future_good_lib.go

@@ -30,6 +30,15 @@ func RefreshEdbData(futureGoodEdbInfoId int, futureGoodEdbCode, startDate string
 	return
 }
 
+// RefreshEdbRelation 刷新商品期货指标相关的数据
+func RefreshEdbRelation(futureGoodEdbInfoId int) (resp *models.BaseResponse, err error) {
+	param := make(map[string]interface{})
+	param["FutureGoodEdbInfoId"] = futureGoodEdbInfoId
+	urlStr := `future_good/relation/refresh`
+	resp, err = postRefreshEdbData(param, urlStr)
+	return
+}
+
 // postRefreshEdbData 刷新指标数据
 func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
 	postUrl := utils.EDB_LIB_URL + urlStr

services/data/future_good/future_good_edb_info.go

@@ -61,5 +61,12 @@ func RefreshFutureGoodDataFromThs() (err error) {
 		}
 
 	}
+
+	// 刷新商品期货指标相关的数据
+	for _, bv := range list {
+		if bv.ParentId == 0 {
+			RefreshEdbRelation(bv.FutureGoodEdbInfoId)
+		}
+	}
 	return err
 }

services/data/trade_position_analysis.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"hongze/hongze_task/models/data_manage"
+	"hongze/hongze_task/services/alarm_msg"
 	"hongze/hongze_task/utils"
 	"sort"
 	"strconv"
@@ -12,32 +13,39 @@ import (
 
 // InitPositionTask 统计今日交易所的持仓分析数据
 func InitPositionTask(cont context.Context) (err error) {
-	exchanges := []string{"zhengzhou","dalian","shanghai","cffex","ine"} //郑商所，大商所，上期所，中金所，上期能源
+	exchanges := []string{"zhengzhou", "dalian", "shanghai", "cffex", "ine"} //郑商所，大商所，上期所，中金所，上期能源
 	startDate := time.Now().Format(utils.FormatDate)
 	endDate := startDate
 	for _, v := range exchanges {
 		exchange := v
 		err = nil
-		fmt.Println("InitPositionTask:	启动："+exchange)
-		utils.FileLog.Info("InitPositionTask:	启动："+exchange)
+		fmt.Println("InitPositionTask:	启动：" + exchange)
+		utils.FileLog.Info("InitPositionTask:	启动：" + exchange)
 
-		fmt.Println("开始"+startDate+"结束"+endDate)
+		fmt.Println("开始" + startDate + "结束" + endDate)
 		utils.FileLog.Info(fmt.Sprintf("InitTradePosition:开始:%s; 结束:%s", startDate, endDate))
 		tErr, errMsg := InitTradePosition(exchange, startDate, endDate)
 		if tErr != nil {
 			err = tErr
-			fmt.Println("InitTradePosition: 操作失败："+errMsg+tErr.Error())
+			fmt.Println("InitTradePosition: 操作失败：" + errMsg + tErr.Error())
 			utils.FileLog.Info(fmt.Sprintf("InitTradePosition: 操作失败：%s:%s", errMsg, tErr.Error()))
 			continue
 		}
 
-		fmt.Println("InitTradePosition:"+exchange+"已完成")
-		utils.FileLog.Info("InitTradePosition:"+exchange+"已完成")
+		fmt.Println("InitTradePosition:" + exchange + "已完成")
+		utils.FileLog.Info("InitTradePosition:" + exchange + "已完成")
 	}
 	return
 }
 
 func InitTradePosition(exchange, startDate, endDate string) (err error, errMsg string) {
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("统计今日交易所的持仓分析数据失败, Exchange: %s, Err: %s, Msg: %s", exchange, err.Error(), errMsg)
+			alarm_msg.SendAlarmMsg(tips, 3)
+		}
+	}()
+
 	// 批量插入今日的初始值
 	num, err := data_manage.GetTradePositionTopCountByExchangeDataTime(exchange, startDate, endDate)
 	if err != nil {
@@ -45,7 +53,7 @@ func InitTradePosition(exchange, startDate, endDate string) (err error, errMsg s
 		return
 	}
 	if num > 0 {
-		err = fmt.Errorf("数据已存在，无需处理")
+		//err = fmt.Errorf("数据已存在，无需处理")
 		return
 	}
 	err = data_manage.MultiInsertTradeBaseDataToTop(exchange, startDate, endDate)
@@ -63,6 +71,13 @@ func InitTradePosition(exchange, startDate, endDate string) (err error, errMsg s
 		return
 	}
 
+	// 原始数据日期
+	dates, e := data_manage.GetTradePositionTopOriginDataTimes(exchange)
+	if e != nil {
+		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
+		return
+	}
+
 	now := time.Now()
 	dataTimeMap := make(map[string]*data_manage.TradePositionTop)
 	onlyEmptyMap := make(map[string]bool)
@@ -71,7 +86,7 @@ func InitTradePosition(exchange, startDate, endDate string) (err error, errMsg s
 	topLastRankMap := make(map[string]int)
 	list := make([]*data_manage.TradePositionTop, 0)
 	for _, v := range originList {
-		tmp0, tmpErr := dealTradeOriginData(dataTimeMap, onlyEmptyMap, onlyEmptyNameMap, v, topLastMap, topLastRankMap, startDate, now)
+		tmp0, tmpErr := dealTradeOriginData(dataTimeMap, onlyEmptyMap, onlyEmptyNameMap, v, topLastMap, topLastRankMap, startDate, now, dates)
 		if tmpErr != nil {
 			err = tmpErr
 			errMsg = "处理原始数据失败 dealTradeOriginData() Err: "
@@ -162,7 +177,7 @@ func InitTradePosition(exchange, startDate, endDate string) (err error, errMsg s
 	return
 }
 
-func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, onlyEmptyMap map[string]bool, onlyEmptyNameMap map[string]*data_manage.TradePositionTop, currentItem *data_manage.TradePositionTop, topLastMap map[string]int, topLastRankMap map[string]int, startDate string, now time.Time) (tmp0 *data_manage.TradePositionTop, err error) {
+func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, onlyEmptyMap map[string]bool, onlyEmptyNameMap map[string]*data_manage.TradePositionTop, currentItem *data_manage.TradePositionTop, topLastMap map[string]int, topLastRankMap map[string]int, startDate string, now time.Time, dates []string) (tmp0 *data_manage.TradePositionTop, err error) {
 	classifyName := currentItem.ClassifyName
 	classifyType := currentItem.ClassifyType
 	dealShortName := currentItem.DealShortName
@@ -179,11 +194,12 @@ func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, o
 		topLastRankMap[classifyName+"_"+classifyType+"_"+dataTime+"_"+dealTypeStr] = currentItem.Rank
 	}
 	if dataTime > startDate {
-		tmpTimeStr, tErr := getYesterdayDate(dataTime)
-		if tErr != nil {
-			err = tErr
-			return
-		}
+		//tmpTimeStr, tErr := getYesterdayDate(dataTime)
+		//if tErr != nil {
+		//	err = tErr
+		//	return
+		//}
+		tmpTimeStr := getPrevTradeDataDate(dataTime, dates)
 		if tmpTimeStr < startDate {
 			return
 		}
@@ -191,7 +207,8 @@ func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, o
 		if _, ok := dataTimeMap[classifyName+"_"+classifyType+"_"+dealTypeStr+"_"+dealShortName+"_"+tmpTimeStr]; !ok {
 			yesterdayVal := dealValue - dealChange
 			yesterdayChange := 0
-			beforeYesterday, _ := getYesterdayDate(tmpTimeStr)
+			//beforeYesterday, _ := getYesterdayDate(tmpTimeStr)
+			beforeYesterday := getPrevTradeDataDate(tmpTimeStr, dates)
 			beforeYesterdayItem, ok1 := dataTimeMap[classifyName+"_"+classifyType+"_"+dealTypeStr+"_"+dealShortName+"_"+beforeYesterday]
 			if ok1 {
 				yesterdayChange = yesterdayVal - beforeYesterdayItem.DealValue
@@ -216,7 +233,7 @@ func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, o
 	return
 }
 
-// 更新昨日数据
+// DealYesterdayData 更新昨日数据
 func DealYesterdayData(exchange, startDate string) (err error) {
 	// 查询最早的日期
 	firstItem, err := data_manage.GetFirstBaseFromTradeIndexByDate(exchange)
@@ -227,15 +244,24 @@ func DealYesterdayData(exchange, startDate string) (err error) {
 		return
 	}
 
-	yesterdayStr, err := getYesterdayDate(startDate)
-	if err != nil {
-		return
-	}
-	//查找前日的值，并更新对应的更改
-	beforeYesterdayStr, err := getYesterdayDate(yesterdayStr)
-	if err != nil {
+	// 前一个交易日, 前两个交易日
+	dates, e := data_manage.GetTradePositionTopOriginDataTimes(exchange)
+	if e != nil {
+		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
 		return
 	}
+	yesterdayStr := getPrevTradeDataDate(startDate, dates)
+	beforeYesterdayStr := getPrevTradeDataDate(yesterdayStr, dates)
+
+	//yesterdayStr, err := getYesterdayDate(startDate)
+	//if err != nil {
+	//	return
+	//}
+	////查找前日的值，并更新对应的更改
+	//beforeYesterdayStr, err := getYesterdayDate(yesterdayStr)
+	//if err != nil {
+	//	return
+	//}
 	// 先查出T日最原始的数据
 	originList, err := data_manage.GetTradePositionTopByExchangeDataTime(exchange, startDate, startDate)
 	if err != nil {
@@ -352,17 +378,34 @@ func DealYesterdayData(exchange, startDate string) (err error) {
 
 // createAnalysisCleanTop 生成净多单，净空单榜单
 func createAnalysisCleanTop(exchange, startDate, endDate string) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("createAnalysisCleanTop err: " + err.Error())
+		}
+	}()
+
 	topList := make([]*data_manage.TradePositionTop, 0)
 	now := time.Now()
 	var subDataList data_manage.TradePositionSubList
 
 	subChangeMap1 := make(map[string]int) //净多单map
 	subChangeMap2 := make(map[string]int) //净空单map
-	//查询所有差值数据，
-	yesterday, err := getYesterdayDate(startDate)
-	if err != nil {
+
+	// 2023-05-10 此处取前一个交易日, 不一定是昨日
+	dates, e := data_manage.GetTradePositionTopOriginDataTimes(exchange)
+	if e != nil {
+		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
 		return
 	}
+	yesterday := getPrevTradeDataDate(startDate, dates)
+
+	//查询所有差值数据，
+	//yesterday, err := getYesterdayDate(startDate)
+	//if err != nil {
+	//	return
+	//}
+
+	// 上一个交易日的净多单
 	yesterdayTopList1, tErr := data_manage.GetTradePositionTopByExchangeDataTimeType(exchange, yesterday, 3)
 	if tErr != nil {
 		err = tErr
@@ -375,6 +418,7 @@ func createAnalysisCleanTop(exchange, startDate, endDate string) (err error) {
 		}
 	}
 
+	// 上一个交易日的净空单
 	yesterdayTopList2, tErr := data_manage.GetTradePositionTopByExchangeDataTimeType(exchange, yesterday, 4)
 	if tErr != nil {
 		err = tErr
@@ -387,6 +431,7 @@ func createAnalysisCleanTop(exchange, startDate, endDate string) (err error) {
 		}
 	}
 
+	// 根据当日多单/空单数据, 生成净多单/净空单数据
 	originDataList, err := data_manage.GetTradePositionTopByExchangeDataTime(exchange, startDate, endDate)
 	if err != nil {
 		return
@@ -422,6 +467,8 @@ func createAnalysisCleanTop(exchange, startDate, endDate string) (err error) {
 	if len(subDataList) > 0 {
 		sort.Sort(subDataList)
 	}
+
+	// 根据净多单/净空单数据, 比对上一个交易日的日期计算成交变化量, 并写入
 	var dealType int
 	rankMap := make(map[string]int)
 	for _, v := range subDataList {
@@ -444,12 +491,16 @@ func createAnalysisCleanTop(exchange, startDate, endDate string) (err error) {
 				rankMap[v.ClassifyName+"_"+v.ClassifyType+"_"+v.DataTime+"_4"]++
 			}
 		}
+
+		// 2023-05-10 目前看该方法的引用startDate和endDate其实是同一天, 所以前一个交易日直接用上面的yesterday
+		tmpTimeStr := yesterday
+
 		//和T-1日比较差值
-		var tmpTimeStr string
-		tmpTimeStr, err = getYesterdayDate(v.DataTime)
-		if err != nil {
-			return
-		}
+		//var tmpTimeStr string
+		//tmpTimeStr, err = getYesterdayDate(v.DataTime)
+		//if err != nil {
+		//	return
+		//}
 		yesterdayStr := v.ClassifyName + "_" + v.ClassifyType + "_" + tmpTimeStr + "_" + v.DealShortName
 		dealChange := 0
 		if dealType == 3 {
@@ -509,3 +560,20 @@ func getYesterdayDate(today string) (yesterday string, err error) {
 	yesterday = tmpTimeDate.Format(utils.FormatDate)
 	return
 }
+
+// getPrevTradeDataDate 获取指定日期上一个交易日日期
+func getPrevTradeDataDate(date string, dates []string) string {
+	pre := -1
+	for k, v := range dates {
+		n := k - 1
+		if v == date && n >= 0 {
+			pre = n
+			break
+		}
+	}
+	// 找不到就随便给个不存在日期
+	if pre == -1 {
+		return "1980-01-01"
+	}
+	return dates[pre]
+}

services/data_entry.go

@@ -12,7 +12,7 @@ import (
 
 //数据录入
 
-//日度消息推送
+// 日度消息推送
 func FrequencyByDay() (err error) {
 	defer func() {
 		if err != nil {
@@ -84,7 +84,7 @@ func FrequencyByDay() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每日 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 				err = SendWxMsgWithFrequency(first, keyword1, keyword2, remark, openIdList)
@@ -97,7 +97,7 @@ func FrequencyByDay() (err error) {
 	return
 }
 
-//周度消息推送
+// 周度消息推送
 func FrequencyByWeek() (err error) {
 	defer func() {
 		if err != nil {
@@ -211,7 +211,7 @@ func FrequencyByWeek() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每周 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 
@@ -238,7 +238,7 @@ func FrequencyByWeek() (err error) {
 	return
 }
 
-//周度消息推送
+// 周度消息推送
 func FrequencyByMonth() (err error) {
 	defer func() {
 		if err != nil {
@@ -339,7 +339,7 @@ func FrequencyByMonth() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每月 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 

services/maycur/maycur.go

@@ -48,9 +48,11 @@ func DailyUpdateCompanyProfile(cont context.Context) (err error) {
 		err = fmt.Errorf("resp body read err: %s", e.Error())
 		return
 	}
+	// 解密
+	bo := utils.DesBase64Decrypt(b)
 	result := new(models.BaseResponse)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s", e.Error())
+	if e = json.Unmarshal(bo, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
 		return
 	}
 	if result.Ret != 200 {

services/task.go

@@ -213,29 +213,30 @@ func releaseTask() {
 	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
 
 	// 定时检测同花顺客群推送消息状态
-	checkThsReportList := task.NewTask("checkThsReportList", "0 */2 * * * * ", CheckThsReportList)
-	task.AddTask("checkThsReportList", checkThsReportList)
+	//checkThsReportList := task.NewTask("checkThsReportList", "0 */2 * * * * ", CheckThsReportList)
+	//task.AddTask("checkThsReportList", checkThsReportList)
 
 	// 定时统计交易所的持仓分析数据
-	InitPositionTask := task.NewTask("checkThsReportList", "0 30 16-20 * * *", data.InitPositionTask)
-	task.AddTask("checkThsReportList", InitPositionTask)
+	initPositionTask := task.NewTask("initPositionTask", "0 15,45 16-23 * * *", data.InitPositionTask)
+	task.AddTask("initPositionTask", initPositionTask)
 
 	// 每日2:45更新每刻报销-客户档案
 	syncMaycurCompanyProfile := task.NewTask("syncMaycurCompanyProfile", "0 45 2 * * * ", maycur.DailyUpdateCompanyProfile)
 	task.AddTask("每日更新每刻报销-客户档案", syncMaycurCompanyProfile)
 }
 
-func TaskTest() {
-	fmt.Println("The task is start")
-	//companyReportPermissionClose := task.NewTask("companyTryOut", "0 5 0 * * *", CompanyReportPermissionClose)
-	//companyReportPermissionClose := task.NewTask("companyReportPermissionClose", "0/30 * * * * *", CompanyReportPermissionClose)
-	//task.AddTask("用户产品权限试用-->关闭", companyReportPermissionClose)
-	//publishVoiceBroadcast := task.NewTask("publishVoiceBroadcast", "0 */1 * * * *", PublishVoiceBroadcast)
-	//task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
-
-	task.StartTask()
-	fmt.Println("The task is end")
-}
+//func TaskTest() {
+//	fmt.Println("The task is start")
+//
+//	e, msg := data.InitTradePosition("shanghai", "2023-05-05", "2023-05-05")
+//	if e != nil {
+//		fmt.Println(e.Error())
+//		fmt.Println(msg)
+//	}
+//
+//	//task.StartTask()
+//	fmt.Println("The task is end")
+//}
 
 func SendEmail(cont context.Context) (err error) {
 	//报告历史访问次数
@@ -259,7 +260,7 @@ func OneMinute(cont context.Context) (err error) {
 
 func RefreshData(cont context.Context) (err error) {
 	wg := sync.WaitGroup{}
-	wg.Add(15)
+	wg.Add(16)
 	//hour := time.Now().Hour()
 	//if hour != 0 {
 	//}
@@ -292,6 +293,8 @@ func RefreshData(cont context.Context) (err error) {
 	go data.RefreshDataFromComTrade(&wg)
 	//卓创报告指标
 	go data.RefreshDataFromSci(&wg)
+	//国家统计局指标
+	go data.RefreshDataFromNationalStatistics(&wg)
 
 	wg.Wait()
 	////计算指标
@@ -743,7 +746,7 @@ func AddEdbTask(cont context.Context) (err error) {
 					openIdList = append(openIdList, openIdTemp)
 
 					first := "数据录入提醒"
-					keyword1 := tmpEdb.SecName
+					keyword1 := tmpEdb.SecName + "该更新了"
 					keyword2 := notifyFrequency + " " + tmpEdb.NoticeTime
 					remark := tmpEdb.SecName + "该更新了"
 

services/wx_template_msg.go

@@ -107,8 +107,8 @@ func SendTemplateMsg(sendUrl string, data []byte) (err error) {
 	return
 }
 
-//到期提醒模板消息
-func SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark string, openIdList []*models.OpenIdList) (err error) {
+// 到期提醒模板消息
+func SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, code string, openIdList []*models.OpenIdList) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
@@ -138,7 +138,12 @@ func SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark string, openId
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList)*/
-	wxAppPath := ""
+	var wxAppPath string
+	if utils.RunMode == `debug` {
+		wxAppPath = `http://msgsendtest.hzinsights.com/productExpirationHint.html?code=` + code
+	} else {
+		wxAppPath = `https://msgsend.hzinsights.com//productExpirationHint.html?code=` + code
+	}
 	openIdArr := make([]string, len(openIdList))
 	for i, v := range openIdList {
 		openIdArr[i] = v.OpenId
@@ -168,33 +173,23 @@ func SendWxMsgWithActivityAppointmentRemind(first, keyword1, keyword2, keyword3,
 		}
 	}()
 	utils.FileLog.Info("%s", "services SendMsg")
-	accessToken, err := models.GetWxAccessToken()
-	if err != nil {
-		msg = "GetWxAccessToken Err:" + err.Error()
-		return
-	}
-	if accessToken == "" {
-		msg = "accessToken is empty"
-		return
-	}
-
-	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	sendMap := make(map[string]interface{})
-	sendData := make(map[string]interface{})
 
-	sendMap["template_id"] = utils.AppointmentRemindTemplateId
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["activity_name"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["reserve_results"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-	sendData["activity_time"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
-	sendData["activity_address"] = map[string]interface{}{"value": keyword4, "color": "#173177"}
-	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
-
-	if wxAppPath != "" {
-		sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxYbAppId, "pagepath": wxAppPath}
+	openIdArr := make([]string, len(openIdList))
+	for i, v := range openIdList {
+		openIdArr[i] = v.OpenId
 	}
-	sendMap["data"] = sendData
-	WxSendTemplateMsg(sendUrl, sendMap, openIdList)
+	sendInfo := new(SendWxTemplate)
+	sendInfo.WxAppId = utils.WxAppId
+	sendInfo.First = first
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.RedirectUrl = wxAppPath
+	sendInfo.RedirectTarget = 1
+	sendInfo.TemplateId = utils.AppointmentRemindTemplateId
+	sendInfo.Resource = wxAppPath
+	sendInfo.OpenIdArr = openIdArr
+	sendInfo.Remark = remark
+	err = SendTemplateMsgV2(sendInfo)
 	return
 }
 
@@ -216,7 +211,7 @@ type SendWxTemplate struct {
 	OpenIdArr      []string `description:"消息接收者openid"`
 }
 
-//推送模板消息
+// 推送模板消息
 func SendTemplateMsgV2(sendInfo *SendWxTemplate) (err error) {
 	postData, err := json.Marshal(sendInfo)
 	if err != nil {
@@ -277,8 +272,10 @@ func SendYbVoiceBroadcastWxMsg(broadcastId int, sectionName, broadcastName strin
 	}
 
 	first := "您好，有新的语音播报待查看"
-	keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
-	keyword2 := "待查看"
+	//keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
+	//keyword2 := "待查看"
+	keyword1 := broadcastName
+	keyword2 := fmt.Sprintf("【%s】 待查看", sectionName)
 	remark := "请点击详情查看"
 	wxAppPath := fmt.Sprintf("pages-voice/voiceDetail?voiceId=%d", broadcastId)
 	sendInfo := new(SendWxTemplate)

utils/config.go

@@ -7,13 +7,13 @@ import (
 )
 
 var (
-	RunMode        string //运行模式
-	MYSQL_URL      string //数据库连接
-	MYSQL_URL_RDDP string //数据库连接
-	MYSQL_URL_EDB  string
-	MYSQL_URL_DATA string
-	MYSQL_URL_GL   string
-	MYSQL_URL_WEEKLY_TRIAL       string // ETA试用
+	RunMode                string //运行模式
+	MYSQL_URL              string //数据库连接
+	MYSQL_URL_RDDP         string //数据库连接
+	MYSQL_URL_EDB          string
+	MYSQL_URL_DATA         string
+	MYSQL_URL_GL           string
+	MYSQL_URL_WEEKLY_TRIAL string // ETA试用
 )
 
 var (
@@ -33,11 +33,11 @@ var (
 	WxYbAppId string //微信研报小程序
 
 	//内部员工公众号（弘则部门）
-	AdminWxAppId                    string
-	AdminWxAppSecret                string
+	AdminWxAppId     string
+	AdminWxAppSecret string
 )
 
-//oss配置
+// oss配置
 var (
 	Bucketname       string = "hongze"
 	Endpoint         string
@@ -61,14 +61,14 @@ var (
 	EDB_LIB_URL string
 )
 
-//进门财经账号信息
+// 进门财经账号信息
 var (
 	COMEIN_URL      string
 	COMEIN_APPID    string
 	COMEIN_SECREKEY string
 )
 
-//模板消息推送
+// 模板消息推送
 var (
 	SendWxTemplateMsgUrl string
 )
@@ -131,6 +131,8 @@ ZwIDAQAB
 		WxAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		TemplateId = "DGvLwidav-OZc07klLv5mxwxO63qHdWS5Cj-rTDvTQo"
 		RemindTemplateId = "rCvkgRatnK_3N9pnQEErUyjFkyVpyAGuYtv3HwY82K4"
+		AppointmentRemindTemplateId = `pdbn6Wr84Rr-Ek7zrYHcxh5RO5ROILHjbkj3em68954` //活动预约通知模板id
+
 		//同花顺正式地址
 		THS_SendUrl = `https://board.10jqka.com.cn/gateway/ps/syncNews`
 		THS_SyncWxGroupUrl = `https://board.10jqka.com.cn/gateway/ps/syncWechatGroupInfo`
@@ -151,7 +153,7 @@ ZwIDAQAB
 		WxAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		TemplateId = "DGvLwidav-OZc07klLv5mxwxO63qHdWS5Cj-rTDvTQo"
 		RemindTemplateId = "rCvkgRatnK_3N9pnQEErUyjFkyVpyAGuYtv3HwY82K4"
-		AppointmentRemindTemplateId = `Y59n_AHg-RLCKaz293geW76KDHpGL1qOnE7eF_lxelY` //活动预约通知模板id
+		AppointmentRemindTemplateId = `U3su--7d6xsCDcP6Tya0N0wWpKn_uI0zO1cutRK52cc` //活动预约通知模板id
 
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`

utils/constants.go

@@ -2,9 +2,10 @@ package utils
 
 const (
 	Md5Key = "Ks@h64WJ#tcVgG8$&WlNfqvLAtMgpxWN"
+	DesKey = "6WpHp4vSvLVQK8SLioNZ7WMq" // 接口返回加密KEY
 )
 
-//常量定义
+// 常量定义
 const (
 	FormatTime            = "15:04:05"                //时间格式
 	FormatDate            = "2006-01-02"              //日期格式
@@ -23,28 +24,28 @@ const (
 	APPNAME          = "弘则-task"
 	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;512188925@qq.com"
 	//RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com;jhwang@hzinsights.com;lnyan@hzinsights.com;vwang@hzinsights.com"
-	RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com;jhwang@hzinsights.com;lnyan@hzinsights.com"
+	RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com"
 )
 
-//手机号，电子邮箱正则
+// 手机号，电子邮箱正则
 const (
 	RegularMobile = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0-9])|(17[0-9])|(16[0-9])|(19[0-9]))\\d{8}$" //手机号码
 	RegularEmail  = `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`                                             //匹配电子邮箱
 )
 
-//验证码code
+// 验证码code
 const (
 	REGISTER_CODE = iota + 1 //注册
 	LOGIN_CODE               //登录
 )
 
-//聚合短信
+// 聚合短信
 var (
 	TplId    = "65692"
 	JhAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415"
 )
 
-//科大讯飞--语音合成
+// 科大讯飞--语音合成
 const (
 	XfSTATUS_FIRST_FRAME    = 0 //第一帧标识
 	XfSTATUS_CONTINUE_FRAME = 1 //中间帧标识
@@ -58,11 +59,11 @@ const (
 )
 
 const (
-	EmailSendToHzUsers = "544935339@qq.com;lnyan@hzinsights.com;pdzhao@hzinsights.com;glji@hzinsights.com;tshen@hzinsights.com"
+	EmailSendToHzUsers = "lnyan@hzinsights.com;pdzhao@hzinsights.com;glji@hzinsights.com;tshen@hzinsights.com"
 	//EmailSendToHzUsers = "317699326@qq.com"
 )
 
-//数据来源渠道
+// 数据来源渠道
 const (
 	DATA_SOURCE_THS                          = iota + 1 //同花顺
 	DATA_SOURCE_WIND                                    //wind->2
@@ -121,6 +122,9 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_NH                    //预测指标 - 计算指标(年化)->55
 	DATA_SOURCE_PREDICT_CALCULATE_KSZS                  //预测指标 - 计算指标(扩散指数)->56
 	DATA_SOURCE_BAIINFO                                 //百川盈孚 ->57
+	DATA_SOURCE_STOCK_PLANT                             //存量装置 ->58
+	DATA_SOURCE_CALCULATE_CORRELATION                   //相关性计算->59
+	DATA_SOURCE_NATIONAL_STATISTICS                     //国家统计局->60
 )
 
 //http://datawind.hzinsights.com:8040/hz_server
@@ -135,7 +139,7 @@ var Hz_Data_WIND_Url_List = []string{"http://datawind.hzinsights.com:8040/", "ht
 
 //var Hz_Data_WIND_Url_List = []string{"http://datawind2.hzinsights.com:8040/", "http://datawind3.hzinsights.com:8040/"}
 
-//数据刷新频率
+// 数据刷新频率
 const (
 	DATA_REFRESH        = 7 //7个单位，日/周/月/季度/年
 	DATA_END_DATE_LIMIT = 4 //数据结束日期为，当前日期，加上4年时间
@@ -145,7 +149,7 @@ var (
 	Hz_Server_Data_Url string //同花顺，万得接口服务地址（阿里云windows服务器地址）
 )
 
-//EDB_LIB
+// EDB_LIB
 var (
 	APP_EDB_LIB_NAME_EN = "hongze_edb_lib"
 	EDB_LIB_Md5_KEY     = "GuRaB6dY1bXOJcwG"
@@ -164,7 +168,7 @@ const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
 
-//模板消息推送类型
+// 模板消息推送类型
 const (
 	TEMPLATE_MSG_YB_VOICE_BROADCAST = 20 //研报语音播报
 )

utils/des3.go

@@ -0,0 +1,187 @@
+// 加密工具类，用了3des和base64
+package utils
+
+import (
+	"bytes"
+	"crypto/cipher"
+	"crypto/des"
+	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"strings"
+)
+
+// des3 + base64 encrypt
+func DesBase64Encrypt(origData []byte) []byte {
+	result, err := TripleDesEncrypt(origData, []byte(DesKey))
+	if err != nil {
+		panic(any(err))
+	}
+	return []byte(base64.StdEncoding.EncodeToString(result))
+}
+
+func DesBase64Decrypt(crypted []byte) []byte {
+	result, _ := base64.StdEncoding.DecodeString(string(crypted))
+	remain := len(result) % 8
+	if remain > 0 {
+		mod := 8 - remain
+		for i := 0; i < mod; i++ {
+			result = append(result, 0)
+		}
+	}
+	origData, err := TripleDesDecrypt(result, []byte(DesKey))
+	if err != nil {
+		panic(any(err))
+	}
+	return origData
+}
+
+// 3DES加密
+func TripleDesEncrypt(origData, key []byte) ([]byte, error) {
+	block, err := des.NewTripleDESCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	origData = PKCS5Padding(origData, block.BlockSize())
+	// origData = ZeroPadding(origData, block.BlockSize())
+	blockMode := cipher.NewCBCEncrypter(block, key[:8])
+	crypted := make([]byte, len(origData))
+	blockMode.CryptBlocks(crypted, origData)
+	return crypted, nil
+}
+
+// 3DES解密
+func TripleDesDecrypt(crypted, key []byte) ([]byte, error) {
+	block, err := des.NewTripleDESCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	blockMode := cipher.NewCBCDecrypter(block, key[:8])
+	origData := make([]byte, len(crypted))
+	// origData := crypted
+	blockMode.CryptBlocks(origData, crypted)
+	origData = PKCS5UnPadding(origData)
+	// origData = ZeroUnPadding(origData)
+	return origData, nil
+}
+
+func ZeroPadding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{0}, padding)
+	return append(ciphertext, padtext...)
+}
+
+func ZeroUnPadding(origData []byte) []byte {
+	length := len(origData)
+	unpadding := int(origData[length-1])
+	return origData[:(length - unpadding)]
+}
+
+func PKCS5Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+func PKCS5UnPadding(origData []byte) []byte {
+	length := len(origData)
+	// 去掉最后一个字节 unpadding 次
+	unpadding := int(origData[length-1])
+	return origData[:(length - unpadding)]
+}
+
+// DES加密
+func DesEncrypt(content string, key string) string {
+	contents := []byte(content)
+	keys := []byte(key)
+	block, err := des.NewCipher(keys)
+	if err != nil {
+		return ""
+	}
+	contents = PKCS5Padding(contents, block.BlockSize())
+	blockMode := cipher.NewCBCEncrypter(block, keys)
+	crypted := make([]byte, len(contents))
+	blockMode.CryptBlocks(crypted, contents)
+	return byteToHexString(crypted)
+}
+
+func byteToHexString(bytes []byte) string {
+	str := ""
+	for i := 0; i < len(bytes); i++ {
+		sTemp := hex.EncodeToString([]byte{bytes[i]})
+		if len(sTemp) < 2 {
+			str += string(0)
+		}
+		str += strings.ToUpper(sTemp)
+	}
+	return str
+}
+
+// DES解密
+func DesDecrypt(content string, key string) string {
+	contentBytes, err := hex.DecodeString(content)
+	if err != nil {
+		return "字符串转换16进制数组失败" + err.Error()
+	}
+	keys := []byte(key)
+	block, err := des.NewCipher(keys)
+	if err != nil {
+		return "解密失败" + err.Error()
+	}
+	blockMode := cipher.NewCBCDecrypter(block, keys)
+	origData := contentBytes
+	blockMode.CryptBlocks(origData, contentBytes)
+	origData = ZeroUnPadding(origData)
+	return string(origData)
+}
+
+// DES ECB PKCK5Padding
+func EntryptDesECB(data, key []byte) (string, error) {
+	if len(key) > 8 {
+		key = key[:8]
+	}
+	block, err := des.NewCipher(key)
+	if err != nil {
+		return "", errors.New("des.NewCipher " + err.Error())
+	}
+	bs := block.BlockSize()
+	data = PKCS5Padding(data, bs)
+	if len(data)%bs != 0 {
+		return "", errors.New("EntryptDesECB Need a multiple of the blocksize")
+	}
+	out := make([]byte, len(data))
+	dst := out
+	for len(data) > 0 {
+		block.Encrypt(dst, data[:bs])
+		data = data[bs:]
+		dst = dst[bs:]
+	}
+	return base64.StdEncoding.EncodeToString(out), nil
+}
+
+func DecryptDESECB(d string, key []byte) ([]byte, error) {
+	data, err := base64.StdEncoding.DecodeString(d)
+	if err != nil {
+		return nil, errors.New("decodebase64 " + err.Error())
+	}
+	if len(key) > 8 {
+		key = key[:8]
+	}
+	block, err := des.NewCipher(key)
+	if err != nil {
+		return nil, errors.New("des.NewCipher " + err.Error())
+	}
+	bs := block.BlockSize()
+	if len(data)%bs != 0 {
+		return nil, errors.New("DecryptDES crypto/cipher: input not full blocks")
+	}
+	out := make([]byte, len(data))
+	dst := out
+	for len(data) > 0 {
+		block.Decrypt(dst, data[:bs])
+		data = data[bs:]
+		dst = dst[bs:]
+	}
+	out = PKCS5UnPadding(out)
+	return out, nil
+}