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

京西商城订单测试

Browse Source
This commit is contained in:
苏尹岚
2020-06-18 15:33:30 +08:00
parent 217d32d8cb
commit e32429ac98
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/order.go
View File

@@ -1160,7 +1160,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
if err != nil || order == nil { if err != nil || order == nil {
return "", fmt.Errorf("未查询到该订单！订单号：[%v]", vendorOrderID) return "", fmt.Errorf("未查询到该订单！订单号：[%v]", vendorOrderID)
} }
if order.Status >= model.OrderStatusDelivering { if order.Status >= model.OrderStatusDelivering && order.Status != model.OrderStatusCanceled {
return "", fmt.Errorf("暂不支持此状态的订单进行转移！") return "", fmt.Errorf("暂不支持此状态的订单进行转移！")
} }
if order.VendorID != model.VendorIDJDShop { if order.VendorID != model.VendorIDJDShop {
@@ -1290,6 +1290,8 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
if err != nil { if err != nil {
return err return err
} }
order.EclpOutID = eclpSoNo
dao.UpdateEntity(db, order, "EclpOutID")
vendorWaybillID = eclpSoNo vendorWaybillID = eclpSoNo
} else { } else {
handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL] handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]