diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 5d4ba5bb5..d216d59a6 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -36,7 +36,9 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) { utils.CallFuncAsync(func() { order := getRealOrderID(msg.OrderID) if order != nil { - CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, order, "系统取消") + if order.Status != model.OrderStatusCanceled { + CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, order, "系统取消") + } } }) default: @@ -123,6 +125,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err order.BusinessType = model.BusinessTypeImmediate } else { globals.SugarLogger.Warnf("暂不支持的京东商城订单类型!type: %v", msg.OrderState) + return nil, err } //结算类型