Browse Source

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

renjiaojiao 1 year ago
parent
commit
01573ea165
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/order/orderManageService.go
  2. 1 1
      src/order/otherOrderController.go

+ 1 - 1
src/order/orderManageService.go

@@ -88,7 +88,7 @@ func createBigOrderCheck(param Params) error {
 
 	}
 
-	if param.PaybackExpectDate == "" {
+	if param.PaybackExpectDate == "" && param.PaybackNum == "1" {
 		return errors.New("缺少回款预计时间字段")
 	}
 	return nil

+ 1 - 1
src/order/otherOrderController.go

@@ -186,7 +186,7 @@ func CreateOtherOrder(context *admin.Context) (interface{}, error) {
 	if param.BuySubject == "" {
 		return nil, errors.New("缺少购买主体")
 	}
-	if param.PaybackExpectDate == "" {
+	if param.PaybackExpectDate == "" && param.PaybackNum == "1" {
 		return nil, errors.New("缺少回款预计时间字段")
 	}
 	if param.BuySubject == "2" {