From 96c6c52571a86876c1f19545a475b2e27117a293 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 6 Nov 2018 22:23:31 +0800
Subject: [PATCH] - fix bug in promotion.OnStoreStockMsg

---
 business/jxstore/promotion/jd_promotion.go | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go
index 139985431..060f1db66 100644
--- a/business/jxstore/promotion/jd_promotion.go
+++ b/business/jxstore/promotion/jd_promotion.go
@@ -696,30 +696,30 @@ func RefreshJdPromotionLockStatus(promotionID int) (err error) {
 
 func OnStoreStockMsg(msg *jdapi.CallbackStoreStockMsg) (retVal *jdapi.CallbackResponse) {
 	var err error
+	globals.SugarLogger.Debugf("OnStoreStockMsg msg:%s", utils.Format4Output(msg, false))
+	// globals.SugarLogger.Debugf("OnStoreStockMsg IsJdStoreSkuLocked:%t", storeskulock.IsJdStoreSkuLocked(msg.StationNo, msg.SkuId))
 	if (msg.Vendibility == 1 || !msg.Have) && storeskulock.IsJdStoreSkuLocked(msg.StationNo, msg.SkuId) {
 		db := dao.GetDB()
-		if msg.Vendibility == 1 {
-			sku := &model.Sku{}
-			sku.JdID = msg.SkuId
-			if err = dao.GetEntity(db, sku); err == nil {
-				if msg.Vendibility == 1 {
-					vendibility := &jdapi.StockVendibility{
-						OutSkuId: utils.Int2Str(sku.ID),
-						DoSale:   true,
-					}
-					_, err = api.JdAPI.BatchUpdateVendibility("", msg.StationNo, []*jdapi.StockVendibility{
-						vendibility,
-					}, "prevent")
+		sku := &model.Sku{}
+		sku.JdID = msg.SkuId
+		if err = dao.GetEntity(db, sku, model.FieldJdID); err == nil {
+			if msg.Vendibility == 1 {
+				vendibility := &jdapi.StockVendibility{
+					OutSkuId: utils.Int2Str(sku.ID),
+					DoSale:   true,
 				}
-				if !msg.Have {
-					stock := &jdapi.SkuStock{
-						OutSkuId: utils.Int2Str(sku.ID),
-						StockQty: model.MaxStoreSkuStockQty,
-					}
-					_, err = api.JdAPI.BatchUpdateCurrentQtys("", msg.StationNo, []*jdapi.SkuStock{
-						stock,
-					}, "prevent")
+				_, err = api.JdAPI.BatchUpdateVendibility("", msg.StationNo, []*jdapi.StockVendibility{
+					vendibility,
+				}, "prevent")
+			}
+			if !msg.Have {
+				stock := &jdapi.SkuStock{
+					OutSkuId: utils.Int2Str(sku.ID),
+					StockQty: model.MaxStoreSkuStockQty,
 				}
+				_, err = api.JdAPI.BatchUpdateCurrentQtys("", msg.StationNo, []*jdapi.SkuStock{
+					stock,
+				}, "prevent")
 			}
 		}
 	}