From a42f4503685a3e3d3a8d3b8a036f2f05a3ffbb70 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 17 Sep 2018 11:01:10 +0800
Subject: [PATCH] - use DeletedAt to judge whether store sku is focused.

---
 business/jxstore/cms/store_sku.go         |  4 ++++
 business/partner/purchase/jd/store_sku.go |  2 +-
 conf/app.conf                             | 24 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 8b03dd1e3..54a13e815 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -226,6 +226,7 @@ func UpdateStoreSku(storeID int, skuBinds []*StoreSkuBindInfo, userName string)
 				}
 				if ok {
 					if v.IsFocus == -1 {
+						num++
 						_, err = dao.DeleteEntityLogically(db, skuBind, nil, userName, map[string]interface{}{
 							model.FieldStatus:         model.StoreSkuBindStatusDeleted,
 							model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
@@ -237,6 +238,7 @@ func UpdateStoreSku(storeID int, skuBinds []*StoreSkuBindInfo, userName string)
 						if v.IsFocus == 1 {
 							skuBind.DeletedAt = utils.DefaultTimeValue
 						}
+						num++
 						skuBind.JdSyncStatus |= model.SyncFlagModifiedMask
 						skuBind.ElmSyncStatus |= model.SyncFlagModifiedMask
 						skuBind.EbaiSyncStatus |= model.SyncFlagModifiedMask
@@ -249,6 +251,7 @@ func UpdateStoreSku(storeID int, skuBinds []*StoreSkuBindInfo, userName string)
 					if v.ElmID != 0 {
 						skuBind.ElmID = v.ElmID
 					}
+					num++
 					skuBind.JdSyncStatus = model.SyncFlagNewMask
 					skuBind.ElmSyncStatus = model.SyncFlagNewMask
 					skuBind.EbaiSyncStatus = model.SyncFlagNewMask
@@ -256,6 +259,7 @@ func UpdateStoreSku(storeID int, skuBinds []*StoreSkuBindInfo, userName string)
 				}
 			}
 			if err != nil {
+				num = 0
 				dao.Rollback(db)
 				return num, err
 			}
diff --git a/business/partner/purchase/jd/store_sku.go b/business/partner/purchase/jd/store_sku.go
index be2194cbe..ad9c04f7a 100644
--- a/business/partner/purchase/jd/store_sku.go
+++ b/business/partner/purchase/jd/store_sku.go
@@ -58,7 +58,7 @@ func (p *PurchaseHandler) SyncStoreSku(storeID int, skuIDs []int, isForce bool,
 							OutSkuId: utils.Int2Str(storeSku.SkuID),
 							StockQty: 9999,
 						}
-						if storeSku.Status == model.StoreSkuBindStatusDeleted {
+						if storeSku.DeletedAt != utils.DefaultTimeValue {
 							stock.StockQty = 0
 						}
 					}
diff --git a/conf/app.conf b/conf/app.conf
index fb5024a22..cedecb60e 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -98,3 +98,27 @@ weixinAppID  = "wx2bb99eb5d2c9b82c"
 weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
 
 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
+
+[alpha]
+freshFoodServerURL = "http://portal.alpha.jxc4.com"
+
+jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
+jdAppKey = "06692746f7224695ad4788ce340bc854"
+jdSecret = "d6b42a35a7414a5490d811654d745c84"
+
+elmIsProd = false
+elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
+elmAppKey = "RwT214gAsS"
+elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
+
+mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
+mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
+
+dadaIsProd      = false
+dadaCallbackURL = "http://callback.alpha.jxc4.com/dadadelivery/msg"
+dadaSourceID    = "73753"
+
+weixinAppID  = "wxbf235770edaabc5c"
+weixinSecret = "ba32b269a068a5b72486a0beafd171e8"
+
+dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxstore_alpha?charset=utf8mb4&loc=Local&parseTime=true"
\ No newline at end of file