From 9dfd623a88f2dbdfe669dd6fccf2f2669f2ab920 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 4 Feb 2026 16:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zmzm/finance/common/controller/StatisticsController.java | 5 +++--
 .../zmzm/finance/common/service/impl/OrdersServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java b/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java
index 404bdda..a0375e3 100644
--- a/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java
+++ b/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java
@@ -61,6 +61,7 @@ public class StatisticsController {
         List<Map<String,Object>> physicalAndTraining = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
                 .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId)
                 .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId)
+                .disableSubLogicDel()
                 .eq(Orders::getUseFlag,1).in(Orders::getType,3,4)
                 .apply("DATE_FORMAT(t.order_time,'%Y-%m') = '"+params.get("orderTime")+"'")
                 .select("""
@@ -514,7 +515,7 @@ public class StatisticsController {
                 .eq(Orders::getUseFlag,1).eq(Orders::getType,3)
                 .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'")
                 .select("IF(t.pay_type=1,'天医币',IF(t2.type=0,'微信',IF(t2.type=1,'支付宝','银行'))) type,SUM(t.fee) fee")
-                .groupBy(Payment::getType));
+                .groupBy("type"));
         return R.ok().putData("map",physical);
     }
     //实物明细导出
@@ -539,7 +540,7 @@ public class StatisticsController {
                 .eq(Orders::getUseFlag,1).eq(Orders::getType,4)
                 .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'")
                 .select("IF(t.pay_type=1,'天医币',IF(t2.type=0,'微信',IF(t2.type=1,'支付宝','银行'))) type,SUM(t.fee) fee")
-                .groupBy(Payment::getType));
+                .groupBy("type"));
         return R.ok().putData("map",trainingClass);
     }
     //培训班明细导出
diff --git a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java
index 06c9f77..6f945e3 100644
--- a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java
@@ -138,7 +138,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
                 .eq(Orders::getUseFlag,1).and(t->t.eq(Orders::getType,0).or().eq(Orders::getPayType,1))
                 .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'")
                 .select("DATE_FORMAT(t.order_time, '%Y-%m-%d %H:%i:%s') 01时间,if(t.source=0,'一路健康',if(t.source=1,'吴门医述','管理员')) 02来源," +
-                        "IF(t2.type=0,'微信',IF(t2.type=1,'支付宝','银行')) 03支付方式,t.tel 04电话,t.order_sn 05订单号," +
+                        "IF(t2.type=0,'微信',IF(t2.type=1,'支付宝',IF(t2.type=2,'银行',''))) 03支付方式,t.tel 04电话,t.order_sn 05订单号," +
                         "if(t.type=0,'充值',IF(t.type=1,'vip',IF(t.type=2,'课程',IF(t.type=3,'实物','培训班')))) 06类型, +t.fee 07金额,t.point 08充值天医币")
                 .orderByAsc(Orders::getOrderTime));
         return coinInfoList;