From a1584fdb58b61f9c286daf402ba80ccdcfcc8250 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 18:09:44 +0800
Subject: [PATCH] 补充
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 257d891..6daf66c 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
@@ -41,6 +41,8 @@
@Autowired
private ITOrderTaxiService tOrderTaxiService;
+ @Autowired
+ private ITPubTransactionDetailsService pubTransactionDetailsService;
@Autowired
private ITOrderPositionService tOrderPositionService;
@@ -103,6 +105,32 @@
public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) {
Map<String, Object> tOrderTaxi = tOrderTaxiService.getTaxiOrderDetailById(tOrderTaxiId);
model.addAttribute("item",tOrderTaxi);
+ // 查询司机扣款
+ TPubTransactionDetails tPubTransactionDetails = pubTransactionDetailsService.selectOne(new EntityWrapper<TPubTransactionDetails>()
+ .eq("userId", tOrderTaxi.get("driverId"))
+ .eq("state", 2)
+ .eq("type", 1)
+ .eq("userType", 6)
+ .eq("payState", 2)
+ .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()));
+
+
+ }
+ 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";
}
@@ -174,6 +202,9 @@
* @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