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-07-30 14:53:49 +08:00
parent 9fb4e8899f
commit 1d03fb5b80
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/jdshop/callback.go
View File

@@ -32,6 +32,12 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
SaveJdsOrders(msg) SaveJdsOrders(msg)
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop)) }, 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: default:
return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType) return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType)
} }

20
business/partner/purchase/jdshop/order.go
View File

@@ -41,15 +41,17 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order *
return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
} }
func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) { func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{ // orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
OrderID: vendorOrderID, // OrderID: vendorOrderID,
Current: 1, // Current: 1,
PageSize: 1, // PageSize: 1,
}) // })
if err != nil { // if err != nil {
return 0, err // return 0, err
} // }
return status2Jxstatus(orderResult.OrderList[0].OrderStatus), 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) { func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {