From aabf533b3ce696879339c251374d8af71d4a9e4a Mon Sep 17 00:00:00 2001 From: chendt <18902722133@163.com> Date: Mon, 4 Jul 2022 09:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/IndexImgController.java | 4 ++-- .../shop/api/controller/ProdController.java | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java index 8db635a..425dd2c 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java @@ -48,11 +48,11 @@ public class IndexImgController { @GetMapping("/page") @PreAuthorize("@pms.hasPermission('admin:indexImg:page')") public ResponseEntity> page(IndexImg indexImg, PageParam page) { - IPage indexImgIPage = indexImgService.page(page, + IPage indexImgPage = indexImgService.page(page, new LambdaQueryWrapper() .eq(indexImg.getStatus() != null, IndexImg::getStatus, indexImg.getStatus()) .orderByDesc(IndexImg::getSeq)); - return ResponseEntity.ok(indexImgIPage); + return ResponseEntity.ok(indexImgPage); } /** diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java index fcb08ab..bad8199 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java @@ -36,6 +36,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.stream.Collectors; +/** + * @author lgh on 2018/11/26. + */ @RestController @RequestMapping("/prod") @Api(tags = "商品接口") @@ -61,8 +64,8 @@ public class ProdController { }) public ResponseEntity> prodList( @RequestParam(value = "categoryId") Long categoryId,PageParam page) { - IPage productDtoIPage = prodService.pageByCategoryId(page, categoryId); - return ResponseEntity.ok(productDtoIPage); + IPage productPage = prodService.pageByCategoryId(page, categoryId); + return ResponseEntity.ok(productPage); } @GetMapping("/prodInfo") @@ -98,8 +101,8 @@ public class ProdController { @ApiImplicitParams({ }) public ResponseEntity> lastedProdPage(PageParam page) { - IPage productDtoIPage = prodService.pageByPutawayTime(page); - return ResponseEntity.ok(productDtoIPage); + IPage productPage = prodService.pageByPutawayTime(page); + return ResponseEntity.ok(productPage); } @GetMapping("/prodListByTagId") @@ -109,16 +112,16 @@ public class ProdController { }) public ResponseEntity> prodListByTagId( @RequestParam(value = "tagId") Long tagId,PageParam page) { - IPage productDtoIPage = prodService.pageByTagId(page, tagId); - return ResponseEntity.ok(productDtoIPage); + IPage productPage = prodService.pageByTagId(page, tagId); + return ResponseEntity.ok(productPage); } @GetMapping("/moreBuyProdList") @ApiOperation(value = "每日疯抢", notes = "获取销量最多的商品列表") @ApiImplicitParams({}) public ResponseEntity> moreBuyProdList(PageParam page) { - IPage productDtoIPage = prodService.moreBuyProdList(page); - return ResponseEntity.ok(productDtoIPage); + IPage productPage = prodService.moreBuyProdList(page); + return ResponseEntity.ok(productPage); } @GetMapping("/tagProdList")