zm/finance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排除已删除导入账单

Browse Source
This commit is contained in:
wuchunlei
2026-03-03 18:01:18 +08:00
parent 0defd9bfb7
commit 4e3be9003a
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/zmzm/finance/common/controller/StatisticsController.java
View File

@@ -49,8 +49,8 @@ public class StatisticsController {
}
private List<Map<String,Object>> getIncomesList(int type,String date){
return ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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<Map<String,Object>> physicalAndTraining = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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<Map<String,Object>> incomes = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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<Map<String,Object>> incomes = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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<String,Object> params){
List<Map<String,Object>> physical = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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<String,Object> params){
List<Map<String,Object>> trainingClass = ordersService.listMaps(new MPJLambdaWrapper<Orders>()
.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")+"'")

20
src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java
View File

@@ -136,9 +136,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
@Override
public List<Map<String, Object>> coinInfoExportList(Map<String, Object> params) {
List<Map<String,Object>> coinInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper<Orders>()
.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<OrdersMapper, Orders> impleme
public List<Map<String, Object>> vipInfoExportList(Map<String, Object> params) throws ParseException {
String date = params.get("year")+"-"+params.get("month");
List<Map<String,Object>> vipOrders = this.baseMapper.selectMaps(new MPJLambdaWrapper<Orders>()
.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<OrdersMapper, Orders> impleme
String date = params.get("year")+"-"+params.get("month");
//所有课程订单
List<Map<String,Object>> courseOrders = this.baseMapper.selectMaps(new MPJLambdaWrapper<Orders>()
.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<OrdersMapper, Orders> impleme
@Override
public List<Map<String, Object>> physicalInfoExportList(Map<String, Object> params) {
List<Map<String,Object>> physicalInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper<Orders>()
.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<OrdersMapper, Orders> impleme
@Override
public List<Map<String, Object>> trainingClassInfoExportList(Map<String, Object> params) {
List<Map<String,Object>> trainingClassInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper<Orders>()
.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")+"'")