Merge branch 'feature/v4.9.7' of qmx/jy into release/v4.9.7

src/jfw/front/hybg.go

@@ -125,16 +125,16 @@ func (l *DeskAnalysisReport) DeskReport() {
 			}
 		}
 		//订阅信息
+		var types string
 		if len(areas) == 0 {
 			userData := jy.GetBigVipUserBaseMsg(l.Session(), *config.Middleground)
-			var types string
 			oArea := &map[string]interface{}{}
 			if userData.Data.Member.Status > 0 {
 				types = "m"
 			} else if userData.Data.Vip.Status > 0 {
 				types = "v"
-			} else {
-				types = "m"
+			} else if userData.EntnicheStatus == 1 {
+				types = "s"
 			}
 			vipJy := jy.GetSubScribeInfo(l.Session(), mongodb, types, "10000")
 			oArea = qutil.ObjToMap((*vipJy)["o_area"])
@@ -153,7 +153,7 @@ func (l *DeskAnalysisReport) DeskReport() {
 		if len(sql) > 0 {
 			strSql = fmt.Sprintf(" WHERE %s", strings.Join(sql, " and "))
 		}
-		log.Printf("用户userId：%s,mgoid：%s,sql:%s\n", userId, mgoUserId, sql)
+		log.Printf("用户userId：%s,mgoid：%s,types：%s,sql:%s\n", userId, mgoUserId, types, strSql)
 		var dataArrMap []map[string]interface{}
 		reportRes, _ := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT * FROM analysis_report %s ORDER BY show_time DESC,classify desc LIMIT 10
 `, strSql))

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

@@ -190,31 +190,30 @@ func getCustomerLimit(userInfo *powercheck.CheckResp) (count int) {
 	if userInfo.Free.IsFree {
 		return config.Config.FollowCustomer.Free
 	}
-
 	// 大会员
-	//if userInfo.Member.Status > 0 {
-	//	//P303 业主监控  老版大会员权限调整2024.2.4 发版之前的大会员
-	//	if userInfo.Member.StartTime < 1707051600 {
-	//		for i := 0; i < len(userInfo.Member.MemberPowerList); i++ {
-	//			if userInfo.Member.MemberPowerList[i] == 7 {
-	//				userInfo.Member.MemberPowerList = append(userInfo.Member.MemberPowerList, 25) //业主监控专家版500
-	//				break
-	//			}
-	//		}
-	//	}
-	//	var flag bool
-	//	for i := 0; i < len(userInfo.Member.MemberPowerList); i++ {
-	//		serviceId := userInfo.Member.MemberPowerList[i]
-	//		if c, b := config.Config.FollowCustomer.Member[fmt.Sprintf("%v", serviceId)]; b {
-	//			count = c
-	//			flag = true
-	//			break
-	//		}
-	//	}
-	//	if !flag {
-	//		count = config.Config.FollowCustomer.Member["default"]
-	//	}
-	//}
+	if userInfo.Member.Status > 0 {
+		//P303 业主监控  老版大会员权限调整2024.2.4 发版之前的大会员
+		if userInfo.Member.StartTime < 1707051600 {
+			for i := 0; i < len(userInfo.Member.MemberPowerList); i++ {
+				if userInfo.Member.MemberPowerList[i] == 7 {
+					userInfo.Member.MemberPowerList = append(userInfo.Member.MemberPowerList, 25) //业主监控专家版500
+					break
+				}
+			}
+		}
+		var flag bool
+		for i := 0; i < len(userInfo.Member.MemberPowerList); i++ {
+			serviceId := userInfo.Member.MemberPowerList[i]
+			if c, b := config.Config.FollowCustomer.Member[fmt.Sprintf("%v", serviceId)]; b {
+				count = c
+				flag = true
+				break
+			}
+		}
+		if !flag {
+			count = config.Config.FollowCustomer.Member["default"]
+		}
+	}
 	// 商机管理
 	if userInfo.Entniche.Status > 0 && userInfo.Entniche.PowerSource < 1 {
 		// 新商机管理
@@ -224,8 +223,7 @@ func getCustomerLimit(userInfo *powercheck.CheckResp) (count int) {
 			}
 		} else if config.Config.FollowCustomer.Ent.Old > count {
 			// 旧商机管理
-			//count = config.Config.FollowCustomer.Ent.Old
-			count = 0
+			count = config.Config.FollowCustomer.Ent.Old
 		}
 	}
 
@@ -236,17 +234,17 @@ func getCustomerLimit(userInfo *powercheck.CheckResp) (count int) {
 		}
 	}
 	// 超级订阅
-	//if userInfo.Vip.Status > 0 {
-	//	// 新超级订阅
-	//	if userInfo.Vip.Upgrade > 0 {
-	//		if config.Config.FollowCustomer.Vip.New > count {
-	//			count = config.Config.FollowCustomer.Vip.New
-	//		}
-	//	} else if config.Config.FollowCustomer.Vip.Old > count {
-	//		// 旧超级订阅
-	//		count = config.Config.FollowCustomer.Vip.Old
-	//	}
-	//}
+	if userInfo.Vip.Status > 0 {
+		// 新超级订阅
+		if userInfo.Vip.Upgrade > 0 {
+			if config.Config.FollowCustomer.Vip.New > count {
+				count = config.Config.FollowCustomer.Vip.New
+			}
+		} else if config.Config.FollowCustomer.Vip.Old > count {
+			// 旧超级订阅
+			count = config.Config.FollowCustomer.Vip.Old
+		}
+	}
 	return
 }