Merge remote-tracking branch 'origin/master'

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-寄售
      */

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;
 }

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;
     /**
      * 价格
      */

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">

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>