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

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-31 16:32:10 +08:00
parent 6f291dee6e
commit 1237db56cc
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/cms/store.go
View File

@@ -3653,9 +3653,9 @@ func GetStoreCategoryMap(ctx *jxcontext.Context, parentID, level int, storeID in
if err != nil { if err != nil {
return nil, err 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 { //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 // return storeCatMaps, err
} //}
//表示没有门店分类 //表示没有门店分类
if len(storeCatMaps) == 0 { if len(storeCatMaps) == 0 {
storeCatMaps, err = dao.GetCategoriesForStore(db, parentID, 0, nil) storeCatMaps, err = dao.GetCategoriesForStore(db, parentID, 0, nil)

2
business/partner/purchase/mtwm/order.go
View File

@@ -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) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
if !isSelfDelivery { if isSelfDelivery {
if globals.EnableMtwmStoreWrite { if globals.EnableMtwmStoreWrite {
// err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID)) // err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID))
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))

2
controllers/cms_store.go
View File

@@ -748,7 +748,7 @@ func (c *StoreController) DeletePrinterSeq() {
// @Title 得到门店类别 // @Title 得到门店类别
// @Description 得到门店类别 // @Description 得到门店类别
// @Param token header string true "认证token" // @Param token header string false "认证token"
// @Param parentID query int false "父ID" // @Param parentID query int false "父ID"
// @Param level query int false "分类等级" // @Param level query int false "分类等级"
// @Param storeID query int true "门店ID" // @Param storeID query int true "门店ID"

12
controllers/cms_store_sku.go
View File

@@ -111,10 +111,10 @@ func (c *StoreSkuController) GetStoresSkus() {
} }
// 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部
userAuth, err := auth2.GetTokenInfo(params.Token) userAuth, _ := auth2.GetTokenInfo(params.Token)
if err != nil {
return nil, "", err var userType int8 = 0
} if userAuth != nil {
user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
@@ -122,9 +122,11 @@ func (c *StoreSkuController) GetStoresSkus() {
if total != model.YES { if total != model.YES {
return nil, "", errors.New("未注册用户") return nil, "", errors.New("未注册用户")
} }
userType = user[0].Type
if user[0].Type != model.YES { if user[0].Type != model.YES {
return storeSku, "", nil return storeSku, "", nil
} }
}
// 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员）
store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "") store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "")
@@ -144,7 +146,7 @@ func (c *StoreSkuController) GetStoresSkus() {
for _, v := range store { for _, v := range store {
for _, s := range storeSku.SkuNames { for _, s := range storeSku.SkuNames {
if v.ID == s.StoreID { 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 continue
} else { } else {
result.TotalCount += len(s.Skus) result.TotalCount += len(s.Skus)