From e9d0eb5d4f43c3cd5a37283151d69683b3ddd6bf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 02 九月 2025 15:05:10 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 42aec37..bf36247 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.DateUtil;
@@ -687,6 +688,10 @@
Integer userId =null;
if(type==1){
TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
+ if(1 != tOrderPrivateCar.getAbnormalStatus()){
+ return new ErrorTip(500, "订单已被审核，不能重复操作");
+ }
+
userId = tOrderPrivateCar.getUserId();
//平台全责需要调起备付金支付
@@ -717,13 +722,13 @@
String retCode = payInfo.getRetCode();
if (!"000000".equals(retCode)) {
log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return "备付金支付失败：" + payInfo.getRetMsg();
+ return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
}
PayInfoData data = payInfo.getData();
String status = data.getStatus();
if ("3".equals(status)) {
log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return "备付金支付失败：" + payInfo.getRetMsg();
+ return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
}
if("0".equals(status)){
//查询支付信息
@@ -789,6 +794,9 @@
}
if(type==2){
TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
+ if(1 != tOrderCrossCity.getAbnormalStatus()){
+ return new ErrorTip(500, "订单已被审核，不能重复操作");
+ }
userId = tOrderCrossCity.getUserId();
tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
tOrderCrossCity.setAbnormalStatus(2);
@@ -819,6 +827,9 @@
}
if(type==3){
TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("id", orderNum));
+ if(1 != tOrderTaxi.getAbnormalStatus()){
+ return new ErrorTip(500, "订单已被审核，不能重复操作");
+ }
userId = tOrderTaxi.getUserId();
tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
tOrderTaxi.setAbnormalStatus(2);
--
Gitblit v1.7.1