From d030002bf60dad604d1d8bdae32d60cb0ed06729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 7 Apr 2021 09:00:38 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go | 11 ++++++++---
 business/jxstore/misc/misc.go |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 23ec7e890..fafb820c2 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -82,9 +82,9 @@ type StoreExt struct {
 	BrandLogo      string `json:"brandLogo"`
 	// StoreMaps     []map[string]interface{} `orm:"-"`
 	// CourierMaps   []map[string]interface{} `orm:"-"`
-	StoreMaps   []*model.StoreMap        `json:"StoreMaps"`
-	CourierMaps []*model.StoreCourierMap `json:"CourierMaps"`
-	// BussinessStatus int                      `json:"bussinessStatus"` //上下线状态，-1下线，1上线
+	StoreMaps       []*model.StoreMap        `json:"StoreMaps"`
+	CourierMaps     []*model.StoreCourierMap `json:"CourierMaps"`
+	BussinessStatus int                      `json:"bussinessStatus"` //上下线状态，-1下线，1上线
 
 	OrderCount int `json:"orderCount"`
 }
@@ -685,6 +685,11 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS
 			if !jxutils.IsLegalStoreID(retVal.ID) {
 				retVal.ID = 0
 			}
+			if retVal.Status == model.StoreStatusDisabled {
+				retVal.BussinessStatus = -1
+			} else {
+				retVal.BussinessStatus = 1
+			}
 			return retVal, nil
 		}
 		return nil, err
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 257f0c689..c0ce00012 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -432,9 +432,9 @@ func doDailyWork2() {
 	globals.SugarLogger.Debug("doDailyWork2")
 
 	//同步京东商城门店的商品
-	cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
+	// cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城的门店库存
-	cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true)
+	// cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true)
 	//刷新京东商城订单结算价
 	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now()))
 	//刷新门店分组管理