diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java
index 3539cf527..553e842ef 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.entity.SysRole;
 import com.bsd.pjcloud.admin.api.feign.RemoteRoleService;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
@@ -30,6 +31,8 @@ import com.bsd.pjcloud.supermarket.vo.app.MallProductSkuAppVo;
 import com.bsd.pjcloud.supermarket.vo.app.MallMerchantListAppVo;
 import com.bsd.pjcloud.supermarket.dto.SkuStockChangeDTO;
 import com.bsd.pjcloud.supermarket.constant.MallConstants;
+import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -61,6 +64,7 @@ public class MallAppController {
     private final MallProductService mallProductService;
     private final MallProductSkuService mallProductSkuService;
     private final RemoteRoleService remoteRoleService;
+    private final RemoteMchService remoteMchService;
 
     // ==================== 分类相关接口 ====================
 
@@ -109,6 +113,7 @@ public class MallAppController {
                 .orderByAsc(MallMerchantEntity::getName)
         );
 
+
         if (merchants.isEmpty()) {
             return R.ok(List.of());
         }
@@ -404,26 +409,34 @@ public class MallAppController {
             throw new BusinessException("用户未登录");
         }
 
-        Long merchantIdByUserId=null;
+//        Long merchantIdByUserId=null;
         // 验证用户是否有商户角色
-        List<Long> roleIds = SecurityUtils.getRoleIds();
-        R<List<SysRole>> mallMchUserLists = remoteRoleService.findRolesByCodes(Arrays.asList(MallConstants.RoleCode.MERCHANT_USER));
-        if (mallMchUserLists.isOk()) {
-            List<SysRole> list = mallMchUserLists.getData();
-            if (CollectionUtils.isEmpty(list) || CollUtil.isEmpty(roleIds) || !roleIds.contains(list.get(0).getRoleId())) {
-                throw new BusinessException("请分配商户角色");
-            }
-            //有商户角色，然后查询自己绑定的商户信息
-            merchantIdByUserId = mallMerchantUserService.getMerchantIdByUserId(currentUserId);
-            if (merchantIdByUserId == null){
-                throw new BusinessException("当前用户未绑定商户");
-            }
+//        List<Long> roleIds = SecurityUtils.getRoleIds();
+        R<MchManageVo> mchManageVoR = remoteMchService.getByDeptId(currentUserId, MerchantTypeEnum.FARMER);
+        if (mchManageVoR.isOk()) {
+            MchManageVo mchManageVo = mchManageVoR.getData();
+            return mchManageVo.getId();
 
-        } else {
-            throw new BusinessException("基础用户服务异常");
+        }else {
+            throw new BusinessException("该用户未分配共富商户");
         }
+//        R<List<SysRole>> mallMchUserLists = remoteRoleService.findRolesByCodes(Arrays.asList(MallConstants.RoleCode.MERCHANT_USER));
+//        if (mallMchUserLists.isOk()) {
+//            List<SysRole> list = mallMchUserLists.getData();
+//            if (CollectionUtils.isEmpty(list) || CollUtil.isEmpty(roleIds) || !roleIds.contains(list.get(0).getRoleId())) {
+//                throw new BusinessException("请分配商户角色");
+//            }
+            //有商户角色，然后查询自己绑定的商户信息
+//            merchantIdByUserId = mallMerchantUserService.getMerchantIdByUserId(currentUserId);
+//            if (merchantIdByUserId == null){
+//                throw new BusinessException("当前用户未绑定商户");
+//            }
 
-        return merchantIdByUserId;
+//        } else {
+//            throw new BusinessException("基础用户服务异常");
+//        }
+
+//        return merchantIdByUserId;
     }