From d914843e67a079c054c31b4ec53a9aa1ac42659d Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 13 Nov 2024 22:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/service/impl/RlOrderServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
index 9ed0e16..bb5f82a 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
@@ -692,8 +692,8 @@ public class RlOrderServiceImpl implements IRlOrderService
             }
             return Boolean.TRUE;
         });
-        if(!execute)throw new ServiceException("订单取消失败");
-        return false;
+        if(Boolean.FALSE.equals(execute))throw new ServiceException("订单取消失败");
+        return true;
     }
 
     /**
@@ -707,9 +707,9 @@ public class RlOrderServiceImpl implements IRlOrderService
         int i = orderMapper.updateRlOrderByOrderNo(rlOrder);
         /** 记录订单履历 */
         RlOrderVO order = orderMapper.selectRlOrderByOrderNo(orderNo);
-        if(orderOperService.recordOrderHistory(orderNo,ServiceConstants.ORDER_OPERATION_DEDUCTION,
+        if(!orderOperService.recordOrderHistory(orderNo,ServiceConstants.ORDER_OPERATION_DEDUCTION,
                 order.getStatus(),order.getStatus(),order.getPayFee(),order.getPayFee(),order.getUserId(),order.getPhone(),"车损扣款：扣款金额："+money+"，实际押金退款："+order.getDeposit()+"-"+money)){
-            throw new ServiceException("【改价】更新订单信息失败");
+            throw new ServiceException("【车损扣款】更新订单信息失败");
         }
         return i>0;
     }