From 806789f756ac4e901e458d12eb3b9c66e5b1b149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 13 Apr 2021 17:39:14 +0800
Subject: [PATCH] aa

---
 business/jxstore/misc/misc.go        | 18 ++++++++++++------
 business/partner/purchase/jd/sku2.go |  4 +++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index b829f03be..427a434c9 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -385,10 +385,12 @@ func Init() {
 
 func syncStoreSku() {
 	syncFlag := 0
-	// syncFlag := model.SyncFlagPriceMask
-	// if (time.Now().Unix()/24*3600)%10 == 0 {
-	// 	syncFlag |= model.SyncFlagSaleMask
-	// }
+	if beego.BConfig.RunMode == "jxgy" {
+		syncFlag = model.SyncFlagPriceMask
+		if true {
+			syncFlag |= model.SyncFlagSaleMask
+		}
+	}
 	task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			step := batchItemList[0].(int)
@@ -435,7 +437,9 @@ func syncStoreSku() {
 
 func doDailyWork2() {
 	globals.SugarLogger.Debug("doDailyWork2")
-
+	if beego.BConfig.RunMode == "jxgy" {
+		syncStoreSku()
+	}
 	//同步京东商城门店的商品
 	// cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城的门店库存
@@ -455,7 +459,9 @@ func doDailyWork() {
 	dao.SetStoresMapSyncStatus(dao.GetDB(), nil, nil, model.SyncFlagStoreStatus)
 	cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), nil, nil, true, true)
 
-	syncStoreSku()
+	if beego.BConfig.RunMode == "prod" {
+		syncStoreSku()
+	}
 	InitEx()
 	cms.SyncStoresCourierInfo(jxcontext.AdminCtx, nil, false, true)
 	netprinter.RebindAllPrinters(jxcontext.AdminCtx, false, true)
diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go
index 85ec25b6c..f0226c64d 100644
--- a/business/partner/purchase/jd/sku2.go
+++ b/business/partner/purchase/jd/sku2.go
@@ -93,7 +93,9 @@ func (p *PurchaseHandler) CreateCategory2(ctx *jxcontext.Context, cat *dao.SkuSt
 func (p *PurchaseHandler) UpdateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
 	globals.SugarLogger.Debugf("UpdateCategory2  cat:%s", utils.Format4Output(cat, true))
 	if globals.EnableJdStoreWrite {
-		err = getAPI(cat.VendorOrgCode).UpdateShopCategory(utils.Str2Int64(cat.VendorCatID), cat.Name)
+		if cat.VendorCatID != "" {
+			err = getAPI(cat.VendorOrgCode).UpdateShopCategory(utils.Str2Int64(cat.VendorCatID), cat.Name)
+		}
 	}
 	return err
 }