From d98ef630d16e5e8838fd8fa87680c8abfe13be31 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 13 一月 2025 09:21:17 +0800
Subject: [PATCH] 补充
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 4dc5037..d7f3ada 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
@@ -113,13 +113,24 @@
.eq("userType", 6)
.eq("payState", 2)
.last("LIMIT 1"));
- 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 (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";
}
--
Gitblit v1.7.1