From 19306bcd30b8feec3282fd330c4798753ec74c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 13 May 2022 17:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=9C=82=E9=B8=9F=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=90=8D=E7=A7=B0=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/fn/store.go   | 12 ++++--------
 business/partner/delivery/mtps/store.go |  6 ++++++
 controllers/cms_store.go                |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go
index ac7f4b9af..6e6344c70 100644
--- a/business/partner/delivery/fn/store.go
+++ b/business/partner/delivery/fn/store.go
@@ -56,11 +56,8 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
 		CreditCode:             storeDetail.LicenceCode,
 		BusinessLicencePicHash: storeDetail.Licence,
 	}
-	if len(brandInfo) >= 0 {
-		createStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
-	} else {
-		createStore.HeadShopName = storeDetail.Name
-	}
+	createStore.BranchShopName = storeDetail.Name
+	createStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
 
 	fnShopId, err := api.FnAPI.CreateStore(createStore)
 	if err != nil {
@@ -135,10 +132,9 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
 		CreditCode:             storeDetail.LicenceCode,
 		BusinessLicencePicHash: storeDetail.Licence,
 	}
-	if len(brandInfo) >= 0 {
+	if storeDetail.Name != fnStore.Name {
 		updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
-	} else {
-		updateStore.HeadShopName = storeDetail.Name
+		updateStore.BranchShopName = storeDetail.Name
 	}
 
 	return api.FnAPI.UpdateStore(updateStore)
diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go
index 4badcc97c..5217399db 100644
--- a/business/partner/delivery/mtps/store.go
+++ b/business/partner/delivery/mtps/store.go
@@ -69,6 +69,12 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
 			DeliveryServiceCodes: utils.Int2Str(mtpsapi.DeliveryServiceCodeRapid),
 		}
 		shopStatus := mtpsapi.ShopStatusAuditCreated
+		// 获取品牌名称
+		brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
+		if err != nil {
+			return "", -1, err
+		}
+		shopInfo.ShopName = brandInfo[0].Name + "-" + storeDetail.Name
 		if globals.EnableStoreWrite {
 			shopStatus, err = api.MtpsAPI.ShopCreate(shopInfo)
 			if err == nil {
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index 8d6cb89c6..62ffb348a 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -720,7 +720,7 @@ func (c *StoreController) GetStoreCategoryMap() {
 		// 获取门店分类
 		categoryList, err := cms.GetStoreCategoryMap(params.Ctx, params.ParentID, params.Level, params.StoreID)
 		// 门店为b2b
-		if store[0].BrandID == model.B2BNumberId {
+		if store[0].BrandID == model.B2BNumberId || params.StoreID == model.MatterStoreID{
 			// 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部
 			userAuth, err := auth2.GetTokenInfo(params.Token)
 			if err != nil {