修改直播列表

Pu Zhibing

1 天以前 546be8a1bafdfc804575a8d07a5d9f2306c29c42

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

@@ -50,8 +50,9 @@
    public R<AppHomeActivityVo> pageActivityGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
        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();
            }
@@ -62,6 +63,9 @@
        if(shopId==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
//        if(member!=null&&member.getBindingFlag()==0){
//            shopId = null;
//        }
        AppHomeActivityVo homeActivityVo = goodsService.pageActivityGoods(shopId);
        return R.ok(homeActivityVo);
    }
@@ -138,8 +142,9 @@
    @ApiOperation(value = "搜索活动商品")
    public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        Member member = null;
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRelationShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRelationShopId());
            }else{
@@ -149,6 +154,9 @@
        if(appSearchGoodsPageDto.getShopId()==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        if(member!=null&&member.getBindingFlag()==0){
            appSearchGoodsPageDto.setShopId(null);
        }
        Page<AppSimpleActivityGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());