From 589fba42b962118ca43f1fd53626e92d74c4fc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 19:27:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E6=94=B6=E5=85=A5=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=8D=E5=8C=B9=E9=85=8D=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/pay/controller/CashController.java   |  6 +++---
 .../sqx/modules/pay/service/PayDetailsService.java   |  1 +
 .../pay/service/impl/PayDetailsServiceImpl.java      |  5 ++++-
 src/main/resources/mapper/pay/PayDetailsDao.xml      | 12 ++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

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<String, Object> 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<PayDetailsDao, PayDetails
         return payDetailsDao.instantselectSumPay(date, userId);
     }
 
-
+    @Override
+    public Double statisticsIncomeMoney(String time, Integer flag, Integer ordersType) {
+        return baseMapper.statisticsIncomeMoney(time, flag, ordersType);
+    }
 }
diff --git a/src/main/resources/mapper/pay/PayDetailsDao.xml b/src/main/resources/mapper/pay/PayDetailsDao.xml
index 3f62ab58..48dfe60e 100644
--- a/src/main/resources/mapper/pay/PayDetailsDao.xml
+++ b/src/main/resources/mapper/pay/PayDetailsDao.xml
@@ -162,6 +162,18 @@
 		select count(*) from pay_details
 		where `state`=1 and user_id=#{userId}
 	</select>
+    <select id="statisticsIncomeMoney" resultType="java.lang.Double">
+		select sum(money) from pay_details where  state=1
+		<if test="flag!=null and flag==1">
+			and date_format(create_time,'%Y-%m-%d')=date_format(#{time},'%Y-%m-%d')
+		</if>
+		<if test="flag!=null and flag==2">
+			and date_format(create_time,'%Y-%m')=date_format(#{time},'%Y-%m')
+		</if>
+		<if test="flag!=null and flag==3">
+			and date_format(create_time,'%Y')=date_format(#{time},'%Y')
+		</if>
+	</select>
 
 
 </mapper>