Merge branch 'feature/v2.4.31' into dev/v2.4.31_rjj

src/order/orderManageController.go

@@ -3101,15 +3101,18 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 		var paramOrder = map[string]interface{}{}
 		if param.ProductType == util.UpdateSupply {
 			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, "人工审核") {
@@ -3143,9 +3146,6 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 				"last_update_time":     qutil.NowFormat(qutil.Date_Full_Layout),
 				"contract_nature":      param.Contract_nature,
 				"buy_count":            param.BuyCount,
-				"paybackWorkDayNum":    param.PaybackWorkDayNum,
-				"paybackExpectDate":    param.PaybackExpectDate,
-				"paybackOpenServer":    param.PaybackOpenServer,
 			}
 		} else {
 			filter_map := map[string]interface{}{
@@ -3154,11 +3154,14 @@ func MyUpdateSupplySubOrder(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,
+				"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, "人工审核") {
@@ -3188,9 +3191,6 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 				"last_update_person":   param.CreatePerson,
 				"last_update_time":     qutil.NowFormat(qutil.Date_Full_Layout),
 				"buy_count":            param.BuyCount,
-				"paybackWorkDayNum":    param.PaybackWorkDayNum,
-				"paybackExpectDate":    param.PaybackExpectDate,
-				"paybackOpenServer":    param.PaybackOpenServer,
 			}
 		}