From 4ef5e1e6b073508964dfb378053d178de63860bb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 28 八月 2025 16:10:14 +0800
Subject: [PATCH] 8.22后台

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 1617416..a1fae94 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -8,11 +8,9 @@
 import com.stylefeng.guns.modular.smallLogistics.model.OrderLogisticsSpread;
 import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
 import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsSpreadService;
+import com.stylefeng.guns.modular.system.dao.CarMapper;
 import com.stylefeng.guns.modular.system.dao.RegionMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.Income;
-import com.stylefeng.guns.modular.system.model.Region;
+import com.stylefeng.guns.modular.system.model.*;
 import com.stylefeng.guns.modular.system.service.*;
 import com.stylefeng.guns.modular.system.util.*;
 import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -68,10 +66,8 @@
 
     @Autowired
     private ITransactionDetailsService transactionDetailsService;
-
-
-
-
+    @Autowired
+    private CarMapper carMapper;
 
 
     /**
@@ -277,7 +273,7 @@
     public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode) throws Exception {
         OrderLogistics orderLogistics = this.selectById(orderId);
         if(!orderLogistics.getPickUpCode().equals(pickUpCode)){
-//            return ResultUtil.error("验证失败");
+            return ResultUtil.error("验证失败");
         }
         orderLogistics.setState(9);
         this.updateById(orderLogistics);
@@ -428,8 +424,12 @@
         }
         orderLogistics.setPickUpCode(random);
         this.updateById(orderLogistics);
+        Integer driverId = orderLogistics.getDriverId();
+        Driver driver = driverService.selectById(driverId);
+        Integer carId = driver.getCarId();
+        Car car = carMapper.selectById(carId);
         //发送短信
-        SMSUtil.send(orderLogistics.getRecipientPhone(), "您的验证码:" + random + ",您正在进行身份验证,请勿泄露于他人!", "2431012312835");
+        SMSUtil.send(orderLogistics.getRecipientPhone(), "您好!您的小件物流订单已被车辆"+car.getCarLicensePlate()+"接单,司机电话:"+driver.getPhone()+",取件码为"+random+",请在取货是出示取件码。", "2431012324056");
 //        aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_482775061", "{\"code\":\"" + random + "\"}");
     }
 

--
Gitblit v1.7.1