liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加蜂鸟门店名称生成错误

Browse Source
This commit is contained in:
邹宗楠
2022-05-13 17:45:52 +08:00
parent a1e059bde3
commit 19306bcd30
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/partner/delivery/fn/store.go
View File

@@ -56,11 +56,8 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
CreditCode: storeDetail.LicenceCode, CreditCode: storeDetail.LicenceCode,
BusinessLicencePicHash: storeDetail.Licence, BusinessLicencePicHash: storeDetail.Licence,
} }
if len(brandInfo) >= 0 { createStore.BranchShopName = storeDetail.Name
createStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name createStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
} else {
createStore.HeadShopName = storeDetail.Name
}
fnShopId, err := api.FnAPI.CreateStore(createStore) fnShopId, err := api.FnAPI.CreateStore(createStore)
if err != nil { if err != nil {
@@ -135,10 +132,9 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
CreditCode: storeDetail.LicenceCode, CreditCode: storeDetail.LicenceCode,
BusinessLicencePicHash: storeDetail.Licence, BusinessLicencePicHash: storeDetail.Licence,
} }
if len(brandInfo) >= 0 { if storeDetail.Name != fnStore.Name {
updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
} else { updateStore.BranchShopName = storeDetail.Name
updateStore.HeadShopName = storeDetail.Name
} }
return api.FnAPI.UpdateStore(updateStore) return api.FnAPI.UpdateStore(updateStore)

6
business/partner/delivery/mtps/store.go
View File

@@ -69,6 +69,12 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
DeliveryServiceCodes: utils.Int2Str(mtpsapi.DeliveryServiceCodeRapid), DeliveryServiceCodes: utils.Int2Str(mtpsapi.DeliveryServiceCodeRapid),
} }
shopStatus := mtpsapi.ShopStatusAuditCreated 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 { if globals.EnableStoreWrite {
shopStatus, err = api.MtpsAPI.ShopCreate(shopInfo) shopStatus, err = api.MtpsAPI.ShopCreate(shopInfo)
if err == nil { if err == nil {

2
controllers/cms_store.go
View File

@@ -720,7 +720,7 @@ func (c *StoreController) GetStoreCategoryMap() {
// 获取门店分类 // 获取门店分类
categoryList, err := cms.GetStoreCategoryMap(params.Ctx, params.ParentID, params.Level, params.StoreID) categoryList, err := cms.GetStoreCategoryMap(params.Ctx, params.ParentID, params.Level, params.StoreID)
// 门店为b2b // 门店为b2b
if store[0].BrandID == model.B2BNumberId { if store[0].BrandID == model.B2BNumberId || params.StoreID == model.MatterStoreID{
// 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部
userAuth, err := auth2.GetTokenInfo(params.Token) userAuth, err := auth2.GetTokenInfo(params.Token)
if err != nil { if err != nil {