From 9912f96c7b7d35c866fb00f41afde09e91e35a49 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sat, 1 Aug 2020 10:05:32 +0800
Subject: [PATCH] =?UTF-8?q?jds=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 0ae0945c2..b7b7c2bfe 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
 	}
 
 	//结算类型