From 6a927d509396626210da60a8851f74e5d09aef0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com>
Date: Sun, 20 Apr 2025 10:46:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java   | 5 +++++
 tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml  | 1 +
 tmerclub-order/src/main/resources/mapper/OrderMapper.xml     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
index e46c92f..e65b1a4 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
@@ -42,6 +42,11 @@ public class CueOrderVO extends BaseVO implements Serializable {
      */
     @Schema(description = "商品名称")
     private String productName;
+    /**
+     * 商品图片
+     */
+    @Schema(description = "商品图片")
+    private String productImages;
     /**
      * 价格
      */
diff --git a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
index 1bb60a0..d5ffbdb 100644
--- a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
+++ b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
@@ -30,6 +30,7 @@
         <result property="finallyTime" column="finally_time"/>
         <result property="mallOrderId" column="mall_order_id"/>
         <result property="sendNumber" column="send_number"/>
+        <result property="productImages" column="product_images"/>
     </resultMap>
 
     <sql id="Vo_Column_List">
diff --git a/tmerclub-order/src/main/resources/mapper/OrderMapper.xml b/tmerclub-order/src/main/resources/mapper/OrderMapper.xml
index dbd53f3..c92884d 100644
--- a/tmerclub-order/src/main/resources/mapper/OrderMapper.xml
+++ b/tmerclub-order/src/main/resources/mapper/OrderMapper.xml
@@ -1344,7 +1344,7 @@
         update
             `order`
         set
-            `cue_order` = #{status}
+            `status` = #{status}
         where
             order_id = #{orderId}
     </update>

From 772efaaa3d00ac3054dcbc2a739dbe949cc68199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com>
Date: Sun, 20 Apr 2025 10:59:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/cuerecycle/model/dto/CueSaveMailingDTO.java        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueSaveMailingDTO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueSaveMailingDTO.java
index 391aceb..b96a1d9 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueSaveMailingDTO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueSaveMailingDTO.java
@@ -33,9 +33,4 @@ public class CueSaveMailingDTO implements Serializable {
      */
     @NotEmpty(message = "寄出单号不能为空")
     private String sendNumber;
-    /**
-     * 订单状态
-     */
-    @NotNull(message = "订单状态不能为空")
-    private Integer orderStatus;
 }

From 7523b5e88f95a83fa4ff9e7de7346a6b419ac05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com>
Date: Sun, 20 Apr 2025 11:16:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
index cab535f..c6570c5 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
@@ -21,11 +21,6 @@ public class CueAgreeOrderDTO implements Serializable {
      */
     @NotNull(message = "订单ID不能为空")
     private Long orderId;
-    /**
-     * 地址ID
-     */
-    @NotNull(message = "地址ID不能为空")
-    private Long addrId;
     /**
      * 类型：1-回收，2-置换，3-寄售
      */