- 在mergeOrderStatusConfig要判断订单是否是真实订单

2019-03-28 12:51:17 +08:00
parent bd93178f10
commit ad2182f914
1 changed files with 27 additions and 25 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -810,6 +810,7 @@ func (s *DefScheduler) mergeOrderStatusConfig(order *model.GoodsOrder, statusTyp
 	retVal = &StatusActionConfig{}
 	*retVal = *defConfig

+	if model.IsOrderSolid(order) {
 		var vendorActionParams *partner.StatusActionParams
 		if order.BusinessType != model.BusinessTypeImmediate {
 			if jxutils.IsTimeEmpty(order.ExpectedDeliveredTime) {
@@ -840,6 +841,7 @@ func (s *DefScheduler) mergeOrderStatusConfig(order *model.GoodsOrder, statusTyp
 				retVal.TimerType = vendorActionParams.TimerType
 			}
 		}
+	}
 	return retVal
 }