bug

jiangqs

2023-08-21 c93e76c57a98e35abbf62d2f514d9ba51efd3243

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

@@ -5,9 +5,11 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.vo.AppActivityPageVo;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.service.activity.ActivityService;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppActivityGoodsPageDto;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
@@ -64,7 +66,7 @@
    }


    /*@RequestMapping(value = "/pageAppActivityGoods", method = RequestMethod.POST)
    @RequestMapping(value = "/pageAppActivityGoods", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取活动商品")
    public R<Page<AppSimpleActivityGoodsVo>> pageAppActivityGoods(@RequestBody AppActivityGoodsPageDto appActivityGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
@@ -72,6 +74,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){
@@ -82,5 +86,7 @@
        page.setCurrent(appActivityGoodsPageDto.getPageNum());
        List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageAppActivityGoods(page,appActivityGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }*/
    }


}