From 8ed3af7cce8a2c7ce430451f74e324eada07d0e2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 20:31:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 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 d7f3ada..4dc5037 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,24 +113,13 @@
.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()));
-
-
+ 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";
}
--
Gitblit v1.7.1