修改直播列表

Pu Zhibing

1 天以前 546be8a1bafdfc804575a8d07a5d9f2306c29c42

 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());
@@ -74,6 +78,8 @@
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRelationShopId()!=null){
                appActivityGoodsPageDto.setShopId(member.getRelationShopId());
            }else{
                appActivityGoodsPageDto.setShopId(appActivityGoodsPageDto.getPositionShopId());
            }
        }
        if(appActivityGoodsPageDto.getShopId()==null){