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

src/order/orderManageController.go

@@ -3004,6 +3004,9 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 		ProductType           int                      `form:"updateProductType"` // 更新时的类型 1=子账号 2补充包
 		BuySubject            string                   `form:"buySubject"`        //购买主体  1 个人， 2公司
 		BuyCount              int                      `form:"buyCount"`          //大会员、超级订阅购买数量
+		PaybackWorkDayNum     int                      `form:"paybackWorkDayNum"` // 回款所需工作日
+		PaybackExpectDate     string                   `form:"paybackExpectDate"` // 回款预计时间 例如"2024-03-15"
+		PaybackOpenServer     bool                     `form:"paybackOpenServer"` // 回款后开通服务
 		Contract_nature       int                      `form:"contract_nature"`
 	})
 	err := context.Form(param)
@@ -3140,6 +3143,9 @@ 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{}{
@@ -3181,6 +3187,10 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 				"signing_subject":      param.PaybackCompany,
 				"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,
 			}
 		}
 

src/order/orderManageService.go

@@ -4240,6 +4240,9 @@ func UpdateNewBigOrder(oldFilter string, subStatus, dateType int, now, startdate
 		"saleDep":            param.SaleDep,
 		"saleMoney":          param.SaleMoney,
 		"contract_nature":    param.Contract_nature,
+		"paybackWorkDayNum":  param.PaybackWorkDayNum,
+		"paybackExpectDate":  param.PaybackExpectDate,
+		"paybackOpenServer":  param.PaybackOpenServer,
 	}
 	if param.BuySubject == "2" {
 		paramOrder["buySubject"] = 2

src/order/orderService.go

@@ -377,6 +377,9 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 			"saleDep":            param.SaleDep,
 			"contract_nature":    param.Contract_nature,
 			"saleMoney":          param.SaleMoney,
+			"paybackWorkDayNum":  param.PaybackWorkDayNum,
+			"paybackExpectDate":  param.PaybackExpectDate,
+			"paybackOpenServer":  param.PaybackOpenServer,
 		}
 		code := util.JyOrder("/UpdateOrder", paramOrder)
 		log.Println("大会员修改订单", userId, code)

src/order/suppleSalePerson.go

@@ -365,7 +365,7 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 	}
 	//查询订单
 	order := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "id,audit_status,order_status,buy_subject,sale_time,user_phone,company_name,product_type,vip_type,vip_endtime,vip_starttime,filter", "")
-	if order != nil && len(*order) > 0 {
+	if order != nil && len(*order) == 0 {
 		return nil, errors.New("没有查询到订单信息")
 	}
 	oldState := cm.IntAll((*order)["audit_status"])