Merge branch 'crm/crm_15.4' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/contract_allocation.go

@@ -537,7 +537,10 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 		if match == nil {
 			continue
 		}
-
+		//研选订阅、研选扣点包 映射成买方研选
+		if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN || n.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
+			n.PermissionName = utils.CHART_PERMISSION_NAME_MAI_FANG_YANXUAN
+		}
 		mapPermissionNameHave[n.PermissionName] = true
 		// 买方研选(3w/5w/10w)
 		if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
@@ -546,7 +549,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			continue
 		}
 	}
-
+	fmt.Println(mapPermissionNameHave)
 	resp.Money = contractItem.Money / 10000
 	//有研选时，对研选套餐类型做文案处理
 	respItemYx := new(cygx.AllocationPermissionListResp)        // 研选订阅
@@ -632,14 +635,14 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			respItem.List = v
 			respList = append(respList, respItem)
 		}
-		//研选订阅
-		if respItemYx.ChartPermissionName != "" {
-			respList = append(respList, respItemYx)
-		}
-		//研选扣点
-		if respItemYxKouDian.ChartPermissionName != "" {
-			respList = append(respList, respItemYxKouDian)
-		}
+		////研选订阅
+		//if respItemYx.ChartPermissionName != "" {
+		//	respList = append(respList, respItemYx)
+		//}
+		////研选扣点
+		//if respItemYxKouDian.ChartPermissionName != "" {
+		//	respList = append(respList, respItemYxKouDian)
+		//}
 
 	} else {
 		listUser, err := cygx.GetCygxAllocationCompanyContractListById(companyContractId)
@@ -659,13 +662,13 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			item.ChartPermissionId = mapPermissionId[v.ChartPermissionName]
 			mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
 		}
-		listPermission, err := cygx.GetCygxAllocationCompanyContractPermissionListById(companyContractId)
+		listPermissionContract, err := cygx.GetCygxAllocationCompanyContractPermissionListById(companyContractId)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败,GetCygxAllocationCompanyContractPermissionListById Err: " + err.Error()
 			return
 		}
