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

- 饿百订单的调整单特殊处理，因为必须要确认订单后能才调整

Browse Source
This commit is contained in:
gazebo
2019-04-29 17:35:36 +08:00
parent 7de70c63ea
commit 16d738cca1
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,9 +379,10 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
if order.LockStatus != model.OrderStatusUnknown { if order.LockStatus != model.OrderStatusUnknown {
globals.SugarLogger.Warnf("addOrderStatus refOrderID:%s, orderID:%s, order.LockStatus:%d, status.LockStatus:%d", orderStatus.RefVendorOrderID, orderStatus.VendorOrderID, order.LockStatus, orderStatus.Status) globals.SugarLogger.Warnf("addOrderStatus refOrderID:%s, orderID:%s, order.LockStatus:%d, status.LockStatus:%d", orderStatus.RefVendorOrderID, orderStatus.VendorOrderID, order.LockStatus, orderStatus.Status)
} }
order.Flag &= ^int8(model.OrderFlagMaskUserApplyCancel)
order.LockStatus = orderStatus.Status order.LockStatus = orderStatus.Status
order.LockStatusTime = orderStatus.StatusTime order.LockStatusTime = orderStatus.StatusTime
updateFields = append(updateFields, "LockStatus", "LockStatusTime") updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag")
} }
} }
if model.IsOrderFinalStatus(orderStatus.Status) { if model.IsOrderFinalStatus(orderStatus.Status) {

22
business/partner/purchase/ebai/order.go
View File

@@ -401,15 +401,21 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
} }
func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) { func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
var skuList []*ebaiapi.RefundSku // 饿百必须要确认订单后才能调整单
for _, sku := range removedSkuList { if order.Status < model.OrderStatusFinished {
skuList = append(skuList, &ebaiapi.RefundSku{ err = c.PickupGoods(order, false, ctx.GetUserName())
CustomeSkuID: utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku)),
Number: utils.Int2Str(sku.Count),
})
} }
if globals.EnableEbaiStoreWrite { if err == nil {
err = api.EbaiAPI.OrderPartRefund(order.VendorOrderID, skuList) var skuList []*ebaiapi.RefundSku
for _, sku := range removedSkuList {
skuList = append(skuList, &ebaiapi.RefundSku{
CustomeSkuID: utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku)),
Number: utils.Int2Str(sku.Count),
})
}
if globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderPartRefund(order.VendorOrderID, skuList)
}
} }
return err return err
} }