From 63e7c858feeff5302f67b0b9e24b651f390a1c40 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 25 Oct 2018 19:01:41 +0800
Subject: [PATCH] - auto max StockQty when isSale true.

---
 business/model/model.go                   |  2 ++
 business/partner/purchase/jd/store_sku.go | 29 +++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/business/model/model.go b/business/model/model.go
index 8eb7d6731..bb09b11b8 100644
--- a/business/model/model.go
+++ b/business/model/model.go
@@ -31,6 +31,8 @@ const (
 
 	FieldSkuID = "SkuID"
 	FieldLevel = "Level"
+
+	FieldEnabled = "Enabled"
 )
 
 type ModelIDCUL struct {
diff --git a/business/partner/purchase/jd/store_sku.go b/business/partner/purchase/jd/store_sku.go
index 7b067c992..7a50bcd76 100644
--- a/business/partner/purchase/jd/store_sku.go
+++ b/business/partner/purchase/jd/store_sku.go
@@ -63,7 +63,20 @@ func (p *PurchaseHandler) SyncStoresSkus(ctx *jxcontext.Context, parentTask task
 
 				for _, v := range batchItemList {
 					storeSku := v.(*tStoreSkuBindExt)
+					alreadyAddStock := false
 					if storeSku.JdSyncStatus&model.SyncFlagChangedMask != 0 {
+						if storeSku.JdSyncStatus&(model.SyncFlagDeletedMask|model.SyncFlagNewMask) != 0 { // 关注或取消关注
+							stock := &jdapi.SkuStock{
+								OutSkuId: utils.Int2Str(storeSku.SkuID),
+								StockQty: MaxStockQty,
+							}
+							if storeSku.DeletedAt != utils.DefaultTimeValue {
+								stock.StockQty = 0
+							} else {
+								alreadyAddStock = true
+							}
+							skuStockList = append(skuStockList, stock)
+						}
 						if storeSku.JdSyncStatus&(model.SyncFlagPriceMask|model.SyncFlagNewMask) != 0 {
 							skuPriceInfoList = append(skuPriceInfoList, &jdapi.SkuPriceInfo{
 								OutSkuId: utils.Int2Str(storeSku.SkuID),
@@ -77,19 +90,15 @@ func (p *PurchaseHandler) SyncStoresSkus(ctx *jxcontext.Context, parentTask task
 							}
 							if storeSku.Status != model.StoreSkuBindStatusNormal {
 								vendibility.DoSale = false
+							} else if !alreadyAddStock { // 如果是设置可售则自动将库存加满
+								stock := &jdapi.SkuStock{
+									OutSkuId: utils.Int2Str(storeSku.SkuID),
+									StockQty: MaxStockQty,
+								}
+								skuStockList = append(skuStockList, stock)
 							}
 							skuVendibilityList = append(skuVendibilityList, vendibility)
 						}
-						if storeSku.JdSyncStatus&(model.SyncFlagDeletedMask|model.SyncFlagNewMask) != 0 { // 关注或取消关注
-							stock := &jdapi.SkuStock{
-								OutSkuId: utils.Int2Str(storeSku.SkuID),
-								StockQty: MaxStockQty,
-							}
-							if storeSku.DeletedAt != utils.DefaultTimeValue {
-								stock.StockQty = 0
-							}
-							skuStockList = append(skuStockList, stock)
-						}
 					}
 				}
 				if globals.EnableStoreWrite {