Merge branch 'dev/v2.4.31_dx' of jianyu/qmx_admin into feature/v2.4.31

src/order/orderManageService.go

@@ -337,7 +337,7 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 	}
 
 	//条件 升级/续费订单用户另算		有newbuyset的 都是升级续费逻辑重写后的订单 没有的是老订单
-	subscription_area, industry_str, subscription_cycle, effective_date, areaCount := "", "", "", "", 0
+	subscription_area, industry_str, subscription_cycle, effective_date := "", "", "", ""
 	province_count, city_count := 0, 0
 	filterData := (*res)["filter"]
 	if err := json.Unmarshal([]byte(filterData.(string)), &filterMap); err == nil {
@@ -360,13 +360,6 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 				}
 			}
 		} else {
-			newArea := qutil.InterfaceToStr(filterMap["newArea"])
-			if newArea != "全国" && newArea != "" {
-				areaCount = len(strings.Split(newArea, ","))
-			} else if newArea != "" {
-				oldArea := qutil.InterfaceToStr(filterMap["oldArea"])
-				areaCount = 16 - len(strings.Split(oldArea, ","))
-			}
 
 			//升级
 			if newBuyset != nil {
@@ -437,7 +430,6 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 			}
 		}
 		(filterMap)["subscription_area"] = subscription_area
-		(filterMap)["subscription_area_count"] = areaCount
 		(filterMap)["industry_str"] = industry_str
 		//--------------------------
 		// 订阅周期 有效日期

src/order/orderManageStruct.go

@@ -13,25 +13,24 @@ type Model struct {
 
 // 订单简单信息
 type VipSimpleMsg struct {
-	Area              *map[string]interface{}  `json:"area"`              //选择地区
-	Industry          []string                 `json:"industry"`          //选择行业
-	Cyclecount        int                      `json:"cyclecount"`        //日期数量(订单详情展示使用)
-	Cycleunit         int                      `json:"cycleunit"`         //日期单位(订单详情展示使用)
-	Buyset            *SubvipBuySet            `json:"buyset"`            //旧购买详情
-	NewBuyset         *SubvipBuySet            `json:"newBuyset"`         //新购买详情
-	UpgradeSubtotail  []map[string]interface{} `json:"upgradeSubtotail"`  //升级清单(订单详情计价清单展示使用)
-	OrderType         int                      `json:"ordertype"`         //1,3,5   类型 1:订单 2:续费 3:立即升级 4:下月升级 5:即将到期（可升降级续费）6:升级订单未生效再次升级
-	DisWord           string                   `json:"disWord"`           //分销系统 口令
-	ContractStatus    int                      `json:"contractStatus"`    //合同状态
-	Source            string                   `json:"source"`            //
-	Badge             string                   `json:"badge"`             //
-	Remark            string                   `json:"remark"`            //备注字段
-	AuditType         string                   `json:"audit_Type"`        // 审核类型
-	NewArea           string                   `json:"newArea"`           //vip订阅升级省份
-	OldArea           string                   `json:"oldArea"`           //vip订阅升级省份
-	PaybackWorkDayNum int                      `json:"paybackWorkDayNum"` // 回款所需工作日
-	PaybackExpectDate string                   `json:"paybackExpectDate"` // 回款预计时间
-	PaybackOpenServer bool                     `json:"paybackOpenServer"` // 回款后开通服务
+	Area                  *map[string]interface{}  `json:"area"`                    //选择地区
+	Industry              []string                 `json:"industry"`                //选择行业
+	Cyclecount            int                      `json:"cyclecount"`              //日期数量(订单详情展示使用)
+	Cycleunit             int                      `json:"cycleunit"`               //日期单位(订单详情展示使用)
+	Buyset                *SubvipBuySet            `json:"buyset"`                  //旧购买详情
+	NewBuyset             *SubvipBuySet            `json:"newBuyset"`               //新购买详情
+	SubscriptionAreaCount int                      `json:"subscription_area_count"` //新购买详情
+	UpgradeSubtotail      []map[string]interface{} `json:"upgradeSubtotail"`        //升级清单(订单详情计价清单展示使用)
+	OrderType             int                      `json:"ordertype"`               //1,3,5   类型 1:订单 2:续费 3:立即升级 4:下月升级 5:即将到期（可升降级续费）6:升级订单未生效再次升级
+	DisWord               string                   `json:"disWord"`                 //分销系统 口令
+	ContractStatus        int                      `json:"contractStatus"`          //合同状态
+	Source                string                   `json:"source"`                  //
+	Badge                 string                   `json:"badge"`                   //
+	Remark                string                   `json:"remark"`                  //备注字段
+	AuditType             string                   `json:"audit_Type"`              // 审核类型
+	PaybackWorkDayNum     int                      `from:"paybackWorkDayNum"`       // 回款所需工作日
+	PaybackExpectDate     string                   `from:"paybackExpectDate"`       // 回款预计时间
+	PaybackOpenServer     bool                     `from:"paybackOpenServer"`       // 回款后开通服务
 }
 
 // 购买内容

src/order/orderService.go

@@ -138,7 +138,6 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 		ContractStatus: contractStatus,
 		Source:         "qmx",
 		Remark:         param.Remark,
-		NewArea:        param.NewArea,
 	}
 	if param.Badge != "" {
 		vms.Badge = param.Badge
@@ -166,17 +165,10 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 			// 超级订阅续费
 			vms.NewBuyset.AreaCount = areaCount
 		case 2:
-			if param.NewArea == "全国" {
-				//获取之前生效的省份
-				if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-					oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-					var old_area []string
-					for a := range *oArea {
-						old_area = append(old_area, a)
-					}
-					vms.OldArea = strings.Join(old_area, ",")
-				}
-			}
+			newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+			newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+			buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+			vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 		}
 
 	} else {
@@ -201,17 +193,10 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 				// 超级订阅续费
 				vms.NewBuyset.AreaCount = areaCount
 			case 2:
-				if param.NewArea == "全国" {
-					//获取之前生效的省份
-					if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-						oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-						var old_area []string
-						for a := range *oArea {
-							old_area = append(old_area, a)
-						}
-						vms.OldArea = strings.Join(old_area, ",")
-					}
-				}
+				newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+				newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+				buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+				vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 			}
 		}
 	}

