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

修复订单调度定时器的BUG

Browse Source 
PickupGoods失败后判断订单状态如果是已经大于拣货完成，则忽略错误
This commit is contained in:
gazebo
2019-12-19 12:07:15 +08:00
parent 1f1036b503
commit 9498542e59
11 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/partner/purchase/jd/order.go
View File

@@ -27,8 +27,8 @@ var (
jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
jdapi.OrderStatusDelivering: model.OrderStatusDelivering,
jdapi.OrderStatusDelivered: model.OrderStatusFinished,
// jdapi.OrderStatusFinished: model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思
jdapi.OrderStatusCanceled: model.OrderStatusCanceled,
jdapi.OrderStatusFinished: model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思?
jdapi.OrderStatusCanceled: model.OrderStatusCanceled,
jdapi.OrderStatusAdjust: model.OrderStatusAdjust,
jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel,
@@ -147,6 +147,14 @@ func (c *PurchaseHandler) GetOrder(vendorOrgCode, orderID string) (order *model.
return order, err
}
func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
order, err := getAPI(vendorOrgCode).QuerySingleOrder2(vendorOrderID)
if err == nil {
status = p.getStatusFromVendorStatus(utils.Int2Str(order.OrderStatus))
}
return status, err
}
func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
result := orderData
orderID := utils.Int64ToStr(utils.MustInterface2Int64(result["orderId"]))