From 44f1eba5d60bd4cfce3fa1fc4512e0eda3e9a2f7 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 20 Nov 2025 23:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4hsn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delay/handler/DeliveredHandler.java       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java b/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java
index 8b9a729..8f5b467 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java
@@ -2,14 +2,14 @@ package com.heyu.api.listener.delay.handler;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao;
-import com.heyu.api.data.enums.OrderStatusEnums;
 import com.heyu.api.data.dao.vv.VvPackageDao;
 import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
 import com.heyu.api.data.dto.PackageDelivedDelayDTO;
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
+import com.heyu.api.data.enums.OrderStatusEnums;
 import com.heyu.api.data.enums.RoleEnums;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.listener.BaseDelayedHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -32,20 +32,21 @@ public class DeliveredHandler extends BaseDelayedHandler {
 
 
     @Autowired
-    private VvTradeOrderLineStatusLogDao vvTradeOrderLineStatusLogDao;
+    private VvTradeOrderConvertService vvTradeOrderConvertService;
+
 
     @Override
     public R handler(String message) {
         log.info("DeliveredHandler receive message:{}", message);
-
         PackageDelivedDelayDTO packageDelivedDelayDTO = JSONObject.parseObject(message, PackageDelivedDelayDTO.class);
+
+
         // 更新包信息
         VvPackageEntity vvPackage = vvPackageDao.selectVvPackageById(packageDelivedDelayDTO.getPackageId());
         vvPackage.setIscheck("3");
         vvPackage.setGmtDelivered(new Date());
-        vvPackage.setDeliveredBy(RoleEnums.job.getRole());
-
-        vvPackageDao.insertOrUpdateVvPackage(vvPackage);
+        vvPackage.setDeliveredBy(RoleEnums.system.getRole());
+        vvPackageDao.updateVvPackageById(vvPackage);
 
         // 更新子单信息
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvPackage.getTrackNumber());
@@ -55,15 +56,17 @@ public class DeliveredHandler extends BaseDelayedHandler {
             vvTradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus());
             vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
 
-
-
-
-
+            vvTradeOrderConvertService.addOrderLineStatusLog(vvTradeOrderLineEntity.getId(),
+                    OrderStatusEnums.delivered,
+                    RoleEnums.system.getRole()
+            );
 
 
 
 
         }
+
+
         return R.ok();
     }
 }