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

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-17 09:29:46 +08:00
parent dbdf04d83c 0b923640b7
commit 6199a2e714
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/partner/purchase/ebai/waybill.go
View File

@@ -11,14 +11,14 @@ import (
var ( var (
VendorWaybillStatus2StatusMap = map[string]int{ VendorWaybillStatus2StatusMap = map[string]int{
ebaiapi.WaybillStatusNew: model.WaybillStatusUnknown, ebaiapi.WaybillStatusNew: model.WaybillStatusUnknown,
ebaiapi.WaybillStatusRequestDelivery: model.WaybillStatusUnknown, ebaiapi.WaybillStatusRequestDelivery: model.WaybillStatusUnknown,
ebaiapi.WaybillStatusWait4Courier: model.WaybillStatusNew, ebaiapi.WaybillStatusWait4Courier: model.WaybillStatusNew,
ebaiapi.WaybillStatusCourierAccepted: model.WaybillStatusAccepted, ebaiapi.WaybillStatusCourierAccepted: model.WaybillStatusAccepted,
ebaiapi.WaybillStatusCourierPickedup: model.WaybillStatusDelivering, ebaiapi.WaybillStatusCourierPickedup: model.WaybillStatusDelivering,
ebaiapi.WaybillStatusDeliveryCancled: model.WaybillStatusCanceled, ebaiapi.WaybillStatusDeliveryCancled: model.WaybillStatusCanceled,
ebaiapi.WaybillStatusFinished: model.WaybillStatusDelivered, ebaiapi.WaybillStatusFinished: model.WaybillStatusDelivered,
ebaiapi.WaybillStatusExceptional: model.WaybillStatusCanceled, // ebaiapi.WaybillStatusExceptional: model.WaybillStatusCanceled, // 饿百的配送异常不应该当成取消来处理，比如：1568651453228834871
ebaiapi.WaybillStatusSelfDelivery: model.WaybillStatusUnknown, ebaiapi.WaybillStatusSelfDelivery: model.WaybillStatusUnknown,
ebaiapi.WaybillStatusDontDeliver: model.WaybillStatusCanceled, ebaiapi.WaybillStatusDontDeliver: model.WaybillStatusCanceled,
ebaiapi.WaybillStatusDeliveryRejected: model.WaybillStatusCanceled, ebaiapi.WaybillStatusDeliveryRejected: model.WaybillStatusCanceled,