diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 941a36a60..f02871d8f 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -32,6 +32,12 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) { jxutils.CallMsgHandler(func() { SaveJdsOrders(msg) }, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop)) + case jcqapi.TopicOrderCancel: + jxutils.CallMsgHandler(func() { + CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, &model.GoodsOrder{ + VendorOrderID: msg.OrderID, + }, "系统取消") + }, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop)) default: return fmt.Errorf("暂不支持的topic类型!topic: %v", msgType) } diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index c571764b6..46d71e0d8 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -41,15 +41,17 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order * return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err } func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) { - orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{ - OrderID: vendorOrderID, - Current: 1, - PageSize: 1, - }) - if err != nil { - return 0, err - } - return status2Jxstatus(orderResult.OrderList[0].OrderStatus), err + // orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{ + // OrderID: vendorOrderID, + // Current: 1, + // PageSize: 1, + // }) + // if err != nil { + // return 0, err + // } + // return status2Jxstatus(orderResult.OrderList[0].OrderStatus), err + order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJDShop) + return order.Status, err } func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {