From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
index 0d7a49d..291dc07 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
@@ -49,8 +49,9 @@
     public R<Page<AppActivityPageVo>> pageAppActivity(@RequestBody AppPageDto appPageDto) {
         Long userId = SecurityUtils.getUserId();
         Long shopId = null;
+        Member member = null;
         if(userId!=null){
-            Member member = memberService.getMember(userId).getData();
+            member = memberService.getMember(userId).getData();
             if(member!=null&&member.getRelationShopId()!=null){
                 shopId = member.getRelationShopId();
             }
@@ -58,6 +59,9 @@
         if(shopId==null){
             throw new ServiceException(AppErrorConstant.NO_POSITION);
         }
+//        if(member!=null&&member.getBindingFlag()==0){
+//            shopId = null;
+//        }
         Page<AppActivityPageVo> page = new Page<>();
         page.setSize(appPageDto.getPageSize());
         page.setCurrent(appPageDto.getPageNum());

--
Gitblit v1.7.1