定点、到站回收订单业务功能bug问题修复v11

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)

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<RecycleOrderDetailUpdateVO> orderDetails;
+    private List<RecycleOrderDetailSaveVO> orderDetails;
 
     @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门")
     private String remark;

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;
 

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java

@@ -274,7 +274,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
 
         // 创建订单明细
         String orderId = recycleOrder.getId();
-        List<RecycleOrderDetailUpdateVO> recycleOrderProductVOList = dzOrderCreateVO.getOrderDetails();
+        List<RecycleOrderDetailSaveVO> recycleOrderProductVOList = dzOrderCreateVO.getOrderDetails();
         List<RecycleOrderProduct> recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class);
         recycleOrderProducts.forEach(rp -> {
             rp.setRecycleOrderId(orderId);