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

controllers/cygx/contract_allocation.go

@@ -566,7 +566,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			continue
 		}
 	}
-	fmt.Println(mapPermissionNameHave)
+	//fmt.Println(mapPermissionNameHave)
 	resp.Money = contractItem.Money / 10000
 	//有研选时，对研选套餐类型做文案处理
 	respItemYx := new(cygx.AllocationPermissionListResp)        // 研选订阅
@@ -717,6 +717,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 	resp.IsGray = mapIsGray[companyContractId]
 	//resp.List = respList
 	resp.CompanyContractId = companyContractId
+	resp.AllocationType = contractItem.AllocationType
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/company/company_apply.go

@@ -117,6 +117,7 @@ type CompanyContractDetail struct {
 	RaiPackageType    int       `description:"权益套餐类型: 0-无; 1-70w套餐; 2-45w套餐"`
 	Source            string    `description:"合同来源：上传附件, 系统合同"`
 	SourceTag         string    `description:"合同来源标签：非标合同，标准合同"`
+	AllocationType    int       `description:"分配方式，0手动分配，1X录分之后自动分配，默认0"`
 	PermissionList    []*PermissionLookList
 }
 

models/cygx/allocation_company_contract.go

@@ -238,7 +238,7 @@ func AddAndUpdateCygxAllocationCompanyContractRai(items []*CygxAllocationCompany
 	}
 
 	ow := orm.NewOrm()
-	sqlW := `UPDATE company_contract SET is_allocation=1   WHERE company_contract_id IN  (` + utils.GetOrmInReplace(lenIds) + `)`
+	sqlW := `UPDATE company_contract SET is_allocation=1 ,allocation_type = 1      WHERE company_contract_id IN  (` + utils.GetOrmInReplace(lenIds) + `)`
 	_, err = ow.Raw(sqlW, companyContractId).Exec()
 
 	return
@@ -255,6 +255,7 @@ type CygxAllocationCompanyContractDetailResp struct {
 	TotalPointsContent string  `description:"总点数描述"`
 	IsGray             bool    `description:"是否置灰"`
 	IsXClass           bool    `description:"是否是X类试用客户"`
+	AllocationType     int     `description:"分配方式，0手动分配，1X录分之后自动分配，默认0"`
 	List               []*AllocationPermissionListResp
 }
 

services/cygx/contract_allocation.go

@@ -865,6 +865,7 @@ func UpdateCygxallocationCompanyContractByEnterScore(itemsPermissionEnterScore [
 		companyContractIds = append(companyContractIds, v.CompanyContractId)
 	}
 
+	fmt.Println("companyContractIds", companyContractIds)
 	var items []*cygx.CygxAllocationCompanyContract
 	var itemsPermission []*cygx.CygxAllocationCompanyContractPermission
 
@@ -885,8 +886,8 @@ func UpdateCygxallocationCompanyContractByEnterScore(itemsPermissionEnterScore [
 			itemPermission.AdminId = sysUser.AdminId
 			itemPermission.AdminName = sysUser.RealName
 			itemPermission.Proportion = v.Proportion / totalProportionPermission * 100 // 占比转换
-			itemPermission.Money = v.Proportion * vContract.Money
-			itemPermission.MoneyAvg = vContract.Money / 6 // 目前6个行业
+			itemPermission.Money = v.Proportion * vContract.Money / 10000 / 100        // 单位转成万
+			itemPermission.MoneyAvg = vContract.Money / 6                              // 目前6个行业
 			itemPermission.ChartPermissionName = v.ChartPermissionName
 			itemPermission.CreateTime = time.Now()
 			itemPermission.ModifyTime = time.Now()
@@ -898,7 +899,7 @@ func UpdateCygxallocationCompanyContractByEnterScore(itemsPermissionEnterScore [
 			item.AdminId = sysUser.AdminId
 			item.AdminName = sysUser.RealName
 			item.Proportion = v.Proportion / totalProportionPermission * 100 // 占比转换
-			item.Money = v.Proportion * vContract.Money
+			item.Money = v.Proportion * vContract.Money / 10000 / 100        // 单位转成万
 			item.RealName = v.RealName
 			item.ChartPermissionName = v.ChartPermissionName
 			item.CreateTime = time.Now()
@@ -914,3 +915,40 @@ func UpdateCygxallocationCompanyContractByEnterScore(itemsPermissionEnterScore [
 	return
 
 }
+
+//func init15_4_1() {
+//	UpdateCygxallocationCompanyContractByEnterScoreInit()
+//	//"SELECT  *  FROM company_contract WHERE   company_id IN (SELECT  company_id   FROM company_product WHERE  product_id = 2  AND init_status = '永续' ) AND  product_id = 2 ;"
+//}
+
+func UpdateCygxallocationCompanyContractByEnterScoreInit() {
+	var condition string
+	var pars []interface{}
+	listEnterScore, err := cygx.GetCygxEnterScoreList(condition, pars, 0, 999)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	for _, v := range listEnterScore {
+		fmt.Println("v.EnterScoreId", v.EnterScoreId)
+		listPermission, err := cygx.GetCygxEnterScorePermissionListById(v.EnterScoreId)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		listResearcher, err := cygx.GeCygxEnterScoreResearcherListById(v.EnterScoreId)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		sysUser, err := system.GetSysUserById(v.AdminId)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		go UpdateCygxallocationCompanyContractByEnterScore(listPermission, listResearcher, v.StartDate, v.EndDate, v.CompanyId, sysUser)
+	}
+	fmt.Println("END")
+	return
+}