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/smallLogistics/server/impl/OrderLogisticsServiceImpl.java |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index d783b90..4d3ff53 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -293,16 +293,9 @@
             jobDataMap.put("timeOut", timeOut);
             jobDataMap.put("driverTimeout", driverTimeout);
             jobDataMap.put("describe", language == 1 ? "您已超时" + driverTimeout + "分钟,用户可免费取消订单" : language == 2 ? "Reminder You are overdue for " + driverTimeout + " minutes The subscriber could cancel the order for free Confirm" : "Rappel Vous êtes en retard de " + driverTimeout + " minutes L’abonné peut annuler la commande gratuitement Confirmer");
-//            QuartzUtil.addSimpleQuartzTask(
-//                    new OrderTimeOutJob().buildQuartzJob("1_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap)
-//                    , new Date(timeOut), timeOut, 0);
     
-            try {
-                quartzUtil.addSimpleQuartzTask(OrderTimeOutJob.class,"1_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap
-                        , new Date(timeOut), timeOut, 0);
-            } catch (SchedulerException e) {
-                throw new RuntimeException(e);
-            }
+            quartzUtil.addSimpleQuartzTask(OrderTimeOutJob.class,"1_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap
+                    , new Date(timeOut), timeOut, 0);
             
     
             //超时循环提醒
@@ -315,16 +308,9 @@
             jobDataMap.put("timeOut", orderLogistics.getEstimateArriveTime().getTime());
             jobDataMap.put("driverTimeout", driverTimeout);
             jobDataMap.put("describe", "");
-//            QuartzUtil.addSimpleQuartzTask(
-//                    new OrderTimeOutJob().buildQuartzJob("3_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap)
-//                    , orderLogistics.getEstimateArriveTime(), reminderRules.getCar() * 60000, -1);
     
-            try {
-                quartzUtil.addSimpleQuartzTask(OrderTimeOutJob.class,"3_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap
-                        , orderLogistics.getEstimateArriveTime(), reminderRules.getCar() * 60000, -1);
-            } catch (SchedulerException e) {
-                throw new RuntimeException(e);
-            }
+            quartzUtil.addSimpleQuartzTask(OrderTimeOutJob.class,"3_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap
+                    , orderLogistics.getEstimateArriveTime(), reminderRules.getCar() * 60000, -1);
         }
         
         
@@ -863,6 +849,9 @@
      */
     public OrderLogistics setMoney(OrderLogistics orderLogistics, Double parkingFee, Double crossingFee) throws Exception {
         Map<String, Object> query1 = systemPriceMapper.query(orderLogistics.getCompanyId(), 4, orderLogistics.getServerCarModelId());
+        if(null == query1){
+            throw new RuntimeException("请先添加计费规则");
+        }
         //开始根据不同的方式计算金额
         double amount = 0;
         JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());

--
Gitblit v1.7.1