From 34e04f768d578c861daa7d4071d07cf3bdae9120 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 20:42:33 +0800
Subject: [PATCH] 补充
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 61 +++++++++++++-----------------
1 files changed, 26 insertions(+), 35 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 9ae9199..584319b 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
@@ -110,27 +110,16 @@
.eq("userId", tOrderTaxi.get("driverId"))
.eq("state", 2)
.eq("type", 1)
- .eq("userType", 6)
- .eq("payState", 2)
+ .eq("userType", 2)
+ .eq("orderType", 6)
.last("LIMIT 1"));
- if (tPubTransactionDetails==null){
- model.addAttribute("companyMoney","");
- model.addAttribute("driverMoney","");
-
- }else{
- model.addAttribute("companyMoney",tPubTransactionDetails.getMoney());
- model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney()));
-
-
+ model.addAttribute("companyMoney",tPubTransactionDetails.getMoney());
+ model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney()));
+ if(tOrderTaxi.get("payManner").equals("1")){
+ model.addAttribute("payMannerStr","线上收款");
+ }else {
+ model.addAttribute("payMannerStr","计费打表");
}
- if (tOrderTaxi.get("payManner")!=null){
- if(tOrderTaxi.get("payManner").equals("1")){
- model.addAttribute("payMannerStr","线上收款");
- }else {
- model.addAttribute("payMannerStr","计费打表");
- }
- }
-
LogObjectHolder.me().set(tOrderTaxi);
return PREFIX + "tOrderTaxi_edit.html";
}
@@ -202,27 +191,29 @@
* @param orderDetailId
* @return
*/
- public static String URL = "https://yingyan.baidu.com/api/v3/track/gettrack?";
-
- public static String AK = "WQhfsluNzEeUHUxoH4jc4JiCQOXw4Mnx";
@ResponseBody
@RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
public ResultUtil getOrderTrack(String orderDetailId){
if(ToolUtil.isNotEmpty(orderDetailId)){
try {
- TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderDetailId);
- TDriver tDriver = driverService.selectById(tOrderTaxi.getDriverId());
- SearchHttpAK ta = new SearchHttpAK();
- Map params = new LinkedHashMap<String, String>();
- params.put("ak", AK);
- params.put("entity_name", tDriver.getPhone());
- params.put("service_id", "241187");
- long start = tOrderTaxi.getStartServiceTime().getTime() / 1000L;
- long end = tOrderTaxi.getEndServiceTime().getTime() / 1000L;
- params.put("start_time", start+"");
- params.put("end_time", end+"");
- String s = ta.requestGetAK(URL, params);
- List<TOrderPositionBaiDu> list = JSONArray.parseArray(s.toString(), TOrderPositionBaiDu.class);
+// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 2).eq("orderId", orderDetailId).orderBy("insertTime"));
+ /*if(list.size() == 0){
+ return ResultUtil.error("该订单没有运行轨迹");
+ }*/
+ //将数据存储到文件中
+ File file = new File(filePath + orderDetailId + "_2.txt");
+ if(!file.exists()){
+ return ResultUtil.success(new ArrayList<>());
+ }
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
resultUtil = ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1