- 重构创建运单策略
This commit is contained in:
@@ -3,6 +3,8 @@ package defsch
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"git.rosy.net.cn/jx-callback/business/partner/delivery"
|
||||
|
||||
"git.rosy.net.cn/baseapi/utils"
|
||||
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
|
||||
"git.rosy.net.cn/jx-callback/business/jxutils"
|
||||
@@ -75,11 +77,9 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
|
||||
order := savedOrderInfo.order
|
||||
if forceCreate || (order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) {
|
||||
if forceCreate || !s.IsOrderHasWaybill(order) {
|
||||
var feeHandler func(deliveryFee, addFee int64) (err error)
|
||||
feeHandler := delivery.DefCreateWaybillPolicy
|
||||
if forceCreate {
|
||||
feeHandler = func(deliveryFee, addFee int64) (err error) {
|
||||
return nil
|
||||
}
|
||||
feeHandler = nil
|
||||
}
|
||||
if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, feeHandler); err == nil {
|
||||
if forceCreate {
|
||||
|
||||
Reference in New Issue
Block a user