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

controllers/company_apply.go

@@ -2045,18 +2045,11 @@ func (this *CompanyApplyController) ApplyContract() {
 
 			// 买方研选3w/5w/10w
 			if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-				m3, m5, m10 := new(company.PermissionLookItem), new(company.PermissionLookItem), new(company.PermissionLookItem)
+				m3 := new(company.PermissionLookItem)
 				m3.ChartPermissionId = n.ChartPermissionId
 				m3.PermissionName = n.PermissionName
 				plist.Items = append(plist.Items, m3)
 
-				m5.ChartPermissionId = n.ChartPermissionId + utils.PERMISSION_ID_YANXUAN_DIFF
-				m5.PermissionName = fmt.Sprint(n.PermissionName, "(5w)")
-				plist.Items = append(plist.Items, m5)
-
-				m10.ChartPermissionId = utils.PERMISSION_ID_YANXUAN_10W_DIFF
-				m10.PermissionName = fmt.Sprint(n.PermissionName, "(10w)")
-				plist.Items = append(plist.Items, m10)
 				continue
 			}
 

controllers/cygx/contract_allocation.go

@@ -565,7 +565,12 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			respItemYx.Money = moneyYx
 			respItemYx.ChartPermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
 			respItemYx.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
-			respItemYx.List = append(respItemYx.List, &cygx.AllocationRealNameListResp{utils.CHART_PERMISSION_NAME_MF_YANXUAN, 0, moneyYx})
+
+			//手动拼接研选订阅的数据类型
+			listYxItem := new(cygx.AllocationRealNameListResp)
+			listYxItem.RealName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+			listYxItem.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
+			respItemYx.List = append(respItemYx.List, listYxItem)
 		}
 
 		if mapPermissionNameHave[utils.YAN_XUAN_KOU_DIAN_BAO_NAME] {
@@ -573,7 +578,11 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			respItemYxKouDian.Money = pointMoney
 			respItemYxKouDian.ChartPermissionName = utils.YAN_XUAN_KOU_DIAN_BAO_NAME
 			respItemYxKouDian.ChartPermissionId = utils.YAN_XUAN_KOU_DIAN_BAO_ID
-			respItemYxKouDian.List = append(respItemYxKouDian.List, &cygx.AllocationRealNameListResp{utils.YAN_XUAN_KOU_DIAN_BAO_NAME, 0, pointMoney})
+
+			listKouDianItem := new(cygx.AllocationRealNameListResp)
+			listKouDianItem.RealName = utils.YAN_XUAN_KOU_DIAN_BAO_NAME
+			listKouDianItem.ChartPermissionId = utils.YAN_XUAN_KOU_DIAN_BAO_ID
+			respItemYxKouDian.List = append(respItemYxKouDian.List, listKouDianItem)
 		}
 
 		resp.TotalPointsContent = fmt.Sprint(resp.Money, "W，", "其中", moneyYx+pointMoney, "w默认归属买方研选，请对剩余", resp.Money-moneyYx-pointMoney, "w按照100%进行比值分配")
@@ -610,6 +619,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			}
 			item := new(cygx.AllocationRealNameListResp)
 			item.RealName = v.Name
+			item.ChartPermissionId = mapPermissionId[v.ChartPermissionName]
 			mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
 		}
 
@@ -644,6 +654,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			item.RealName = v.RealName
 			item.Money = v.Money
 			item.Proportion = v.Proportion
+			item.ChartPermissionId = mapPermissionId[v.ChartPermissionName]
 			mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
 		}
 		listPermission, err := cygx.GetCygxAllocationCompanyContractPermissionListById(companyContractId)

models/cygx/allocation_company_contract.go

@@ -178,9 +178,10 @@ type AllocationPermissionListResp struct {
 
 // 行业
 type AllocationRealNameListResp struct {
-	RealName   string  `description:"研究员姓名"`
-	Proportion float64 `description:"占比"`
-	Money      float64 `description:"金额（单位万）"`
+	RealName          string  `description:"研究员姓名"`
+	Proportion        float64 `description:"占比"`
+	Money             float64 `description:"金额（单位万）"`
+	ChartPermissionId int     `description:"行业id"`
 }
 
 // 获取数量

services/cygx/activity_points_set.go

@@ -15,6 +15,7 @@ import (
 // 获取公司剩余点数
 func GetCygxActivityPointsCompanyByCompanyId(companyId int) (points string) {
 	var err error
+	points = "0" // 默认都展示 0
 	defer func() {
 		if err != nil {
 			go alarm_msg.SendAlarmMsg("获取公司剩余点数失败："+err.Error(), 2)

services/cygx/contract_allocation.go

@@ -580,3 +580,56 @@ func initCRM14_4() {
 	//}
 
 }
+
+func initCrm13_2() {
+	var condition string
+	var pars []interface{}
+	condition = " AND   chart_permission_id = 31   AND `status` IN ('正式','试用') AND product_id = 2 "
+
+	//获取所有开通买方研选正式试用的客户列表
+	listCompanyPermissionYx, e := company.GetCompanyReportPermissionList(condition, pars, 0, 0)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+
+	condition = " AND   chart_permission_id = 52   "
+	listCompanyPermissionKouDian, e := company.GetCompanyReportPermissionList(condition, pars, 0, 0)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+	mapKoud := make(map[int]bool)
+
+	for _, v := range listCompanyPermissionKouDian {
+		mapKoud[v.CompanyId] = true
+	}
+	//var i int
+	var items []*company.CompanyReportPermission
+	for k, v := range listCompanyPermissionYx {
+		if mapKoud[v.CompanyId] {
+			continue
+		}
+		permission := new(company.CompanyReportPermission)
+		permission.CompanyId = v.CompanyId
+		permission.ReportPermissionId = v.ReportPermissionId
+		permission.CreatedTime = time.Now()
+		permission.LastUpdatedTime = time.Now()
+		permission.ChartPermissionId = 52
+		permission.StartDate = v.StartDate
+		permission.EndDate = v.EndDate
+		permission.ProductId = 2
+		permission.ProductName = "权益"
+		permission.ModifyTime = time.Now()
+		permission.Status = v.Status
+		err := company.AddCompanyReportPermission(permission)
+		if err != nil {
+			return
+		}
+		fmt.Println(k)
+
+		items = append(items, permission)
+	}
+
+	fmt.Println(len(items))
+}