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

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderCreateVO.java

@@ -1,18 +1,10 @@
 package cc.yunxi.domain.vo.recycleorder.tmorder;
 
-import cc.yunxi.domain.dto.LocationDTO;
-import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailCreateVO;
-import cc.yunxi.enums.ProductWeightEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Future;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @ApiModel(description = "定点回收订单- 指定小区下单 Request VO")
 @Data

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 public class RecycleOrderDetailUpdateVO {
 
     @ApiModelProperty(value = "主键id", required = true)
-    @NotBlank(message = "id不能为空")
+//    @NotBlank(message = "id不能为空")
     private String id;
 
     @ApiModelProperty(value = "废品id", required = true, example = "534658869696135686")

nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java

@@ -56,4 +56,12 @@ public interface IRecycleOrderProductService extends IService<RecycleOrderProduc
      */
     void updateOrderProducts(Collection<RecycleOrderProduct> recycleOrderProducts);
 
+
+    /**
+     * 订单废品批量保存
+     * @param
+     * @return List<RecycleOrderProduct>
+     */
+    void saveOrderProducts(Collection<RecycleOrderProduct> recycleOrderProducts);
+
 }

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

@@ -61,4 +61,10 @@ public class RecycleOrderProductServiceImpl extends ServiceImpl<RecycleOrderProd
     public void updateOrderProducts(Collection<RecycleOrderProduct> recycleOrderProducts) {
         this.updateBatchById(recycleOrderProducts);
     }
+
+
+    @Override
+    public void saveOrderProducts(Collection<RecycleOrderProduct> recycleOrderProducts) {
+        this.saveOrUpdateBatch(recycleOrderProducts);
+    }
 }

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

@@ -404,7 +404,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             rp.setActualRecoveryPrice(recoveryPrice);
         });
         List<RecycleOrderProduct> recycleOrderProducts = BeanUtils.copyList(recycleOrderProductVOList, RecycleOrderProduct.class);
-        this.recycleOrderProductService.updateOrderProducts(recycleOrderProducts);
+        this.recycleOrderProductService.saveOrderProducts(recycleOrderProducts);
 
         // 记录关键信息
         String clientId = recycleOrder.getClientId();