From a7a11c8bde41f13ce5b13ad26ec9bdd1495a8011 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: Tue, 2 Apr 2024 09:33:16 +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=8Dv7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/recycleorder/tmorder/TMRecycleOrderCreateVO.java   | 8 --------
 .../vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java | 2 +-
 .../cc/yunxi/service/IRecycleOrderProductService.java     | 8 ++++++++
 .../service/impl/RecycleOrderProductServiceImpl.java      | 6 ++++++
 .../cc/yunxi/service/impl/RecycleOrderServiceImpl.java    | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderCreateVO.java
index 7a54511..c72c919 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/tmorder/TMRecycleOrderCreateVO.java
+++ b/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
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 75eb2cc..c83011f 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
@@ -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")
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java
index 83f4376..d8b95bb 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleOrderProductService.java
+++ b/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);
+
 }
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java
index 43872dc..79d0fda 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderProductServiceImpl.java
+++ b/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);
+    }
 }
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 e52ebd5..9783dad 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
@@ -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();