From e1940dda45fa066d994cc5cf0e34c7f97d9e7b2d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:45 +0800
Subject: [PATCH] 修改bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 680148b..055f280 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -725,11 +725,11 @@
             orderPrivateCar.setState(7);
         }
 
-        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
-        if(String.valueOf(map.get("code")).equals("200")){
-            orderPrivateCar.setTelX("");
-            orderPrivateCar.setBindId("");
-        }
+//        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+//        if(String.valueOf(map.get("code")).equals("200")){
+//            orderPrivateCar.setTelX("");
+//            orderPrivateCar.setBindId("");
+//        }
         this.updateById(orderPrivateCar);
         
         //修改行程数据
@@ -890,6 +890,9 @@
      */
     public OrderPrivateCar setMoney(OrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
         Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
+        if(null == query1){
+            throw new RuntimeException("请先添加计费规则");
+        }
         //开始根据不同的方式计算金额
         double amount = 0;
         JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());

--
Gitblit v1.7.1