From 120f73549d7898b8239ffc21f3320a8dbad2c2b1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 09:09:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
index 5b32716..3a25d2b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -594,7 +594,8 @@
tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
tOrderPrivateCar.setAbnormalStatus(2);
if(responsibilityTypeVal>3){
- tOrderPrivateCar.setResponsibilityMoney(new BigDecimal(money));
+ tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getPayMoney());
+ tOrderPrivateCar.setPayMoney(new BigDecimal(money));
}
tOrderPrivateCar.setAbnormalRemark(remark);
tOrderPrivateCarService.updateById(tOrderPrivateCar);
@@ -605,7 +606,8 @@
tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
tOrderCrossCity.setAbnormalStatus(2);
if(responsibilityTypeVal>3) {
- tOrderCrossCity.setResponsibilityMoney(new BigDecimal(money));
+ tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getPayMoney());
+ tOrderCrossCity.setPayMoney(new BigDecimal(money));
}
tOrderCrossCity.setAbnormalRemark(remark);
tOrderCrossCityService.updateById(tOrderCrossCity);
@@ -616,7 +618,8 @@
tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
tOrderTaxi.setAbnormalStatus(2);
if(responsibilityTypeVal>3) {
- tOrderTaxi.setResponsibilityMoney(new BigDecimal(money));
+ tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getPayMoney());
+ tOrderTaxi.setPayMoney(new BigDecimal(money));
}
tOrderTaxi.setAbnormalRemark(remark);
tOrderTaxiService.updateById(tOrderTaxi);
--
Gitblit v1.7.1