From 16b9d5182aa45cab116aa34cf5da5dbdad388459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 6 Aug 2020 10:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E8=AE=BE=E7=BD=AE=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=8F=AF=E5=94=AE=E8=AE=BE=E7=BD=AE=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 33 ++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index cbbd1fdb9..b51631a48 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1161,11 +1161,23 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									skuBind.JxPrice = jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), skuBind.Price)
 									if tmpStatus := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA {
 										skuBind.Status = tmpStatus
-										//关注设置默认库存
-										if tmpStatus == model.StoreSkuBindStatusNormal {
-											skuBind.Stock = model.MaxStoreSkuStockQty
+										if inSkuBind != nil {
+											if inSkuBind.Stock != nil {
+												skuBind.Stock = *inSkuBind.Stock
+											} else {
+												goto setStock
+											}
 										} else {
-											skuBind.Stock = 0
+											goto setStock
+										}
+									setStock:
+										{
+											//关注设置默认库存
+											if tmpStatus == model.StoreSkuBindStatusNormal {
+												skuBind.Stock = model.MaxStoreSkuStockQty
+											} else {
+												skuBind.Stock = 0
+											}
 										}
 									}
 									if globals.IsAddEvent {
@@ -1254,14 +1266,11 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									}
 									skuBind.Status = tmpStatus
 									setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask)
-									setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
-									// if inSkuBind.Stock == nil {
-									if tmpStatus == model.StoreSkuBindStatusNormal {
-										skuBind.Stock = model.MaxStoreSkuStockQty
-									} else {
-										skuBind.Stock = 0
-									}
-
+									// setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
+									// if tmpStatus == model.StoreSkuBindStatusNormal {
+									// 	skuBind.Stock = model.MaxStoreSkuStockQty
+									// } else {
+									// 	skuBind.Stock = 0
 									// }
 								}
 								if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制