liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gazebo
2019-03-28 12:51:17 +08:00
parent bd93178f10
commit ad2182f914
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/defsch/defsch.go
View File

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