From ebb9848e3216712be106f24bfb27c9cfb2a47a37 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 四月 2025 18:48:03 +0800
Subject: [PATCH] 修改bug
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index 5b79117..a75342f 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -4,9 +4,9 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.google.gson.Gson;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ExcelExportUtil;
@@ -15,13 +15,12 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import org.springframework.ui.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -40,50 +39,37 @@
@RequestMapping("/tOrderTaxi")
public class TOrderTaxiController extends BaseController {
+ public static List<Integer> orderIds = new ArrayList<>();
private String PREFIX = "/system/tOrderTaxi/";
-
@Autowired
private ITOrderTaxiService tOrderTaxiService;
@Autowired
private ITPubTransactionDetailsService pubTransactionDetailsService;
-
@Autowired
private ITOrderPositionService tOrderPositionService;
-
@Autowired
private ITDriverService tDriverService;
-
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
-
@Autowired
private ITUserService itUserService;
-
@Autowired
private PushUtil pushUtil;
-
@Autowired
private ITCompanyCityService companyCityService;
-
@Autowired
private ITSysPushOrderService pushOrderService;
-
@Autowired
private RedisUtil redisUtil;
-
@Autowired
private ITDriverService driverService;
-
@Autowired
private ITSystemNoticeService systemNoticeService;
-
- public static List<Integer> orderIds = new ArrayList<>();
-
@Value("${filePath}")
private String filePath;
+ private ResultUtil resultUtil;
/**
* 跳转到出租车订单首页
@@ -157,6 +143,7 @@
map.put("lat",tOrderPosition.getLat());
maps.add(map);
}
+
// resultUtil = ResultUtil.success(list);
// 将maps转化为jsonArray字符串
// 使用 Gson 转换为 JSON 字符串
@@ -225,7 +212,7 @@
}
return PREFIX + "tOrderTaxi_trajectory.html";
}
-
+
/**
* 获取出租车订单列表
*/
@@ -251,7 +238,6 @@
page.setRecords(tOrderTaxiService.getTaxiOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,driver,state));
return super.packForBT(page);
}
-
/**
* 导出订单
@@ -468,8 +454,7 @@
e.printStackTrace();
}
}
-
-
+
/**
* 选择司机列表
*/
@@ -483,8 +468,6 @@
page.setRecords(tOrderTaxiService.getCanSelectTaxiDriverList(page,tOrderTaxi.getCompanyId(),name,phone));
return super.packForBT(page);
}
-
- private ResultUtil resultUtil;
/**
* 获取订单轨迹
--
Gitblit v1.7.1