diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/BusinessStatisticsController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/BusinessStatisticsController.java index 9f33e55..a55b25a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/BusinessStatisticsController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/BusinessStatisticsController.java @@ -1,5 +1,6 @@ package org.dromara.system.controller.app; +import cn.dev33.satoken.annotation.SaIgnore; import jakarta.annotation.Resource; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; @@ -52,4 +53,24 @@ public class BusinessStatisticsController { + + /** + * 统计 + * @return + */ + @GetMapping("order/business") + @SaIgnore + public R orderStatistics(Long businessId){ + SysBusinessVo sysBusinessVo = sysBusinessService.queryById(businessId); + BusinessStatisticsVo businessStatisticsVo = new BusinessStatisticsVo(); + businessStatisticsVo.setTotalAmount(statisticsService.getTotalAmount(sysBusinessVo.getId())); + businessStatisticsVo.setTotalRefundAmount(statisticsService.getTotalRefundAmount(sysBusinessVo.getId())); + businessStatisticsVo.setTodayAmount(statisticsService.getDateAmount(sysBusinessVo.getId(), new Date())); + businessStatisticsVo.setTodayRefundAmount(statisticsService.getDateRefundAmount(sysBusinessVo.getId(), new Date())); + businessStatisticsVo.setTodayCount(statisticsService.getDateCount(sysBusinessVo.getId(), new Date())); + businessStatisticsVo.setTodayRefundCount(statisticsService.getDateRefundCount(sysBusinessVo.getId(), new Date())); + return R.ok(businessStatisticsVo); + } + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BusinessLineStatisticVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BusinessLineStatisticVo.java index eba1bf4..828ae20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BusinessLineStatisticVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BusinessLineStatisticVo.java @@ -27,4 +27,8 @@ public class BusinessLineStatisticVo { private String date; private String dateFormat; + + private BigDecimal settlementCurrentPrice; + + private BigDecimal settlementRefundPrice; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticsServiceImpl.java index 5294b14..e3d8d5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticsServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticsServiceImpl.java @@ -137,7 +137,7 @@ public class StatisticsServiceImpl implements IStatisticsService { BusinessLineStatisticsBo bo = new BusinessLineStatisticsBo(); bo.setBusinessId(id); BusinessLineStatisticVo vo = productOrderPriceMapper.businessLineStatistics(bo); - return vo.getTotalPrice(); + return vo.getSettlementCurrentPrice(); } @Override @@ -145,7 +145,7 @@ public class StatisticsServiceImpl implements IStatisticsService { BusinessLineStatisticsBo bo = new BusinessLineStatisticsBo(); bo.setBusinessId(id); BusinessLineStatisticVo vo = productOrderPriceMapper.businessLineStatisticsRefund(bo); - return vo.getRefundPrice(); + return vo.getSettlementRefundPrice(); } @Override @@ -155,7 +155,7 @@ public class StatisticsServiceImpl implements IStatisticsService { bo.setCreateTime(date); bo.setDateFormat("%Y-%m-%d"); BusinessLineStatisticVo vo = productOrderPriceMapper.businessLineStatistics(bo); - return vo.getTotalPrice(); + return vo.getSettlementCurrentPrice(); } @@ -166,7 +166,7 @@ public class StatisticsServiceImpl implements IStatisticsService { bo.setCreateTime(date); bo.setDateFormat("%Y-%m-%d"); BusinessLineStatisticVo vo = productOrderPriceMapper.businessLineStatisticsRefund(bo); - return vo.getRefundPrice(); + return vo.getSettlementRefundPrice(); } @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ProductOrderPriceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ProductOrderPriceMapper.xml index 191a110..ed930f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ProductOrderPriceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ProductOrderPriceMapper.xml @@ -10,7 +10,7 @@ - select IFNULL(count(1), 0) as refundCount, IFNULL(sum(settlement_refund_price), 0) as refundPrice + select IFNULL(count(1), 0) as refundCount, IFNULL(sum(settlement_current_price), 0) as settlementRefundPrice, IFNULL(sum(pay_price), 0) as refundPrice from business_line_statistics where del_flag = '0'