From 1433a1520db13d09108c1a086f953145d91233e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 10:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 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 6daf66c..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,9 +191,6 @@
* @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){
--
Gitblit v1.7.1