From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
index 84659b7..64a3ac6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
@@ -159,6 +159,10 @@
      * 鍙戦�佸徃鏈虹珯鍐呬俊閫氱煡
      */
     private void sendDriverNotice(Integer driverId, Constants.DriverOrderNotify notify, Integer orderId, String... params) {
+        sendDriverNotice(driverId, notify, orderId, 0, params);
+    }
+
+    private void sendDriverNotice(Integer driverId, Constants.DriverOrderNotify notify, Integer objId, Integer objType, String... params) {
         DriverInfo driver = driverInfoMapper.selectById(driverId);
         if (driver == null || driver.getMemberId() == null) {
             return;
@@ -168,8 +172,8 @@
         notice.setUserId(driver.getMemberId());
         notice.setTitle(notify.getTitle());
         notice.setContent(notify.format(params));
-        notice.setObjId(orderId);
-        notice.setObjType(0); // 0=璁㈠崟
+        notice.setObjId(objId);
+        notice.setObjType(objType);
         notice.setStatus(0);  // 0=鏈
         notice.setIsdeleted(Constants.ZERO);
         notice.setCreateDate(new Date());
@@ -555,6 +559,10 @@
             newChange.setJpushAlias(official.getJpushAlias());
             driverInfoMapper.insert(newChange);
             saveDriverAttachments(newChange.getId(), request, now);
+            // 鏍囪鍘嗗彶鐨勫彉鏇寸増鏈负鍒犻櫎
+
+
+
         } else {
             // auditStatus=0/2锛氱洿鎺ユ洿鏂板彉鏇寸増鏈�
             applyDriverFieldsFromUpdate(changeVersion.getId(), request, now);
@@ -823,6 +831,11 @@
 
             // 鐭俊閫氱煡
             sendDriverAuditSms(changeVersion, newAuditStatus, auditDTO.getAuditRemark());
+
+            // 棣栨瀹℃壒閫氳繃锛氬彂閫佸鍔辫В閿佺珯鍐呬俊
+            if (Constants.equalsInteger(newAuditStatus, Constants.THREE)) {
+                sendDriverNotice(changeVersion.getId(), Constants.DriverOrderNotify.REWARD_UNLOCKED, null, 2);
+            }
         } else {
             // 鍦烘櫙2锛氭寮忕増鏈凡瀹℃壒閫氳繃锛堝彉鏇村鎵癸級
             if (Constants.equalsInteger(newAuditStatus, Constants.THREE)) {
@@ -1797,7 +1810,7 @@
         // 4. 鏇存柊璁㈠崟鐘舵�佷负娲鹃�佷腑(4)
         ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                 .set(Orders::getStatus, Constants.OrderStatus.delivering.getStatus())
-                .set(Orders::getTakeTime, now)
+                .set(Orders::getDriverTakeTime, now)
                 .set(Orders::getUpdateTime, now)
                 .eq(Orders::getId, orderId));
 

--
Gitblit v1.9.3