From 3397162d64b0092e310f24d17b267127264463ac Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 八月 2025 16:23:13 +0800
Subject: [PATCH] update
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 571e97a..966f894 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
@@ -117,7 +117,7 @@
Object o2 = item.get("responsibilityType");
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", item.get("orderNum")));
+ TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum",tOrderPrivateCarId));
model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
}
}
@@ -148,7 +148,7 @@
model.addAttribute("show",0);
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum", item.get("orderNum")));
+ TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum",tOrderPrivateCarId));
model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
}
}
@@ -168,7 +168,7 @@
Object o2 = item.get("responsibilityType");
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum", item.get("orderNum")));
+ TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum",tOrderPrivateCarId));
model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
}
}
@@ -679,7 +679,7 @@
public Object save(Integer responsibilityTypeVal,String remark,String money,Integer type,String orderNum) {
Integer userId =null;
if(type==1){
- TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("orderNum",orderNum));
+ TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
userId = tOrderPrivateCar.getUserId();
tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
tOrderPrivateCar.setAbnormalStatus(2);
@@ -691,6 +691,7 @@
// 追偿订单记录表
TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
tAbnormalPayOrder.setOrderNum(orderNum);
+ tAbnormalPayOrder.setOrderNo(tOrderPrivateCar.getOrderNum());
tAbnormalPayOrder.setType(1);
tAbnormalPayOrder.setUserId(tOrderPrivateCar.getUserId());
tAbnormalPayOrder.setPayStatus(1);
@@ -712,7 +713,7 @@
}
if(type==2){
- TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("orderNum", orderNum));
+ TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
userId = tOrderCrossCity.getUserId();
tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
tOrderCrossCity.setAbnormalStatus(2);
@@ -724,6 +725,8 @@
// 追偿订单记录表
TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
tAbnormalPayOrder.setOrderNum(orderNum);
+
+ tAbnormalPayOrder.setOrderNo(tOrderCrossCity.getOrderNum());
tAbnormalPayOrder.setType(2);
tAbnormalPayOrder.setUserId(tOrderCrossCity.getUserId());
tAbnormalPayOrder.setPayStatus(1);
@@ -744,7 +747,7 @@
}
if(type==3){
- TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("orderNum", orderNum));
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("id", orderNum));
userId = tOrderTaxi.getUserId();
tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
tOrderTaxi.setAbnormalStatus(2);
@@ -756,6 +759,7 @@
// 追偿订单记录表
TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
tAbnormalPayOrder.setOrderNum(orderNum);
+ tAbnormalPayOrder.setOrderNo(tOrderTaxi.getOrderNum());
tAbnormalPayOrder.setType(3);
tAbnormalPayOrder.setUserId(tOrderTaxi.getUserId());
tAbnormalPayOrder.setPayStatus(1);
@@ -787,6 +791,7 @@
tSystemNotice.setInsertTime(new Date());
systemNoticeService.insert(tSystemNotice);
return SUCCESS_TIP;
+
}
--
Gitblit v1.7.1