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

src/order/orderManageController.go

@@ -1948,7 +1948,10 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 		SaleDep               string `form:"saleDep"`
 		SaleMoney             string `form:"saleMoney"`
 		ContractNature        int    `form:"contract_nature"`
-		ContactOrderCode      string `form:"contactOrderCode"` //p504增加子账号关联订单
+		ContactOrderCode      string `form:"contactOrderCode"`  //p504增加子账号关联订单
+		PaybackWorkDayNum     int    `form:"paybackWorkDayNum"` // 回款所需工作日
+		PaybackExpectDate     string `form:"paybackExpectDate"` // 回款预计时间 例如"2024-03-15"
+		PaybackOpenServer     bool   `form:"paybackOpenServer"` // 回款后开通服务
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2049,16 +2052,19 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 			isAll = 1
 		}
 		filter_map := map[string]interface{}{
-			"source":           "qmx",
-			"level":            qutil.If(memberStatus > 0, memberStatus, -memberStatus),
-			"effective_date":   time.Unix(bigEnd, 0).Format("2006/01/02"),
-			"pay_sub_num":      param.BuyCount,
-			"isAll":            isAll,
-			"transferV":        param.PayV,
-			"transferVTime":    qutil.NowFormat(qutil.Date_Full_Layout),
-			"remark":           param.Remark,
-			"contractStatus":   contractStatus,
-			"contactOrderCode": param.ContactOrderCode,
+			"source":            "qmx",
+			"level":             qutil.If(memberStatus > 0, memberStatus, -memberStatus),
+			"effective_date":    time.Unix(bigEnd, 0).Format("2006/01/02"),
+			"pay_sub_num":       param.BuyCount,
+			"isAll":             isAll,
+			"transferV":         param.PayV,
+			"transferVTime":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"remark":            param.Remark,
+			"contractStatus":    contractStatus,
+			"contactOrderCode":  param.ContactOrderCode,
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 		// p238 判断是否是省份版  在子账号订单上加省份版
 		if areaCount, b := o_member_jy["i_areacount"]; b && qutil.IntAll(areaCount) > 0 {
@@ -2220,7 +2226,10 @@ func UpdateSubOrder(context *admin.Context) (interface{}, error) {
 		SaleDep               string `form:"saleDep"`
 		SaleMoney             string `form:"saleMoney"`
 		ContractNature        int    `form:"contract_nature"`
-		ContactOrderCode      string `form:"contactOrderCode"` //p504增加子账号关联订单
+		ContactOrderCode      string `form:"contactOrderCode"`  //p504增加子账号关联订单
+		PaybackWorkDayNum     int    `form:"paybackWorkDayNum"` // 回款所需工作日
+		PaybackExpectDate     string `form:"paybackExpectDate"` // 回款预计时间 例如"2024-03-15"
+		PaybackOpenServer     bool   `form:"paybackOpenServer"` // 回款后开通服务
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2327,12 +2336,15 @@ func UpdateSubOrder(context *admin.Context) (interface{}, error) {
 			"effective_date": time.Unix(bigEnd, 0).Format("2006/01/02"),
 			"pay_sub_num":    param.BuyCount,
 			//"free_sub_num":   param.FreeSub,
-			"isAll":            isAll,
-			"transferV":        param.PayV,
-			"transferVTime":    qutil.NowFormat(qutil.Date_Full_Layout),
-			"remark":           param.Remark,
-			"contractStatus":   contractStatus,
-			"contactOrderCode": param.ContactOrderCode,
+			"isAll":             isAll,
+			"transferV":         param.PayV,
+			"transferVTime":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"remark":            param.Remark,
+			"contractStatus":    contractStatus,
+			"contactOrderCode":  param.ContactOrderCode,
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 
 		// p238 判断是否是省份版  在子账号订单上加省份版
@@ -2456,6 +2468,9 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 		SaleDep               string                   `form:"saleDep"`
 		SaleMoney             string                   `form:"saleMoney"`
 		ContractNature        int                      `form:"contract_nature"`
+		PaybackWorkDayNum     int                      `form:"paybackWorkDayNum"` // 回款所需工作日
+		PaybackExpectDate     string                   `form:"paybackExpectDate"` // 回款预计时间 例如"2024-03-15"
+		PaybackOpenServer     bool                     `form:"paybackOpenServer"` // 回款后开通服务
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2541,16 +2556,19 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 			isAll = 1
 		}
 		filter_map := map[string]interface{}{
-			"source":         "qmx",
-			"supplys":        param.ServerArr,
-			"level":          qutil.If(memberStatus > 0, memberStatus, -memberStatus),
-			"effective_date": time.Unix(bigEnd, 0).Format("2006/01/02"),
-			"isAll":          isAll,
-			"transferV":      param.PayV,
-			"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-			"remark":         param.Remark,
-			"contractStatus": contractStatus,
-			"serverArr":      param.ServerArr,
+			"source":            "qmx",
+			"supplys":           param.ServerArr,
+			"level":             qutil.If(memberStatus > 0, memberStatus, -memberStatus),
+			"effective_date":    time.Unix(bigEnd, 0).Format("2006/01/02"),
+			"isAll":             isAll,
+			"transferV":         param.PayV,
+			"transferVTime":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"remark":            param.Remark,
+			"contractStatus":    contractStatus,
+			"serverArr":         param.ServerArr,
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 		filter, _ := json.Marshal(filter_map)
 		startdate := time.Unix(bigStart, 0)
@@ -2761,6 +2779,9 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 		SaleDep               string                   `form:"saleDep"`
 		SaleMoney             string                   `form:"saleMoney"`
 		ContractNature        int                      `form:"contract_nature"`
+		PaybackWorkDayNum     int                      `form:"paybackWorkDayNum"` // 回款所需工作日
+		PaybackExpectDate     string                   `form:"paybackExpectDate"` // 回款预计时间 例如"2024-03-15"
+		PaybackOpenServer     bool                     `form:"paybackOpenServer"` // 回款后开通服务
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2855,15 +2876,18 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 			isAll = 1
 		}
 		filter_map := map[string]interface{}{
-			"source":         "qmx",
-			"supplys":        param.ServerArr,
-			"level":          qutil.If(memberStatus > 0, memberStatus, -memberStatus),
-			"effective_date": time.Unix(bigEnd, 0).Format("2006/01/02"),
-			"isAll":          isAll,
-			"transferV":      param.PayV,
-			"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-			"remark":         param.Remark,
-			"contractStatus": contractStatus,
+			"source":            "qmx",
+			"supplys":           param.ServerArr,
+			"level":             qutil.If(memberStatus > 0, memberStatus, -memberStatus),
+			"effective_date":    time.Unix(bigEnd, 0).Format("2006/01/02"),
+			"isAll":             isAll,
+			"transferV":         param.PayV,
+			"transferVTime":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"remark":            param.Remark,
+			"contractStatus":    contractStatus,
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 		// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 		if strings.Contains(oldFilter, "人工审核") {

src/order/otherOrderService.go

@@ -72,11 +72,14 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 			log.Println(err)
 		}
 		filter_map = map[string]interface{}{
-			"pType":     packDetail.PackType,
-			"pNum":      packDetail.PackNum,
-			"validYear": packDetail.ValidYear,
-			"price":     packDetail.Price,
-			"badge":     "give",
+			"pType":             packDetail.PackType,
+			"pNum":              packDetail.PackNum,
+			"validYear":         packDetail.ValidYear,
+			"price":             packDetail.Price,
+			"badge":             "give",
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 		if param.OrderChannel == "d03" {
 			filter_map["badge"] = ""
@@ -359,10 +362,13 @@ func updateOtherOrder(oldFilter string, param *CreateOtherOrderParams, code stri
 		contractStatus = 0
 	}
 	var filterMap = map[string]interface{}{
-		"source":         "qmx",
-		"product":        param.Product,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
+		"source":            "qmx",
+		"product":           param.Product,
+		"remark":            param.Remark,
+		"contractStatus":    contractStatus,
+		"paybackWorkDayNum": param.PaybackWorkDayNum,
+		"paybackExpectDate": param.PaybackExpectDate,
+		"paybackOpenServer": param.PaybackOpenServer,
 	}
 	sMOpenid := ""
 	sNickname := ""
@@ -385,11 +391,14 @@ func updateOtherOrder(oldFilter string, param *CreateOtherOrderParams, code stri
 			log.Println(err)
 		}
 		filterMap = map[string]interface{}{
-			"pType":     packDetail.PackType,
-			"pNum":      packDetail.PackNum,
-			"validYear": packDetail.ValidYear,
-			"price":     packDetail.Price,
-			"badge":     "give",
+			"pType":             packDetail.PackType,
+			"pNum":              packDetail.PackNum,
+			"validYear":         packDetail.ValidYear,
+			"price":             packDetail.Price,
+			"badge":             "give",
+			"paybackWorkDayNum": param.PaybackWorkDayNum,
+			"paybackExpectDate": param.PaybackExpectDate,
+			"paybackOpenServer": param.PaybackOpenServer,
 		}
 		price = packDetail.Price
 		packNum = packDetail.PackNum
@@ -545,11 +554,14 @@ func updateEntnicheOrder(oldFilter string, param *CreateOtherOrderParams, code s
 		contractStatus = 0
 	}
 	filter_map := map[string]interface{}{
-		"source":         "qmx",
-		"product":        param.Product,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-		"personnum":      param.PersonNum,
+		"source":            "qmx",
+		"product":           param.Product,
+		"remark":            param.Remark,
+		"contractStatus":    contractStatus,
+		"personnum":         param.PersonNum,
+		"paybackWorkDayNum": param.PaybackWorkDayNum,
+		"paybackExpectDate": param.PaybackExpectDate,
+		"paybackOpenServer": param.PaybackOpenServer,
 	}
 	// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 	if strings.Contains(oldFilter, "人工审核") {
@@ -1155,17 +1167,20 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 		BuyerclassCount: -1,
 	}
 	vms := VipSimpleMsg{
-		Area:           &buyArea,
-		Industry:       []string{},
-		Cyclecount:     param.CycleCount,
-		Cycleunit:      param.CycleUnit,
-		NewBuyset:      &newBuySet,
-		OrderType:      1,
-		DisWord:        "",
-		ContractStatus: contractStatus,
-		Source:         "qmx",
-		Remark:         param.Remark,
-		NewArea:        param.NewArea,
+		Area:              &buyArea,
+		Industry:          []string{},
+		Cyclecount:        param.CycleCount,
+		Cycleunit:         param.CycleUnit,
+		NewBuyset:         &newBuySet,
+		OrderType:         1,
+		DisWord:           "",
+		ContractStatus:    contractStatus,
+		Source:            "qmx",
+		Remark:            param.Remark,
+		NewArea:           param.NewArea,
+		PaybackWorkDayNum: param.PaybackWorkDayNum,
+		PaybackExpectDate: param.PaybackExpectDate,
+		PaybackOpenServer: param.PaybackOpenServer,
 	}
 
 	if param.Badge != "" {