From d57083991d3d68a4ecfb7f3edee113ca200cc906 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Mon, 27 May 2024 10:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/OrderServiceImpl.java       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index 4c0343e90..b3db6fb48 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -405,7 +405,7 @@ public class OrderServiceImpl implements OrderService {
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
         validateCustomOrderNoExists(order.get(0).getCustomOrderNo());
 
-        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0),goodsDO,plateGoodDOS);
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
         List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
         orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
 
@@ -421,6 +421,7 @@ public class OrderServiceImpl implements OrderService {
                 .eq(GoodsDO::getOrderId, orderId)
                 .eq(GoodsDO::getDeleted, false));
     }
+
     private Map<String, List<?>> getPlateGoods(List<GoodsDO> goodsLists) {
         Map<String, List<?>> map = new HashMap<>();
         List<PlateGoodDO> plateGoodLists = new ArrayList<>();
@@ -511,12 +512,14 @@ public class OrderServiceImpl implements OrderService {
 
     //    验证自定义单号是否存在
     private void validateCustomOrderNoExists(String customOrderNo) {
-        if (!customOrderNo.isEmpty()) {
-            if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>()
-                    .eq(OrderDO::getCustomOrderNo, customOrderNo)
-                    .eq(OrderDO::getDeleted, false)
-                    .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) {
-                throw exception(CUSTOM_ORDER_EXISTS);
+        if (customOrderNo != null) {
+            if (!customOrderNo.isEmpty()) {
+                if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>()
+                        .eq(OrderDO::getCustomOrderNo, customOrderNo)
+                        .eq(OrderDO::getDeleted, false)
+                        .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) {
+                    throw exception(CUSTOM_ORDER_EXISTS);
+                }
             }
         }
     }
@@ -567,9 +570,9 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void importExcelData(OrderDO orderDO, List<?> list) {
         orderDO.setId((Long) snowFlakeGenerator.nextId(null));
-        System.out.println(excelTypeRealize.changeDate(list,orderDO.getId()));
+        System.out.println(excelTypeRealize.changeDate(list, orderDO.getId()));
 
-        Map<String, List<?>> listMap = excelTypeRealize.changeDate(list,orderDO.getId());
+        Map<String, List<?>> listMap = excelTypeRealize.changeDate(list, orderDO.getId());
         List<RawGoodsDO> rawGoodsDO = (List<RawGoodsDO>) listMap.get("rawGoodsDOS");
         List<GoodsDO> goodsDO = (List<GoodsDO>) listMap.get("goodsDOS");
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) listMap.get("plateGoodDOS");
@@ -580,7 +583,7 @@ public class OrderServiceImpl implements OrderService {
         List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("orderItemDOS");
         List<OrderModelDO> orderModelDOS = (List<OrderModelDO>) listMap.get("orderModelDOS");
         validateCustomOrderNoExists(orderDO.getCustomOrderNo());
-        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO,goodsDO,plateGoodDOS);
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
         orderInputProcessor.batchSaveModel(orderModelDOS);
 //        System.out.println("plateDO = " + plateDO+ " BeanUtils.toBean(plateDetail, OrderModelDO.class) = " + orderModelDOS);