no message

services/cygx/contract_allocation.go

@@ -31,57 +31,68 @@ func HandleAllocationCompanyContractByYanXuan(companyContractId int) (err error)
 		return
 	}
 
-	if len(companyContractPermissionList) > 1 {
+	//超过两个权限说明还有其他行业，不做自动派点处理
+	if len(companyContractPermissionList) > 2 {
 		return
 	}
+	var items []*cygx_allocation_company_contract.CygxAllocationCompanyContract
+	var itemsPermission []*cygx_allocation_company_contract.CygxAllocationCompanyContractPermission
 	var expensiveYxmoney float64
 	for _, v := range companyContractPermissionList {
-		if v.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
-			err = errors.New("没有发现研选权限: ")
+		//if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+		//	err = errors.New("没有发现研选权限: ")
+		//	return
+		//}
+		//if v.ExpensiveYx == 1 {
+		//	expensiveYxmoney = 5
+		//} else if v.ExpensiveYx == 2 {
+		//	expensiveYxmoney = 10
+		//} else {
+		//	expensiveYxmoney = 3
+		//}
+		if v.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && v.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
 			return
 		}
-		if v.ExpensiveYx == 1 {
-			expensiveYxmoney = 5
-		} else if v.ExpensiveYx == 2 {
-			expensiveYxmoney = 10
-		} else {
+
+		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 			expensiveYxmoney = 3
 		}
-	}
-
-	var items []*cygx_allocation_company_contract.CygxAllocationCompanyContract
-	var itemsPermission []*cygx_allocation_company_contract.CygxAllocationCompanyContractPermission
 
-	itemPermission := new(cygx_allocation_company_contract.CygxAllocationCompanyContractPermission)
-	itemPermission.CompanyContractId = companyContractId
-	//itemPermission.AdminId = sysUser.AdminId
-	//itemPermission.AdminName = sysUser.RealName
-	itemPermission.Proportion = 0
-	itemPermission.Money = expensiveYxmoney
-	itemPermission.MoneyAvg = 0
-	itemPermission.ChartPermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
-	itemPermission.CreateTime = time.Now()
-	itemPermission.ModifyTime = time.Now()
-	itemsPermission = append(itemsPermission, itemPermission)
-
-	item := new(cygx_allocation_company_contract.CygxAllocationCompanyContract)
-	item.CompanyContractId = companyContractId
-	//item.AdminId = sysUser.AdminId
-	//item.AdminName = sysUser.RealName
-	item.Proportion = 0
-	item.Money = expensiveYxmoney
-	item.RealName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
-	item.ChartPermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
-	item.CreateTime = time.Now()
-	item.ModifyTime = time.Now()
-	items = append(items, item)
+		if v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+			expensiveYxmoney = 0.2 * v.Points
+		}
 
+		itemPermission := new(cygx_allocation_company_contract.CygxAllocationCompanyContractPermission)
+		itemPermission.CompanyContractId = companyContractId
+		//itemPermission.AdminId = sysUser.AdminId
+		//itemPermission.AdminName = sysUser.RealName
+		itemPermission.Proportion = 0
+		itemPermission.Money = expensiveYxmoney
+		itemPermission.MoneyAvg = 0
+		itemPermission.ChartPermissionName = v.PermissionName
+		itemPermission.CreateTime = time.Now()
+		itemPermission.ModifyTime = time.Now()
+		itemsPermission = append(itemsPermission, itemPermission)
+
+		item := new(cygx_allocation_company_contract.CygxAllocationCompanyContract)
+		item.CompanyContractId = companyContractId
+		item.Proportion = 0
+		item.Money = expensiveYxmoney
+		item.RealName = v.PermissionName
+		item.ChartPermissionName = v.PermissionName
+		item.CreateTime = time.Now()
+		item.ModifyTime = time.Now()
+		items = append(items, item)
+	}
+
+	if len(items) == 0 {
+		return
+	}
 	e = cygx_allocation_company_contract.AddAndUpdateCygxAllocationCompanyContract(items, itemsPermission, companyContractId)
 	if e != nil {
 		err = errors.New("AddAndUpdateCygxAllocationCompanyContract, Err: " + e.Error())
 		return
 	}
-
 	return
 
 }

utils/constants.go

@@ -166,7 +166,7 @@ const (
 	XIAO_FEI_NAME                    string = "消费"
 	KE_JI_NAME                       string = "科技"
 	ZHI_ZAO_NAME                     string = "智造"
-	CHART_PERMISSION_NAME_MF_YANXUAN string = "买方研选"
+	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
 	ZHUAN_JIA_ID                     int    = 29
 	CHART_PERMISSION_NAME_70W               = "70w大套餐"                   // 权益70w大套餐名称
 	CHART_PERMISSION_ID_70W                 = 2001                       // 权益70w大套餐表示的权限ID(自定义)