Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/cygx_13.2

controllers/company_apply.go

@@ -136,66 +136,99 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 			}
 
 			checkItems := make([]*company.PermissionLookItem, 0)
-
-			// PS:本来想把这个移到循环外面去优化一下...但是发现有指针引用变量被改掉的问题, BUG太多了改不完了先这样吧=_=!
 			raiPermissions, e := company.GetPermissionLookItemsExt("2", utils.COMPANY_PRODUCT_RAI_NAME)
 			if e != nil {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取权益权限列表失败, Err: " + e.Error()
 				return
 			}
-
-			for _, n := range raiPermissions {
-				match := hasMap[n.ChartPermissionId]
-				if match == nil {
-					continue
+			//大套餐类型单独展示
+			if companyContract.RaiPackageType > 0 {
+				n := new(company.PermissionLookItem)
+				if companyContract.RaiPackageType == 1 {
+					n.PermissionName = "70W套餐"
+				} else if companyContract.RaiPackageType == 2 {
+					n.PermissionName = "45W套餐"
 				}
-				// 升级
-				if match.IsUpgrade == 1 {
-					n.IsUpgrade = 1
-					checkList = append(checkList, n.ChartPermissionId)
-					checkItems = append(checkItems, n)
-					continue
+				checkList = append(checkList, 0)
+				checkItems = append(checkItems, n)
+
+				for _, n := range raiPermissions {
+					match := hasMap[n.ChartPermissionId]
+					if match == nil {
+						continue
+					}
+					//研选、专家也要单独处理
+					if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN || n.ChartPermissionId == utils.ZHUAN_JIA_ID {
+						if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+							if expensiveYx == 1 {
+								n.PermissionName += "(5w)"
+							} else if expensiveYx == 2 {
+								n.PermissionName += "(10w)"
+							} else if expensiveYx == 0 {
+								n.PermissionName += "(3w)"
+							}
+						}
+						checkList = append(checkList, n.ChartPermissionId)
+						checkItems = append(checkItems, n)
+					}
+
 				}
-				// 买方研选(3w/5w)
-				if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-					if expensiveYx == 1 {
-						n.PermissionName += "(5w)"
-					} else if expensiveYx == 2 {
-						n.PermissionName += "(10w)"
-					} else if expensiveYx == 0 {
-						n.PermissionName += "(3w)"
+			} else {
+				// PS:本来想把这个移到循环外面去优化一下...但是发现有指针引用变量被改掉的问题, BUG太多了改不完了先这样吧=_=!
+
+				for _, n := range raiPermissions {
+					match := hasMap[n.ChartPermissionId]
+					if match == nil {
+						continue
+					}
+					// 升级
+					if match.IsUpgrade == 1 {
+						n.IsUpgrade = 1
+						checkList = append(checkList, n.ChartPermissionId)
+						checkItems = append(checkItems, n)
+						continue
+					}
+					// 买方研选(3w/5w)
+					if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+						if expensiveYx == 1 {
+							n.PermissionName += "(5w)"
+						} else if expensiveYx == 2 {
+							n.PermissionName += "(10w)"
+						} else if expensiveYx == 0 {
+							n.PermissionName += "(3w)"
+						}
+						//n.PermissionName += expMap[match.ExpensiveYx]
+						checkList = append(checkList, n.ChartPermissionId)
+						checkItems = append(checkItems, n)
+						continue
 					}
-					//n.PermissionName += expMap[match.ExpensiveYx]
 					checkList = append(checkList, n.ChartPermissionId)
 					checkItems = append(checkItems, n)
-					continue
-				}
-				checkList = append(checkList, n.ChartPermissionId)
-				checkItems = append(checkItems, n)
 
-				//count, err := company.GetCompanyContractUpgradePermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId, 0)
-				//if err != nil {
-				//	br.Msg = "获取失败"
-				//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				//	return
-				//}
-				//if count > 0 {
-				//	checkList = append(checkList, n.ChartPermissionId)
-				//	checkItems = append(checkItems, n)
-				//} else {
-				//	count2, err := company.GetCompanyContractUpgradePermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId, 1)
-				//	if err != nil {
-				//		br.Msg = "获取失败"
-				//		br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				//		return
-				//	}
-				//	if count2 > 0 {
-				//		n.IsUpgrade = 1
-				//		checkList = append(checkList, n.ChartPermissionId)
-				//		checkItems = append(checkItems, n)
-				//	}
-				//}
+					//count, err := company.GetCompanyContractUpgradePermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId, 0)
+					//if err != nil {
+					//	br.Msg = "获取失败"
+					//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+					//	return
+					//}
+					//if count > 0 {
+					//	checkList = append(checkList, n.ChartPermissionId)
+					//	checkItems = append(checkItems, n)
+					//} else {
+					//	count2, err := company.GetCompanyContractUpgradePermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId, 1)
+					//	if err != nil {
+					//		br.Msg = "获取失败"
+					//		br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+					//		return
+					//	}
+					//	if count2 > 0 {
+					//		n.IsUpgrade = 1
+					//		checkList = append(checkList, n.ChartPermissionId)
+					//		checkItems = append(checkItems, n)
+					//	}
+					//}
+				}
 			}
 			//合并主观客观
 			//mapPermissionNameList := make(map[string]int)

controllers/cygx/user.go

@@ -71,6 +71,9 @@ func (this *UserController) List() {
 	keyWord = strings.Replace(keyWord, "'", "", -1)
 	isSubscribeCygx, _ := this.GetInt("IsSubscribeCygx", -1)
 
+	if status == "X类试用" {
+		status = "永续"
+	}
 	var total int
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
@@ -307,11 +310,11 @@ func (this *UserController) List() {
 		condition += ` AND b.status= '` + status + `'`
 		usercondition += ` AND cp.status= '` + status + `'`
 	} else {
-		condition += ` AND b.status IN ('正式','试用','冻结') `
+		condition += ` AND b.status IN ('正式','试用','冻结','永续') `
 	}
 
 	// 试用客户标签
-	if status == "试用" && tryStage > 0 {
+	if (status == "试用" || status == "永续") && tryStage > 0 {
 		condition += ` AND b.try_stage= '` + strconv.Itoa(tryStage) + `'`
 		usercondition += ` AND cp.try_stage= '` + strconv.Itoa(tryStage) + `'`
 	}
@@ -431,6 +434,9 @@ func (this *UserController) List() {
 					list[k].Status += "(预备)"
 				}
 			}
+			if v.Status == "永续" {
+				v.Status = "X类试用"
+			}
 			userIds += strconv.Itoa(int(v.UserId)) + ","
 			userIdArr = append(userIdArr, int(v.UserId))
 
@@ -1331,7 +1337,7 @@ func (this *UserController) StatusTable() {
 	}
 	listType := []*cygx.CygxTryStageRep{{Name: "大套餐", TryStage: 1}, {Name: "小套餐", TryStage: 2}}
 	listStatus := []*cygx.CygxTryStageRep{{Name: "未分类", TryStage: 1}, {Name: "推进", TryStage: 2}, {Name: "跟踪", TryStage: 3}, {Name: "预备", TryStage: 4}}
-	List := []*cygx.CygxUserTableStatusRep{{Name: "正式", List: listType, TryStage: "正式"}, {Name: "试用", List: listStatus, TryStage: "试用"}, {Name: "冻结", List: []*cygx.CygxTryStageRep{}, TryStage: "冻结"}}
+	List := []*cygx.CygxUserTableStatusRep{{Name: "正式", List: listType, TryStage: "正式"}, {Name: "试用", List: listStatus, TryStage: "试用"}, {Name: "冻结", List: []*cygx.CygxTryStageRep{}, TryStage: "冻结"}, {Name: "X类试用", List: []*cygx.CygxTryStageRep{}, TryStage: "X类试用"}}
 	resp := new(cygx.CygxUserTableStatusListRep)
 	resp.List = List
 

models/company/company_apply.go

@@ -55,6 +55,7 @@ type CompanyContractHistory struct {
 	Status            int       `description:"状态"`
 	ProductId         int       `description:"产品id"`
 	ContractId        int       `description:"合同ID"`
+	RaiPackageType    int       `description:"权益套餐类型: 0-无; 1-70w套餐; 2-45w套餐"`
 	PermissionList    []*ContractPermissionList
 }