diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index 31cd5e0f..fe4611bc 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -273,9 +273,9 @@ public class CashController { @ApiOperation("收入统计") @GetMapping("/statisticsIncomeMoney") public Result statisticsIncomeMoney(String time, Integer flag) { - Double sumMoney = ordersService.statisticsIncomeMoney(time, flag, null); - Double courseMoney = ordersService.statisticsIncomeMoney(time, flag, 1); - Double vipMoney = ordersService.statisticsIncomeMoney(time, flag, 2); + Double sumMoney = payDetailsService.statisticsIncomeMoney(time, flag, null); + Double courseMoney = payDetailsService.statisticsIncomeMoney(time, flag, 1); + Double vipMoney = payDetailsService.statisticsIncomeMoney(time, flag, 2); Map map = new HashMap<>(); map.put("sumMoney", sumMoney == null ? 0.00 : sumMoney); map.put("courseMoney", courseMoney == null ? 0.00 : courseMoney); diff --git a/src/main/java/com/sqx/modules/pay/service/PayDetailsService.java b/src/main/java/com/sqx/modules/pay/service/PayDetailsService.java index 7aef829e..1712c577 100644 --- a/src/main/java/com/sqx/modules/pay/service/PayDetailsService.java +++ b/src/main/java/com/sqx/modules/pay/service/PayDetailsService.java @@ -20,4 +20,5 @@ public interface PayDetailsService { Double instantselectSumPay(String date, Long userId); + Double statisticsIncomeMoney(String time, Integer flag, Integer ordersType); } diff --git a/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java index f8cfc4c9..ddb48514 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java @@ -83,5 +83,8 @@ public class PayDetailsServiceImpl extends ServiceImpl +