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