From e345b36025818615eb68d37819eaff312d1fb986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 12:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
index 63b44a7..b738142 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +16,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -33,7 +36,9 @@
@Resource
private ITOrderTaxiService orderTaxiService;
-
+ @Resource
+ private ITOrderCrossCityService orderCrossCityService;
+
/**
* 跳转支付订单统计页
@@ -69,9 +74,24 @@
@ResponseBody
@RequestMapping("/paymentOrderStatisticsList")
public Object paymentOrderStatisticsList(String paymentCode, String orderCode, String userPhone,
- String driverPhone, String createTime, String paymentTime){
+ String driverPhone, String createTime, String paymentTime,Integer orderType){
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
+ List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
+ List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
+ list.addAll(list1);
+ list.sort((o1, o2) -> {
+ String insertTime = o1.get("insertTime").toString();
+ String insertTime1 = o2.get("insertTime").toString();
+ Date o1Date = null;
+ Date o2Date = null;
+ try {
+ o1Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime);
+ o2Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime1);
+ return o2Date.compareTo(o1Date);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ });
return super.packForBT(page.setRecords(list));
}
@@ -88,9 +108,10 @@
@ResponseBody
@RequestMapping("/paymentOrderStatisticsList_export")
public void paymentOrderStatisticsList_export(String paymentCode, String orderCode, String userPhone,
- String driverPhone, String createTime, String paymentTime, HttpServletRequest request, HttpServletResponse response){
+ String driverPhone, String createTime, String paymentTime,Integer orderType,
+ HttpServletRequest request, HttpServletResponse response){
Page<Map<String, Object>> page = new Page(1, 9999);
- List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
+ List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
// 表格数据【封装】
List<List<String>> dataList = new ArrayList<>();
@@ -99,6 +120,7 @@
List<String> shellList = new ArrayList<String>();
shellList.add("支付流水号");
shellList.add("订单号");
+ shellList.add("订单类型");
shellList.add("支付用户手机号");
shellList.add("支付金额");
shellList.add("接单司机手机号");
@@ -121,6 +143,19 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("orderType"))){
+ int orderType1 = Integer.parseInt(object.get("orderType").toString());
+ switch (orderType1){
+ case 2:
+ shellList.add("出租车订单");
+ break;
+ case 3:
+ shellList.add("跨城出行订单");
+ break;
+ }
+ }else{
+ shellList.add("-");
+ }
if(SinataUtil.isNotEmpty(object.get("userPhone"))){
shellList.add(object.get("userPhone").toString());
}else{
--
Gitblit v1.7.1