From 998bc10d74f370f7f99331d9df53d43311949f53 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 14 八月 2025 19:15:12 +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 | 11 ++++++++---
1 files changed, 8 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 efbe6e9..422a38e 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
@@ -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);
@@ -781,6 +785,7 @@
tSystemNotice.setType(2);
tSystemNotice.setNoticeType(1);
tSystemNotice.setUserType(1);
+ tSystemNotice.setUserId(userId);
tSystemNotice.setContent("您提交的申诉平台已处理");
tSystemNotice.setRead(1);
tSystemNotice.setInsertTime(new Date());
--
Gitblit v1.7.1