合并代码

puzhibing

2024-12-11 72f1897ad39638eee7a22b28477b28e99accfc7f

合并代码

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java

@@ -42,7 +42,7 @@
            bannerService.save(banner);
            return R.ok();
      }
      @PostMapping("/delete")
      @GetMapping("/delete")
    @ApiOperation(value = "删除", tags = {"后台-广告管理-banner管理"})
    public R delete(@RequestParam Integer id){
            bannerService.removeById(id);
@@ -54,18 +54,18 @@
            bannerService.updateById(banner);
            return R.ok();
      }
      @PostMapping("/detail")
      @GetMapping("/detail")
    @ApiOperation(value = "详情", tags = {"后台-广告管理-banner管理"})
    public R detail(@RequestParam Integer id){
          Banner byId = bannerService.getById(id);
          return R.ok(byId);
      }
      @PostMapping("/page/list")
      @GetMapping("/page/list")
    @ApiOperation(value = "列表", tags = {"后台-广告管理--banner"})
    public R<Page<Banner>> pagelist(String name, Integer jumpType, Integer position,Integer pageNum,Integer pageSize){
          Page<Banner> page = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
                  .eq(Banner::getJumpType, jumpType)
                  .eq(Banner::getPosition, position)
                  .eq(jumpType!=null,Banner::getJumpType, jumpType)
                  .eq(position!=null,Banner::getPosition, position)
                  .page(Page.of(pageNum, pageSize));
          return R.ok(page);
    }

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -48,7 +48,7 @@
     */
    @GetMapping("/manageGoodsList")
    @ApiOperation(value = "后台管理商品列表", tags = {"管理后台-商品管理-商品列表"})
    public R<IPage<Goods>> manageGoodsList(,
    public R<IPage<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer pageNum,
                                           @ApiParam("每一页数据大小") Integer pageSize,
                                           Goods goods){
        return R.ok(goodsService.getManageGoodsList(new Page<>(pageNum, pageSize), goods));