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

controllers/cygx/contract_allocation.go

@@ -507,7 +507,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 	}
 
 	//var contractPermissionList []*company.ContractPermissionList
-	expMap := map[int]string{0: "(3w)", 1: "(5w)"} // 买方研选价格
+	expMap := map[int]string{0: "(3w)", 1: "(5w)", 2: "(10w)"} // 买方研选价格
 	hasPermissions, e := company.GetCompanyContractPermissionByCompanyContractId(companyContractId)
 	if e != nil {
 		br.Msg = "获取失败"
@@ -534,7 +534,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 		}
 
 		mapPermissionNameHave[n.PermissionName] = true
-		// 买方研选(3w/5w)
+		// 买方研选(3w/5w/10w)
 		if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
 			expensiveYx = match.ExpensiveYx
 			n.PermissionName += expMap[match.ExpensiveYx]
@@ -734,10 +734,12 @@ func (this *ContractAllocationController) CompanyContracUpdate() {
 			continue
 		}
 
-		// 买方研选(3w/5w)
+		// 买方研选(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
 			}

models/cygx/activity_special_trip.go

@@ -143,7 +143,7 @@ type GetAppointmentSpecialListRsep struct {
 
 func GetCygxActivitySpecialTripList(activityId int, condition string) (item []*CygxActivitySpecialTripResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT s.*
+	sql := `SELECT s.*,
 					a.activity_time,
 					a.special_type
 			FROM

services/cygx/contract_allocation.go

@@ -266,6 +266,8 @@ func HandleAllocationCompanyContractByYanXuan(companyContractId int) (err error)
 		}
 		if v.ExpensiveYx == 1 {
 			expensiveYxmoney = 5
+		} else if v.ExpensiveYx == 2 {
+			expensiveYxmoney = 10
 		} else {
 			expensiveYxmoney = 3
 		}