From 7f4b0dd986ed261d7d7e058cd308fa4a0004873e Mon Sep 17 00:00:00 2001
From: Leo <leo@qi-cloud.com>
Date: Sat, 15 Nov 2025 17:39:42 +0800
Subject: [PATCH] 1

---
 .../system/JDOrderListController.java         |  31 +++-
 .../jarvis/domain/dto/JDOrderSimpleDTO.java   | 132 ++++++++++++++++++
 2 files changed, 156 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/JDOrderSimpleDTO.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index a1c02db..9c698fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.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.JDOrder;
+import com.ruoyi.jarvis.domain.dto.JDOrderSimpleDTO;
 import com.ruoyi.jarvis.service.IJDOrderService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -228,19 +229,35 @@ public class JDOrderListController extends BaseController
         
         java.util.List<JDOrder> list = jdOrderService.selectJDOrderList(query);
         
-        // 关联查询订单状态和赔付金额
+        // 转换为简易DTO，只返回前端需要的字段，其他字段脱敏
+        java.util.List<JDOrderSimpleDTO> simpleList = new java.util.ArrayList<>();
         for (JDOrder jdOrder : list) {
+            JDOrderSimpleDTO dto = new JDOrderSimpleDTO();
+            
+            // 只设置前端需要的字段
+            dto.setRemark(jdOrder.getRemark());
+            dto.setOrderId(jdOrder.getOrderId());
+            dto.setThirdPartyOrderNo(jdOrder.getThirdPartyOrderNo());
+            dto.setModelNumber(jdOrder.getModelNumber());
+            dto.setAddress(jdOrder.getAddress());
+            dto.setIsRefunded(jdOrder.getIsRefunded() != null ? jdOrder.getIsRefunded() : 0);
+            dto.setIsRebateReceived(jdOrder.getIsRebateReceived() != null ? jdOrder.getIsRebateReceived() : 0);
+            dto.setStatus(jdOrder.getStatus());
+            dto.setCreateTime(jdOrder.getCreateTime());
+            
+            // 关联查询订单状态和赔付金额
             OrderRows orderRows = orderRowsService.selectOrderRowsByOrderId(jdOrder.getOrderId());
             if (orderRows != null) {
-                jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
-                jdOrder.setFinishTime(orderRows.getFinishTime());
-                jdOrder.setOrderStatus(orderRows.getValidCode());
+                dto.setProPriceAmount(orderRows.getProPriceAmount());
+                dto.setOrderStatus(orderRows.getValidCode());
             } else {
-                jdOrder.setProPriceAmount(0.0);
-                jdOrder.setOrderStatus(null);
+                dto.setProPriceAmount(0.0);
+                dto.setOrderStatus(null);
             }
+            
+            simpleList.add(dto);
         }
         
-        return getDataTable(list);
+        return getDataTable(simpleList);
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/JDOrderSimpleDTO.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/JDOrderSimpleDTO.java
new file mode 100644
index 0000000..07f3cfb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/JDOrderSimpleDTO.java
@@ -0,0 +1,132 @@
+package com.ruoyi.jarvis.domain.dto;
+
+import java.util.Date;
+
+/**
+ * 订单搜索工具返回的简易DTO
+ * 只包含前端展示需要的字段，其他字段脱敏
+ */
+public class JDOrderSimpleDTO {
+    
+    /** 内部单号 */
+    private String remark;
+    
+    /** 京东单号 */
+    private String orderId;
+    
+    /** 第三方单号 */
+    private String thirdPartyOrderNo;
+    
+    /** 型号 */
+    private String modelNumber;
+    
+    /** 地址 */
+    private String address;
+    
+    /** 退款状态（0否 1是） */
+    private Integer isRefunded;
+    
+    /** 后返到账（0否 1是） */
+    private Integer isRebateReceived;
+    
+    /** 赔付金额 */
+    private Double proPriceAmount;
+    
+    /** 订单状态 */
+    private Integer orderStatus;
+    
+    /** 备注/状态 */
+    private String status;
+    
+    /** 创建时间 */
+    private Date createTime;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getThirdPartyOrderNo() {
+        return thirdPartyOrderNo;
+    }
+
+    public void setThirdPartyOrderNo(String thirdPartyOrderNo) {
+        this.thirdPartyOrderNo = thirdPartyOrderNo;
+    }
+
+    public String getModelNumber() {
+        return modelNumber;
+    }
+
+    public void setModelNumber(String modelNumber) {
+        this.modelNumber = modelNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getIsRefunded() {
+        return isRefunded;
+    }
+
+    public void setIsRefunded(Integer isRefunded) {
+        this.isRefunded = isRefunded;
+    }
+
+    public Integer getIsRebateReceived() {
+        return isRebateReceived;
+    }
+
+    public void setIsRebateReceived(Integer isRebateReceived) {
+        this.isRebateReceived = isRebateReceived;
+    }
+
+    public Double getProPriceAmount() {
+        return proPriceAmount;
+    }
+
+    public void setProPriceAmount(Double proPriceAmount) {
+        this.proPriceAmount = proPriceAmount;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
+