From ae9aa8bef2b75cd48259e13f43a905505ca1cacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 5 Aug 2020 15:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index bd86fc91a..383e76223 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -195,6 +195,11 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
 					}
 				}
 			}
+		} else if orderStatus.Status == model.OrderStatusCanceled {
+			//如果取消订单则要把库存加回去
+			if order, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == nil {
+				ModifyOrderSkusStock(db, order, true)
+			}
 		}
 		if !isDuplicated {
 			if order != nil {
@@ -313,7 +318,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
 		}
 		//修改商品库存
 		if err == nil {
-			err = modifyOrderSkusStock(db, order, false)
+			err = ModifyOrderSkusStock(db, order, false)
 		}
 	} else {
 		globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
@@ -324,7 +329,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
 	return isDuplicated, err
 }
 
-func modifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (err error) {
+func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (err error) {
 	skus := order.Skus
 	for _, sku := range skus {
 		storeSkus, _ := dao.GetStoresSkusInfo(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, []int{sku.SkuID})