From d6eec4bedc26fd823be5afed844d48ac0ecb3cf5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 16:44:10 +0800
Subject: [PATCH] 空指针问题

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 4008094..8fec61b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -116,19 +116,22 @@
             OrderDetails.get(i).setWeight(1.0);
             Map<String,Double> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Double>>(){});
             int finalI = i;
-            otherColumns.forEach((key, value) ->{
-                orderOtherMoneyList.forEach(orderOtherMoney ->{
-                    if(orderOtherMoney.getColumn().equals(key)){
-                        orderOtherMoney.setQuantity (orderOtherMoney.getQuantity()==null?0:orderOtherMoney.getQuantity());
-                        orderOtherMoney.setQuantity(((value==null?0:value)*OrderDetails.get(finalI).getQuantity()));
-                    }
-                });
+            if(otherColumns!=null){
+                otherColumns.forEach((key, value) ->{
+                    orderOtherMoneyList.forEach(orderOtherMoney ->{
+                        if(orderOtherMoney.getColumn().equals(key)){
+                            orderOtherMoney.setQuantity (orderOtherMoney.getQuantity()==null?0:orderOtherMoney.getQuantity());
+                            orderOtherMoney.setQuantity(((value==null?0:value)*OrderDetails.get(finalI).getQuantity()));
+                        }
+                    });
 
-            });
+                });
+            }
         }
 
 
 
+
         //寰�鏄庣粏琛ㄦ彃鏁版嵁
         orderDetailMapper.insertBatch(OrderDetails);
         //寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�

--
Gitblit v1.8.0