From 4e3be9003aa80bc4a71448f759315893515b5e10 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 3 Mar 2026 18:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=B2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StatisticsController.java | 24 +++++++++---------- .../service/impl/OrdersServiceImpl.java | 20 ++++++++-------- 2 files changed, 22 insertions(+), 22 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 b75b20b..1999471 100644 --- a/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java +++ b/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java @@ -49,8 +49,8 @@ public class StatisticsController { } private List> getIncomesList(int type,String date){ return ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,type) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+date+"'") @@ -333,8 +333,8 @@ public class StatisticsController { """) .groupBy("plat")); List> physicalAndTraining = ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).in(Orders::getType,3,4) .apply("DATE_FORMAT(t.order_time,'%Y-%m') = '"+params.get("orderTime")+"'") @@ -467,8 +467,8 @@ public class StatisticsController { String date = params.get("year")+"-"+params.get("month"); //收入 List> incomes = ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,1) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+date+"'") @@ -597,8 +597,8 @@ public class StatisticsController { String date = params.get("year")+"-"+params.get("month"); //收入 List> incomes = ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,2) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+date+"'") @@ -784,8 +784,8 @@ public class StatisticsController { @RequestMapping("/physicalStatistics") public R physicalStatistics(@RequestBody Map params){ List> physical = ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,3) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'") @@ -809,8 +809,8 @@ public class StatisticsController { @RequestMapping("/trainingClassStatistics") public R trainingClassStatistics(@RequestBody Map params){ List> trainingClass = ordersService.listMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,4) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'") 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 592c82a..233d828 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 @@ -136,9 +136,9 @@ public class OrdersServiceImpl extends ServiceImpl impleme @Override public List> coinInfoExportList(Map params) { List> coinInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper() + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) .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来源," + @@ -152,8 +152,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme public List> vipInfoExportList(Map params) throws ParseException { String date = params.get("year")+"-"+params.get("month"); List> vipOrders = this.baseMapper.selectMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,1) .select("DATE_FORMAT(order_time, '%Y-%m-%d %H:%i:%s') orderTime,if(source=0,'一路健康',if(source=1,'吴门医述','管理员')) source,order_old_id orderOldId," + @@ -288,8 +288,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme String date = params.get("year")+"-"+params.get("month"); //所有课程订单 List> courseOrders = this.baseMapper.selectMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,2) .select("DATE_FORMAT(order_time, '%Y-%m-%d %H:%i:%s') orderTime,if(source=0,'一路健康',if(source=1,'吴门医述','管理员')) source,order_old_id orderOldId," + @@ -508,8 +508,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme @Override public List> physicalInfoExportList(Map params) { List> physicalInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .leftJoin("e_book_test.user u on u.tel = t.tel") .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,3) @@ -537,8 +537,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme @Override public List> trainingClassInfoExportList(Map params) { List> trainingClassInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper() - .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) - .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin(PaymentToOrder.class,t->t.eq(PaymentToOrder::getOrderId,Orders::getId).eq(PaymentToOrder::getState,0)) + .leftJoin(Payment.class,t->t.eq(Payment::getId,PaymentToOrder::getPaymentId).eq(Payment::getState,0)) .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,4) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'")