From 1237db56ccbef4010b08d69cecef5fee80784527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Jul 2023 16:32:10 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 6 ++--- business/partner/purchase/mtwm/order.go | 2 +- controllers/cms_store.go | 2 +- controllers/cms_store_sku.go | 30 +++++++++++++------------ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 2b06282d1..42ce58032 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3653,9 +3653,9 @@ func GetStoreCategoryMap(ctx *jxcontext.Context, parentID, level int, storeID in if err != nil { return nil, err } - if ctx.GetLoginType() != auth2.AuthTypePassword && ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { - return storeCatMaps, err - } + //if ctx.GetLoginType() != auth2.AuthTypePassword && ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { + // return storeCatMaps, err + //} //表示没有门店分类 if len(storeCatMaps) == 0 { storeCatMaps, err = dao.GetCategoriesForStore(db, parentID, 0, nil) diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 860fc48cb..3dcc13404 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -514,7 +514,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI } func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { - if !isSelfDelivery { + if isSelfDelivery { if globals.EnableMtwmStoreWrite { // err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID)) err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index edf90c70e..92ef3dbd2 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -748,7 +748,7 @@ func (c *StoreController) DeletePrinterSeq() { // @Title 得到门店类别 // @Description 得到门店类别 -// @Param token header string true "认证token" +// @Param token header string false "认证token" // @Param parentID query int false "父ID" // @Param level query int false "分类等级" // @Param storeID query int true "门店ID" diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index aa350b596..01448da21 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -111,19 +111,21 @@ func (c *StoreSkuController) GetStoresSkus() { } // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 - userAuth, err := auth2.GetTokenInfo(params.Token) - if err != nil { - return nil, "", err - } - user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) - if err != nil { - return nil, "", err - } - if total != model.YES { - return nil, "", errors.New("未注册用户") - } - if user[0].Type != model.YES { - return storeSku, "", nil + userAuth, _ := auth2.GetTokenInfo(params.Token) + + var userType int8 = 0 + if userAuth != nil { + user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) + if err != nil { + return nil, "", err + } + if total != model.YES { + return nil, "", errors.New("未注册用户") + } + userType = user[0].Type + if user[0].Type != model.YES { + return storeSku, "", nil + } } // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） @@ -144,7 +146,7 @@ func (c *StoreSkuController) GetStoresSkus() { 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) && (userType == model.YES || userType == model.NO) { // 普通用户进入物料店和b2b店 continue } else { result.TotalCount += len(s.Skus)