Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_10.6

services/activity.go

@@ -2368,20 +2368,15 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 			}
 		}
 	}
-
-	//for _, v := range activityIds {
-	//	labelMap[v] = true
-	//}
-	//fmt.Println(labelMap)
 	////产业关联的弘则报告发布日期在三个月以内的活动、产业显示 NEW标签
-	articNewLabel, e := GetArticNewLabelWhithActivity3Month()
-	if e != nil {
-		err = errors.New("获取产业新标签Map失败, Err: " + e.Error())
-		return
-	}
-	for k := range articNewLabel {
-		labelMap[k] = true
-	}
+	//articNewLabel, e := GetArticNewLabelWhithActivity3Month()
+	//if e != nil {
+	//	err = errors.New("获取产业新标签Map失败, Err: " + e.Error())
+	//	return
+	//}
+	//for k := range articNewLabel {
+	//	labelMap[k] = true
+	//}
 	return
 }
 

services/activity_points.go

@@ -787,13 +787,13 @@ func YanXuanCompanyApprovalReduce(log models.YanXuanActivityPointsRedis) (err er
 	}
 	var billDetailed float64
 	var content string
-	//ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"` 3W3次、5W 15次
+	//ExpensiveYx               int       `description:"权益研选: 0->3w; 1->5w"` 3W3次、5W 15次
 	if companyReportPermissionDetail.ExpensiveYx == 1 {
 		billDetailed = 15
-		content = "买方研选plus转正"
+		content = "买方研选(5W)转正"
 	} else {
 		billDetailed = 3
-		content = "买方研选转正"
+		content = "买方研选(3W)转正"
 	}
 
 	//获取需要添加的流水信息

services/industrial_management.go

@@ -299,10 +299,10 @@ func IndustryFllowWithTrack(industrialManagementId, count, uid int) (err error)
 	return err
 }
 
-func init() {
-	//IndustryFllowUserLabel(136, 16, 5660)
-	//UserLabelLogReduce()
-}
+//func init() {
+//IndustryFllowUserLabel(136, 16, 5660)
+//UserLabelLogReduce()
+//}
 
 // GetIndustryNewLabelMap 获取产业【新】标签Map
 func GetIndustryNewLabelMap(industryIds []int) (labelMap map[int]bool, err error) {