From 5b1c0338384eefe0b24d39a76372aac21cea5a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 19 May 2022 12:00:53 +0800
Subject: [PATCH] 1

---
 controllers/cms_store_sku.go | 37 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index 35ededb4c..ade3f399a 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -101,27 +101,12 @@ func (c *StoreSkuController) GetStoresSkus() {
 		var storeIDs, skuIDs []int
 		var upcs []string
 		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.Upcs, &upcs); err == nil {
-
-			// 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员）
-			store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "")
-			if err != nil {
-				return nil, "", err
-			}
-
 			// 获取商品列表
 			storeSku, err := cms.GetStoresSkus(params.Ctx, storeIDs, skuIDs, upcs, params.IsFocus, params.IsHighPrice, params.PriceType, params.Keyword, params.IsBySku, params.IsAct, params.MapData, params.Offset, params.PageSize)
 			if err != nil {
 				return nil, "", err
 			}
 
-			isMatterStore := false
-			for _, v := range storeIDs {
-				if v == model.MatterStoreID {
-					isMatterStore = true
-				}
-			}
-
-			// 获取人员信息
 			// 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部
 			userAuth, err := auth2.GetTokenInfo(params.Token)
 			if err != nil {
@@ -134,15 +119,31 @@ func (c *StoreSkuController) GetStoresSkus() {
 			if total != model.YES {
 				return nil, "", errors.New("未注册用户")
 			}
+			if user[0].Type != model.YES {
+				return storeSku, "", nil
+			}
+
+			// 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员）
+			store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "")
+			if err != nil {
+				return nil, "", err
+			}
+
+			isMatterStore := false
+			for _, v := range storeIDs {
+				if v == model.MatterStoreID {
+					isMatterStore = true
+				}
+			}
 
 			result := &dao.StoreSkuNamesInfo{}
-			result.TotalCount =  0
+			result.TotalCount = 0
 			for _, v := range store {
 				for _, s := range storeSku.SkuNames {
 					if v.ID == s.StoreID {
-						if  (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES{// 普通用户进入物料店和b2b店
+						if (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES { // 普通用户进入物料店和b2b店
 							continue
-						}else {
+						} else {
 							result.TotalCount += len(s.Skus)
 							result.SkuNames = append(result.SkuNames, s)
 						}