src/order/otherOrderController.go

@@ -103,10 +103,9 @@ type CreateOtherOrderParams struct {
 	Contract_userB_contacts_name    string `form:"e_contract_userB_contacts_name"`    // 协议乙方联系人
 	Contract_remark                 string `form:"e_contract_remark"`                 // 协议备注
 	Contract_nature                 int    `form:"contract_nature"`                   //合同性质   1新增合同  2 续签合同
-	PaybackWorkDayNum               int    `form:"paybackWorkDayNum"`                 // 回款所需工作日
-	PaybackExpectDate               string `form:"paybackExpectDate"`                 // 回款预计时间 例如"2024-03-15"
-	PaybackOpenServer               bool   `form:"paybackOpenServer"`                 // 回款后开通服务
-	NewArea                         string `form:"newArea"`                           //vip订阅升级本次够没省份
+	PaybackWorkDayNum               int    `from:"paybackWorkDayNum"`                 // 回款所需工作日
+	PaybackExpectDate               string `from:"paybackExpectDate"`                 // 回款预计时间 例如"2024-03-15"
+	PaybackOpenServer               bool   `from:"paybackOpenServer"`                 // 回款后开通服务
 }
 
 type UpdateReturnParams struct {

src/order/otherOrderService.go

@@ -725,7 +725,6 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 		ContractStatus:    contractStatus,
 		Source:            "qmx",
 		Remark:            param.Remark,
-		NewArea:           param.NewArea,
 		PaybackWorkDayNum: param.PaybackWorkDayNum,
 		PaybackExpectDate: param.PaybackExpectDate,
 		PaybackOpenServer: param.PaybackOpenServer,
@@ -760,17 +759,10 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			// 超级订阅续费
 			vms.NewBuyset.AreaCount = areaCount
 		case 2:
-			if param.NewArea == "全国" {
-				//获取之前生效的省份
-				if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-					oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-					var old_area []string
-					for a := range *oArea {
-						old_area = append(old_area, a)
-					}
-					vms.OldArea = strings.Join(old_area, ",")
-				}
-			}
+			newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+			newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+			buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+			vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 		}
 	} else {
 		userDatas := &map[string]interface{}{}
@@ -794,17 +786,10 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 				// 超级订阅续费
 				vms.NewBuyset.AreaCount = areaCount
 			case 2:
-				if param.NewArea == "全国" {
-					//获取之前生效的省份
-					if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-						oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-						var old_area []string
-						for a := range *oArea {
-							old_area = append(old_area, a)
-						}
-						vms.OldArea = strings.Join(old_area, ",")
-					}
-				}
+				newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+				newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+				buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+				vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 			}
 		} else {
 			if param.VipType == 0 {
@@ -1177,7 +1162,6 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 		ContractStatus:    contractStatus,
 		Source:            "qmx",
 		Remark:            param.Remark,
-		NewArea:           param.NewArea,
 		PaybackWorkDayNum: param.PaybackWorkDayNum,
 		PaybackExpectDate: param.PaybackExpectDate,
 		PaybackOpenServer: param.PaybackOpenServer,
@@ -1209,17 +1193,10 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 			// 超级订阅续费
 			vms.NewBuyset.AreaCount = areaCount
 		case 2:
-			if param.NewArea == "全国" {
-				//获取之前生效的省份
-				if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-					oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-					var old_area []string
-					for a := range *oArea {
-						old_area = append(old_area, a)
-					}
-					vms.OldArea = strings.Join(old_area, ",")
-				}
-			}
+			newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+			newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+			buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+			vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 		}
 
 	} else {
@@ -1244,17 +1221,10 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 				// 超级订阅续费
 				vms.NewBuyset.AreaCount = areaCount
 			case 2:
-				if param.NewArea == "全国" {
-					//获取之前生效的省份
-					if vipJyInfo := qutil.ObjToMap((*userData)["o_vipjy"]); vipJyInfo != nil {
-						oArea := qutil.ObjToMap((*vipJyInfo)["o_area"])
-						var old_area []string
-						for a := range *oArea {
-							old_area = append(old_area, a)
-						}
-						vms.OldArea = strings.Join(old_area, ",")
-					}
-				}
+				newCount := qutil.If(areaCount == -1, 16, areaCount).(int)
+				newVipInfo := qutil.ObjToMap((*userData)["o_vipjy"])
+				buySet := qutil.ObjToMap((*newVipInfo)["o_buyset"])
+				vms.SubscriptionAreaCount = newCount - qutil.IntAll((*buySet)["areacount"])
 			}
 		}
 	}