From 9144e704de9cdd5a31ac9112cc0baa4ebd0e886e Mon Sep 17 00:00:00 2001
From: renfan <2206580733@qq.com>
Date: Thu, 29 Aug 2024 01:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90front=E3=80=91=E4=BC=98=E5=8C=96#=201?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E7=BB=B4=E4=BF=AE=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=8A=A5=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hcy/admin/vo/order/RepairOrderDetailVo.java    | 6 +++++-
 .../front/service/order/impl/RepairOrderServiceImpl.java    | 1 +
 .../java/com/hcy/front/vo/order/RepairOrderDetailVo.java    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java
index 1f2caab..4f9ed4a 100644
--- a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java
+++ b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java
@@ -56,5 +56,9 @@ public class RepairOrderDetailVo implements Serializable {
     private Integer scrapAddressId; // 报废地址
     private UserAddressListVo scrapAddress; //报废地址信息
     private String returnCause; //退回原因
-
+    private Integer deliveryMethod; // 收件方式（0=物流快递 1-上门取件 2-送货上门）
+    private Long consigneeAddressId; // 收件地址
+    private String clientScrapRemark; // 客户报废备注
+    private Integer isConfirmReceipt; //是否确认收货 0-未收货 1-已收货
+    private String completeImg; // 完工照片
 }
diff --git a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java
index 87bb651..2c17205 100644
--- a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java
+++ b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java
@@ -274,6 +274,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
         repairOrder.setDeliveryMethod(repairOrderParam.getDeliveryMethod()); // 收件方式（0=物流快递 1-上门取件 2-送货上门）
         repairOrder.setConsigneeAddressId(repairOrderParam.getConsigneeAddressId()); // 收件地址
         repairOrder.setClientScrapRemark(repairOrderParam.getClientScrapRemark()); // 客户报废备注
+        repairOrder.setOrderStatus(MaintenanceOrderStatusEnum.FINISHED.getStatus());
         repairOrderMapper.updateById(repairOrder);
     }
 
diff --git a/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java b/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java
index ad75abf..648b9ae 100644
--- a/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java
+++ b/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java
@@ -56,6 +56,7 @@ public class RepairOrderDetailVo implements Serializable {
     private EquipmentListVo equipment; //设备信息
     private Integer scrapAddressId; // 报废地址
     private UserAddressListVo scrapAddress; //报废地址信息
+    private String returnCause; //退回原因
     private Integer deliveryMethod; // 收件方式（0=物流快递 1-上门取件 2-送货上门）
     private Long consigneeAddressId; // 收件地址
     private String clientScrapRemark; // 客户报废备注