From 1bc12efc03f4fcad9fd197f35921e14fc2e9a7d9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 19:03:46 +0800
Subject: [PATCH] bug修改
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 3 +++
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 7176f91..cb6156e 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -365,6 +365,9 @@
try {
String[] split = orderId.split(",");
Double aDouble = orderService.queryReassignMoney(Integer.valueOf(split[0]), orderType);
+ if(Objects.isNull(aDouble)){
+ return ResultUtil.error("未设置改派金额",null);
+ }
BaseWarpper baseWarpper = new BaseWarpper();
if(orderType == 3){
aDouble = aDouble * split.length;
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
index e210482..2914fc6 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
@@ -273,6 +273,9 @@
case 2:
historyVo.setState("订单收入");
break;
+ case 3:
+ historyVo.setState("城际出行");
+ break;
default:
historyVo.setState("充值");
break;
@@ -311,6 +314,9 @@
case 2:
historyVo.setState("订单收入");
break;
+ case 3:
+ historyVo.setState("城际出行");
+ break;
default:
historyVo.setState("充值");
break;
--
Gitblit v1.7.1