From 801942c0bf040893a6e9057bd33c6c0ae7319f25 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: Wed, 3 Apr 2024 13:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=82=B9=E3=80=81=E5=88=B0=E7=AB=99?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BDbug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8Dv11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java | 2 +- .../domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java | 3 ++- .../domain/vo/recycleorderdetail/RecycleOrderDetailSaveVO.java | 2 +- .../java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java index ce1b20e..3eefa78 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java @@ -42,7 +42,7 @@ public class ClientAddressReqVO { private String receiveStreet; @ApiModelProperty(value = "门牌号",required = true) - @NotBlank(message = "门牌号不能为空", groups = AddAddressGroup.class) +// @NotBlank(message = "门牌号不能为空", groups = AddAddressGroup.class) private String receiveHouseNumber; @ApiModelProperty(value = "位置信息",required = true) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java index 92aa036..a1443ee 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java @@ -1,5 +1,6 @@ package cc.yunxi.domain.vo.recycleorder.dzorder; +import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailSaveVO; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailUpdateVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,7 +21,7 @@ public class DZRecycleOrderCreateVO { @ApiModelProperty(value = "订单明细", required = true) @NotNull(message = "订单明细未提交") @Valid - private List orderDetails; + private List orderDetails; @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门") private String remark; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailSaveVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailSaveVO.java index 69d9dbd..47c6107 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailSaveVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailSaveVO.java @@ -25,7 +25,7 @@ public class RecycleOrderDetailSaveVO { private Double productActualWeight; @ApiModelProperty(value = "当前回收单价", required = true, example = "100.00") -// @NotBlank(message = "当前回收单价不能为空") + @NotNull(message = "当前回收单价不能为空") @DecimalMin(value = "0.01", message = "当前回收单价数值错误") private BigDecimal recoveryPrice; 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 b8e2ce3..4d8343f 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 @@ -274,7 +274,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProductVOList = dzOrderCreateVO.getOrderDetails(); + List recycleOrderProductVOList = dzOrderCreateVO.getOrderDetails(); List recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class); recycleOrderProducts.forEach(rp -> { rp.setRecycleOrderId(orderId);