-		for _, v := range listPermission {
+		for _, v := range listPermissionContract {
 			if showDetail && v.Money == 0 {
 				continue
 			}
@@ -686,7 +689,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 		return
 	}
 
-	permissionNameArr := []string{"医药", "消费", "科技", "智造", "策略", utils.CHART_PERMISSION_NAME_MF_YANXUAN, utils.YAN_XUAN_KOU_DIAN_BAO_NAME}
+	permissionNameArr := []string{"医药", "消费", "科技", "智造", "策略", utils.CHART_PERMISSION_NAME_MAI_FANG_YANXUAN}
 	for _, v := range permissionNameArr {
 		for _, v2 := range respList {
 			if v2.ChartPermissionName == v {
@@ -775,7 +778,7 @@ func (this *ContractAllocationController) CompanyContracUpdate() {
 	mapPermissionNameHave := make(map[string]bool) // 判断合同是否存在某一行业权限种类
 	for _, n := range raiPermissions {
 		//只计算，医药、消费、科技、智造、策略、买方研选的
-		if n.PermissionName != utils.YI_YAO_NAME && n.PermissionName != utils.XIAO_FEI_NAME && n.PermissionName != utils.KE_JI_NAME && n.PermissionName != utils.ZHI_ZAO_NAME && n.PermissionName != utils.CE_LUE_NAME && n.PermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+		if n.PermissionName != utils.YI_YAO_NAME && n.PermissionName != utils.XIAO_FEI_NAME && n.PermissionName != utils.KE_JI_NAME && n.PermissionName != utils.ZHI_ZAO_NAME && n.PermissionName != utils.CE_LUE_NAME && n.PermissionName != utils.CHART_PERMISSION_NAME_MAI_FANG_YANXUAN {
 			continue
 		}
 		match := hasMap[n.ChartPermissionId]
@@ -784,17 +787,18 @@ func (this *ContractAllocationController) CompanyContracUpdate() {
 		}
 
 		// 买方研选(3w/5w/10W)
-		if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-			if match.ExpensiveYx == 1 {
-				money = money - 5
-			} else if match.ExpensiveYx == 2 {
-				money = money - 10
-			} else {
-				money = money - 3
-			}
-		} else {
-			mapPermissionNameHave[n.PermissionName] = true
-		}
+		//if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+		//	if match.ExpensiveYx == 1 {
+		//		money = money - 5
+		//	} else if match.ExpensiveYx == 2 {
+		//		money = money - 10
+		//	} else {
+		//		money = money - 3
+		//	}
+		//} else {
+		//	mapPermissionNameHave[n.PermissionName] = true
+		//}
+		mapPermissionNameHave[n.PermissionName] = true
 	}
 
 	if len(mapPermissionNameHave) > 0 {
@@ -813,7 +817,7 @@ func (this *ContractAllocationController) CompanyContracUpdate() {
 		itemPermission.AdminName = sysUser.RealName
 		itemPermission.Proportion = v.Proportion
 		itemPermission.Money = v.Money
-		if v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+		if v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MAI_FANG_YANXUAN {
 			itemPermission.MoneyAvg = moneyAvg
 			if v.Money < moneyAvg/2 {
 				br.Msg = "单行业占比值不得低于平均值的一半"
@@ -985,19 +989,19 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		}
 		for _, v := range allocationCompanyContractList {
 
-			if v.Proportion != 0 && v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-				mapUserAllocation[v.RealName] += 1
-				mapUserMoney[v.RealName] += v.Money
-				mapPermissionAllocation[v.ChartPermissionName] += 1
-				mapPermissionMoney[v.ChartPermissionName] += v.Money
-				totalMoney += v.Money
-				companyContractIdBool[v.CompanyContractId] = true
-				//统计单个行业所关的合同数量
-				if !mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] {
-					mapPermissionContract[v.ChartPermissionName] += 1
-					mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] = true
-				}
+			//if v.Proportion != 0 && v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+			mapUserAllocation[v.RealName] += 1
+			mapUserMoney[v.RealName] += v.Money
+			mapPermissionAllocation[v.ChartPermissionName] += 1
+			mapPermissionMoney[v.ChartPermissionName] += v.Money
+			totalMoney += v.Money
+			companyContractIdBool[v.CompanyContractId] = true
+			//统计单个行业所关的合同数量
+			if !mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] {
+				mapPermissionContract[v.ChartPermissionName] += 1
+				mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] = true
 			}
+			//}
 		}
 		for _, v := range allocationCompanyContractPermissionList {
 			mapPermissionMoneyAvg[v.ChartPermissionName] += v.MoneyAvg
@@ -1096,7 +1100,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	}
 
 	var list []*cygx.AllocationPermissionStatisticsListResp
-	permissionNameArr := []string{"医药", "消费", "科技", "智造", "策略"}
+	permissionNameArr := []string{"医药", "消费", "科技", "智造", "策略", "买方研选"}
 	for _, v := range permissionNameArr {
 		item := new(cygx.AllocationPermissionStatisticsListResp)
 		item.ChartPermissionName = v

services/company_apply/company_approval.go

@@ -421,9 +421,9 @@ func Approved(approvalRecord *contract.ContractApprovalRecord, opUser *system.Ad
 				//客户研选行业转正时(王芳审批通过)，模板消息提醒汪洋
 				services.AddCompanyApprovalMessageWangYang(recordInfo.CompanyId, recordInfo.CompanyContractId, recordInfo.ApplyRealName, companyInfo.CompanyName)
 				cygxService.YanXuanCompanyApproval(recordInfo.CompanyId, recordInfo.CompanyContractId) //研选审批通过的时候研选扣点更新
-				cygxService.HandleAllocationCompanyContractByYanXuan(recordInfo.CompanyContractId)     //如果合同只有研选的时候，自动处理派点
-				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)       // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
-				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId)  // 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
+				//cygxService.HandleAllocationCompanyContractByYanXuan(recordInfo.CompanyContractId)     //如果合同只有研选的时候，自动处理派点
+				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)      // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
+				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId) // 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
 			}
 		}()
 	} else {

utils/constants.go

@@ -376,6 +376,7 @@ const (
 	CHART_PERMISSION_NAME_MF_YANXUAN        string = "研选订阅"
 	LU_YAN_FU_WU                            string = "路演服务"
 	CHART_PERMISSION_NAME_YANXUAN           string = "研选"
+	CHART_PERMISSION_NAME_MAI_FANG_YANXUAN  string = "买方研选"
 	CHART_PERMISSION_ID_YANXUAN             int    = 31      //权限研选订阅id
 	YAN_XUAN_KOU_DIAN_BAO_ID                int    = 52      //研选扣点包ID
 	YAN_XUAN_KOU_DIAN_BAO_NAME              string = "研选扣点包" //研选扣点包名称