From 3a0bef313cbc6cd71bcb234d208805c022827e13 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 13 八月 2025 18:59:01 +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 d126c3b..250dc80 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
@@ -291,6 +291,9 @@
}
abnormal = 2;
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if(type==null){
+ type=1;
+ }
// 快车
if(type==1){
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
@@ -676,7 +679,7 @@
tOrderPrivateCar.setAbnormalStatus(2);
if(responsibilityTypeVal>3){
tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getPayMoney());
- tOrderPrivateCar.setPayMoney(new BigDecimal(money));
+ tOrderPrivateCar.setOrderMoney(new BigDecimal(money));
}
if(responsibilityTypeVal>2){
// 追偿订单记录表
@@ -708,7 +711,7 @@
tOrderCrossCity.setAbnormalStatus(2);
if(responsibilityTypeVal>3) {
tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getPayMoney());
- tOrderCrossCity.setPayMoney(new BigDecimal(money));
+ tOrderCrossCity.setOrderMoney(new BigDecimal(money));
}
if(responsibilityTypeVal>2){
// 追偿订单记录表
@@ -739,7 +742,7 @@
tOrderTaxi.setAbnormalStatus(2);
if(responsibilityTypeVal>3) {
tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getPayMoney());
- tOrderTaxi.setPayMoney(new BigDecimal(money));
+ tOrderTaxi.setOrderMoney(new BigDecimal(money));
}
if(responsibilityTypeVal>2){
// 追偿订单记录表
--
Gitblit v1.7.1