From 2558b9125091fcadbf3ab6ef13bdf097601e2667 Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Mon, 22 Jun 2026 14:28:31 +0800
Subject: [PATCH] 1

---
 .../web/controller/jarvis/OrderRowsController.java     | 10 +++++++++-
 .../publicapi/PublicPromoterOrderController.java       |  1 -
 .../main/java/com/ruoyi/jarvis/domain/OrderRows.java   |  4 ++++
 .../ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java   | 10 ----------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
index a6f97e9..03b91e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
@@ -15,6 +15,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.jarvis.domain.OrderRows;
+import com.ruoyi.jarvis.service.IGoodsInfoService;
 import com.ruoyi.jarvis.service.IOrderRowsService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -32,6 +33,9 @@ public class OrderRowsController extends BaseController
     @Autowired
     private IOrderRowsService orderRowsService;
 
+    @Autowired
+    private IGoodsInfoService goodsInfoService;
+
     @Autowired
     private SuperAdminService superAdminService;
 
@@ -127,7 +131,11 @@ public class OrderRowsController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
-        return success(orderRowsService.selectOrderRowsById(id));
+        OrderRows orderRows = orderRowsService.selectOrderRowsById(id);
+        if (orderRows != null && orderRows.getGoodsInfoId() != null) {
+            orderRows.setGoodsInfo(goodsInfoService.selectGoodsInfoById(orderRows.getGoodsInfoId()));
+        }
+        return success(orderRows);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java
index 2f8c04e..cfa3bf3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java
@@ -128,7 +128,6 @@ public class PublicPromoterOrderController {
         Double proPrice = row.getProPriceAmount();
         if (proPrice != null && proPrice > 0) {
             vo.setProPriceAmount(String.format("%.2f", proPrice));
-            vo.setProPriceTime(formatDate(row.getModifyTime()));
         } else {
             vo.setProPriceAmount("0.00");
         }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
index 64eaaff..1e933c5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
@@ -229,4 +229,8 @@ public class OrderRows extends BaseEntity
     @Excel(name = "订单标签")
     private String orderTag;
 
+    /** 关联商品信息（goods_info，非表字段） */
+    @Transient
+    private GoodsInfo goodsInfo;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java
index 4cf150b..963dd1c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java
@@ -22,8 +22,6 @@ public class PromoterOrderInfoVO {
     private String finishTime;
     /** 价保/赔付金额 */
     private String proPriceAmount;
-    /** 价保/赔付更新时间（有金额时取订单 modify_time） */
-    private String proPriceTime;
 
     public String getShopName() {
         return shopName;
@@ -152,12 +150,4 @@ public class PromoterOrderInfoVO {
     public void setProPriceAmount(String proPriceAmount) {
         this.proPriceAmount = proPriceAmount;
     }
-
-    public String getProPriceTime() {
-        return proPriceTime;
-    }
-
-    public void setProPriceTime(String proPriceTime) {
-        this.proPriceTime = proPriceTime;
-    }
 }