Merge branch 'dev/v4.8.16_ws' of qmx/jy into feature/v4.8.16

src/jfw/modules/bigmember/src/service/analysis/decision.go

@@ -43,10 +43,10 @@ type ViewKeyWord struct {
 	MatchWay int      `json:"matchway"`  //匹配模式
 }
 
-//投标决策分析id
+// 投标决策分析id
 var ServiceId = 6
 
-//采购单位和中标企业 其他项目明细/类似项目明细
+// 采购单位和中标企业 其他项目明细/类似项目明细
 func (this *Analysis) ProjectInfoByBW() {
 	defer qutil.Catch()
 	r := func() Result {
@@ -73,7 +73,7 @@ func (this *Analysis) ProjectInfoByBW() {
 	this.ServeJson(r)
 }
 
-//试用用户分析
+// 试用用户分析
 func (this *Analysis) TrialInfo() {
 	defer qutil.Catch()
 	userId, _ := this.GetSession("userId").(string)
@@ -116,7 +116,7 @@ func (this *Analysis) TrialInfo() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//决策分析内容-普通用户
+// 决策分析内容-普通用户
 func (this *Analysis) FreeDecInfo() {
 	defer qutil.Catch()
 	var regMap = Result{
@@ -160,7 +160,7 @@ func (this *Analysis) FreeDecInfo() {
 			decQuery := DecQueryFree(getRes.Area, getRes.BuyerClass, getRes.BuyerContent, getRes.Industry, getRes.Buyer, buyer_buyerClass, getRes.MinPrice, getRes.MaxPrice)
 			regMap.Data = getDecInfoFree(decQuery, buyer_buyerClass, getRes)
 			//投标决策分析历史记录
-			go SaveDecHistortList(getRes, userId, mainUserid, phone, "", 0, this.Request)
+			go SaveDecHistortList(getRes, userId, mainUserid, phone, "", 0, this.Request, "free")
 		} else {
 			regMap.Error_code = Error_code_1002
 			regMap.Error_msg = Error_msg_1002
@@ -172,7 +172,7 @@ func (this *Analysis) FreeDecInfo() {
 	this.ServeJson(regMap)
 }
 
-//决策分析内容
+// 决策分析内容
 func (this *Analysis) DecInfo() {
 	defer qutil.Catch()
 	var regMap = Result{
@@ -233,7 +233,7 @@ func (this *Analysis) DecInfo() {
 				decQuery := DecQuery(getRes.Area, getRes.BuyerClass, getRes.BuyerContent, getRes.Industry, getRes.Buyer, buyer_buyerClass, getRes.MinPrice, getRes.MaxPrice)
 				regMap.Data = getDecInfo(decQuery, buyer_buyerClass, getRes)
 				//投标决策分析历史记录
-				go SaveDecHistortList(getRes, userId, mainUserid, phone, base64Key, decCount, this.Request)
+				go SaveDecHistortList(getRes, userId, mainUserid, phone, base64Key, decCount, this.Request, "pay")
 			}
 		} else {
 			regMap.Error_code = Error_code_1002
@@ -246,7 +246,7 @@ func (this *Analysis) DecInfo() {
 	this.ServeJson(regMap)
 }
 
-//投标决策分析
+// 投标决策分析
 func getDecInfoFree(decQuery, buyer_buyerClass string, dec *DecParam) map[string]interface{} {
 	t1 := time.Now()
 	//
@@ -298,7 +298,7 @@ func getDecInfoFree(decQuery, buyer_buyerClass string, dec *DecParam) map[string
 	return aggsArr
 }
 
-//投标决策分析
+// 投标决策分析
 func getDecInfo(decQuery, buyer_buyerClass string, dec *DecParam) map[string]interface{} {
 	t1 := time.Now()
 	//
@@ -731,7 +731,7 @@ func getDecInfo(decQuery, buyer_buyerClass string, dec *DecParam) map[string]int
 	}
 }
 
-//决策分析 根据字段权重排序 中标企业和中标价格
+// 决策分析 根据字段权重排序 中标企业和中标价格
 var (
 	bidtype_score        = 1 //采购方式
 	review_experts_score = 1 //评审专家

src/jfw/modules/bigmember/src/service/analysis/power.go

@@ -51,7 +51,7 @@ func AnalysisPower(atype, userId, pname, sid string, serviceId int) (int, string
 	return f_0, "", 0
 }
 
-//获取mysql 大会员权限信息
+// 获取mysql 大会员权限信息
 func getBAmountInfo(userId string, serviceId int) int {
 	// info := db.Mysql.SelectBySql("SELECT * FROM bigmember_amount a WHERE a.user_id = '" + userId + "' AND a.is_ing = 1")
 	info := db.Mysql.SelectBySql(`SELECT a.i_frequency FROM `+jy.BigmemberUserPowerTable+` a WHERE a.s_userid = ? AND a.i_status = 0 AND a.s_serviceid = ?`, userId, serviceId)
@@ -63,7 +63,7 @@ func getBAmountInfo(userId string, serviceId int) int {
 	return 0
 }
 
-//更新sql库 大会员用户服务表 bigmember_service_user
+// 更新sql库 大会员用户服务表 bigmember_service_user
 func UpdatePower(userId string, serviceId int) {
 	var sql = `UPDATE ` + jy.BigmemberUserPowerTable + ` a SET a.i_frequency= IF(a.i_frequency<1,0,a.i_frequency-1) WHERE a.s_userid = ? AND a.s_serviceid = ? `
 
@@ -74,7 +74,7 @@ func UpdatePower(userId string, serviceId int) {
 	}
 }
 
-//保存中标预测记录
+// 保存中标预测记录
 func SaveFWHistorys(status int, userId, f_userId, base64Key, phone string, currentCount int, r *http.Request, res *util.ForecastS, ai int) {
 	if status == 2 {
 		status = 1
@@ -113,8 +113,8 @@ func SaveFWHistorys(status int, userId, f_userId, base64Key, phone string, curre
 	}
 }
 
-//保存投标决策分析记录
-func SaveDecHistortList(res *DecParam, userId, main_userId, phone, base64Key string, decCount int, r *http.Request) {
+// 保存投标决策分析记录
+func SaveDecHistortList(res *DecParam, userId, main_userId, phone, base64Key string, decCount int, r *http.Request, source string) {
 	// log.Println(res, userId)
 	remark := map[string]interface{}{
 		"area":         res.Area,
@@ -147,6 +147,7 @@ func SaveDecHistortList(res *DecParam, userId, main_userId, phone, base64Key str
 		"s_browser":            r.UserAgent(),
 		"s_app_v":              res.AppVersion,
 		"s_key":                base64Key,
+		"source":               source,
 	}
 	fi := db.Mysql.Insert("bigmember_consume", insert)
 	if fi == 0 {