咸宁出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-08-21 4bd9e1b8ac5fbc790be40bd033dcc0ac95051e15 
 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java


@@ -7,6 +7,7 @@


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.ITOrderLogisticsService;


import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.GetMapping;


@@ -39,6 +40,8 @@


   @Resource


   private ITOrderCrossCityService orderCrossCityService;




   @Resource


   private ITOrderLogisticsService orderLogisticsService;


   


   /**


    * 跳转支付订单统计页


@@ -78,7 +81,9 @@


      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,orderType);


      List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);


      List<Map<String, Object>> list2 = orderLogisticsService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);


      list.addAll(list1);


      list.addAll(list2);


      list.sort((o1, o2) -> {


         String insertTime = o1.get("insertTime").toString();


         String insertTime1 = o2.get("insertTime").toString();