From e345b36025818615eb68d37819eaff312d1fb986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 12:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |    3 +++
 1 files changed, 3 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;

--
Gitblit v1.7.1