From 5a09d15ee9e3a618368956c3c911e2b3dd5ce88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Sat, 9 Mar 2024 16:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91v7=20-=20=E8=AE=A2=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=A5=E5=8D=95=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/yunxi/domain/po/RecycleOrder.java | 13 ++++++++++--- .../vo/recycleorder/RecycleOrderFinishVO.java | 3 --- .../RecycleOrderDetailCreateVO.java | 5 +++-- .../RecycleOrderDetailUpdateVO.java | 3 ++- .../yunxi/service/impl/RecycleOrderServiceImpl.java | 6 ++++++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java index d96032f..a643f45 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java @@ -84,8 +84,7 @@ public class RecycleOrder { @TableField("staffs_name") private String staffsName; - - @ApiModelProperty("订单创建时间") + @ApiModelProperty("下单时间") @TableField("f_creator_time") private LocalDateTime creatorTime; @@ -109,10 +108,18 @@ public class RecycleOrder { // @TableField("consult_time_end") // private LocalDateTime consultTimeEnd; - @ApiModelProperty("收货时间") + @ApiModelProperty("接单时间") @TableField("receive_time") private LocalDateTime receiveTime; + @ApiModelProperty("到达时间") + @TableField("arrival_time") + private LocalDateTime arrivalTime; + + @ApiModelProperty("完成时间") + @TableField("complete_time") + private LocalDateTime completeTime; + @ApiModelProperty("结算时间") @TableField("settle_time") private LocalDateTime settleTime; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderFinishVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderFinishVO.java index 2af715b..b317d7a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderFinishVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderFinishVO.java @@ -19,9 +19,6 @@ public class RecycleOrderFinishVO { @NotBlank(message = "回收订单id不能为空") private String id; - @ApiModelProperty(value = "收货时间", required = true, example = "2024-03-09 14:59:00") - private LocalDateTime receiveTime; - @ApiModelProperty(value = "回收员id", hidden = true, example = "533242995646951684") private String staffsId; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java index b836624..7e6da42 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Digits; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -27,11 +28,11 @@ public class RecycleOrderDetailCreateVO { private String productName; @ApiModelProperty(value = "商品预估重量", required = true) - @NotBlank(message = "商品预估重量不能为空") + @NotNull(message = "商品预估重量不能为空") private ProductWeightEnum productWeight; @ApiModelProperty(value = "下单时回收单价", required = true) - @NotBlank(message = "下单时回收单价不能为空") + @NotNull(message = "下单时回收单价不能为空") @DecimalMin(value = "0.01", message = "下单时回收单价数值错误") private BigDecimal recoveryPrice; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java index a9e1271..f88ce36 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -23,7 +24,7 @@ public class RecycleOrderDetailUpdateVO { private String productId; @ApiModelProperty(value = "商品实际重量", required = true, example = "1.08") - @NotBlank(message = "商品实际重量不能为空") + @NotNull(message = "商品实际重量不能为空") @DecimalMin(value = "0.00", message = "商品实际重量数值错误") private Double productActualWeight; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index b2fbdf1..aeb729d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -110,6 +110,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl