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-寄售 */ 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; } 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 @@ + 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}