From 64e271b062752b042ffaee018336f10bd0a54d9f Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 25 Oct 2025 10:47:38 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83=E4=BC=98?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/StoreController.java | 8 ++++---- ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../com/ruoyi/xkt/service/IStoreService.java | 17 +++++------------ .../xkt/service/impl/StoreServiceImpl.java | 11 +++-------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java index 859dffe09..baa8c8376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java @@ -141,10 +141,10 @@ public class StoreController extends XktBaseController { } @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')") - @ApiOperation(value = "获取档口首页 今日商品销售额前5 ", httpMethod = "GET", response = R.class) - @GetMapping(value = "/index/today/prod/sale/top5/{storeId}") - public R indexTodayProdSaleRevenueTop5(@PathVariable Long storeId) { - return R.ok(BeanUtil.toBean(storeService.indexTodayProdSaleRevenueTop5(storeId), StoreIndexTodaySaleTop5ResVO.class)); + @ApiOperation(value = "获取档口首页 今日商品销售额top ", httpMethod = "GET", response = R.class) + @GetMapping(value = "/index/today/prod/sale/top/{storeId}") + public R indexTodayProdSaleRevenueTop(@PathVariable Long storeId) { + return R.ok(BeanUtil.toBean(storeService.indexTodayProdSaleRevenueTop(storeId, 8), StoreIndexTodaySaleTop5ResVO.class)); } @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')") diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2cc0df181..43e4ffde2 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev -# active: prod \ No newline at end of file + active: local +# active: prod diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java index 969b3991b..720b62c27 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java @@ -170,18 +170,11 @@ public interface IStoreService { /** * 获取今日商品销售额前5 * - * @param storeId 档口ID + * @param storeId 档口ID + * @param topCount 返回的数量 * @return StoreIndexTodaySaleResDTO */ - StoreIndexTodaySaleTop5ResDTO indexTodayProdSaleRevenueTop5(Long storeId); - - /** - * 档口状态 - * - * @param storeId - * @return - */ - Integer getStoreStatus(Long storeId); + StoreIndexTodaySaleTop5ResDTO indexTodayProdSaleRevenueTop(Long storeId, Integer topCount); /** * 更新档口库存系统 @@ -201,8 +194,8 @@ public interface IStoreService { /** * 获取档口库存系统 * - * @return - * @param storeId + * @param storeId 档口ID + * @return Integer */ Integer getStockSys(Long storeId); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 6dd177073..9baf723e9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -363,7 +363,7 @@ public class StoreServiceImpl implements IStoreService { */ @Override @Transactional(readOnly = true) - public StoreIndexTodaySaleTop5ResDTO indexTodayProdSaleRevenueTop5(Long storeId) { + public StoreIndexTodaySaleTop5ResDTO indexTodayProdSaleRevenueTop(Long storeId, Integer topCount) { List detailList = this.saleDetailMapper.selectList(new LambdaQueryWrapper() .eq(StoreSaleDetail::getStoreId, storeId).eq(StoreSaleDetail::getDelFlag, Constants.UNDELETED) .eq(StoreSaleDetail::getVoucherDate, java.sql.Date.valueOf(LocalDate.now()))); @@ -386,18 +386,13 @@ public class StoreServiceImpl implements IStoreService { // 总的金额 final BigDecimal totalAmount = detailList.stream().map(StoreSaleDetail::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); // 销售额排名前5的列表 - List top5List = saleList.stream().sorted(Comparator.comparing(StoreIndexTodaySaleTop5ResDTO.SITSProdSaleDTO::getSaleAmount).reversed()).limit(5).collect(Collectors.toList()); + List top5List = saleList.stream() + .sorted(Comparator.comparing(StoreIndexTodaySaleTop5ResDTO.SITSProdSaleDTO::getSaleAmount).reversed()).limit(topCount).collect(Collectors.toList()); // 其它款式的销售额 final BigDecimal otherAmount = totalAmount.subtract(top5List.stream().map(StoreIndexTodaySaleTop5ResDTO.SITSProdSaleDTO::getSaleAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); return new StoreIndexTodaySaleTop5ResDTO().setStoreId(storeId).setOtherAmount(otherAmount).setSaleList(top5List); } - @Transactional(readOnly = true) - @Override - public Integer getStoreStatus(Long storeId) { - return Optional.ofNullable(storeMapper.selectById(storeId)).map(Store::getStoreStatus).orElse(null); - } - @Override @Transactional public Integer updateStockSys(StoreUpdateStockSysDTO stockSysDTO) {