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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
苏尹岚
2020-08-03 09:01:04 +08:00
parent 6f44c537d6 9912f96c7b
commit fc4764c9d0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,10 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
order := getRealOrderID(msg.OrderID) order := getRealOrderID(msg.OrderID)
if order != nil { if order != nil {
if order.Status != model.OrderStatusCanceled {
CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, order, "系统取消") CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, order, "系统取消")
} }
}
}) })
default: default:
return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType) return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType)
@@ -123,6 +125,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
} else { } else {
globals.SugarLogger.Warnf("暂不支持的京东商城订单类型！type: %v", msg.OrderState) globals.SugarLogger.Warnf("暂不支持的京东商城订单类型！type: %v", msg.OrderState)
return nil, err
} }
//结算类型 //结算类型