From 8c4f4c9285d6bb4cc8e8bc64c5904c5f37821c3c Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 21 Nov 2025 23:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vv/VvTradeOrderLineStatusLogEntity.java   | 21 +------------------
 .../vv/VvTradeOrderConvertServiceImpl.java    |  2 --
 .../java/com/test/xxx/MysqlMain_update.java   |  2 +-
 .../controller/mm/AdminOrderController.java   |  1 +
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java
index 2e462d5..f8b421e 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java
@@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
 /**
 *订单表状态变更记录
 * @author quyixiao
-* @since 2025-11-18
+* @since 2025-11-21
 */
 
 @Data
@@ -27,7 +27,6 @@ private static final long serialVersionUID = 1L;
     public final static String modify_time = CLASS_NAME + "modify_time";                    // 修改时间
     public final static String trade_order_line_id = CLASS_NAME + "trade_order_line_id";    // 子订单号
     public final static String status_ = CLASS_NAME + "status";                             // 状态
-    public final static String current_time = CLASS_NAME + "current_time";                  // 当前时间
     public final static String reason_ = CLASS_NAME + "reason";                             // 原因
     public final static String features_ = CLASS_NAME + "features";                         // 附加信息
     public final static String change_status_user = CLASS_NAME + "change_status_user";      // 改变这个状态的用户
@@ -47,8 +46,6 @@ private static final long serialVersionUID = 1L;
     private Long tradeOrderLineId;
     //状态
     private String status;
-    //当前时间
-    private Date currentTime;
     //原因
     private String reason;
     //附加信息
@@ -151,21 +148,6 @@ private static final long serialVersionUID = 1L;
         this.status = status;
     }
 
-    /**
-     * 当前时间 
-     * @return
-     */
-    public Date getCurrentTime() {
-        return currentTime;
-    }
-    /**
-     * 当前时间 
-     * @param currentTime
-     */
-    public void setCurrentTime(Date currentTime) {
-        this.currentTime = currentTime;
-    }
-
     /**
      * 原因 
      * @return
@@ -265,7 +247,6 @@ private static final long serialVersionUID = 1L;
                 ",modifyTime=" + modifyTime +
                 ",tradeOrderLineId=" + tradeOrderLineId +
                 ",status=" + status +
-                ",currentTime=" + currentTime +
                 ",reason=" + reason +
                 ",features=" + features +
                 ",changeStatusUser=" + changeStatusUser +
diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java
index e0f3a0e..7aacf28 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -96,7 +95,6 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
     public int addOrderLineStatusLog(Long tradeOrderLineId, Object status, String changeStatusUser, String ... reason) {
         VvTradeOrderLineStatusLogEntity entity = new VvTradeOrderLineStatusLogEntity();
         entity.setTradeOrderLineId(tradeOrderLineId);
-        entity.setCurrentTime(new Date());
         if (status instanceof OrderStatusEnums) {
             entity.setStatus(((OrderStatusEnums) status).getStatus());
             entity.setStatusDesc(((OrderStatusEnums) status).getDesc());
diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
index 9fd6312..da69e44 100644
--- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
+++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
@@ -48,7 +48,7 @@ public class MysqlMain_update {
         }
         List<TablesBean> list = new ArrayList<TablesBean>();
 
-        list.add(new TablesBean("vv_buyer"));
+        list.add(new TablesBean("vv_trade_order_line_status_log"));
 
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();
         for (int i = 0; i < list.size(); i++) {
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
index 3298b4c..cd4635f 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
@@ -249,6 +249,7 @@ public class AdminOrderController {
         vvPackageEntity.setSellerWarehouseId(vvOrderRequest.getSellerWarehouseId());
 
         vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
+
         vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false);
 
         VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());