From 9bc2c103eaf796e724db6d0bb2e550eb3854736f Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 2 Jan 2024 18:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E8=AE=B0=E5=BD=95=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/device/service/impl/EquOrderServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
index 36539536..ae49724d 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
@@ -352,7 +352,9 @@ public class EquOrderServiceImpl implements IEquOrderService {
             // 费用
             BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equOrder.getOrderCode());
             BigDecimal orderCost = equOrder.getOrderCost();
-            equOrder.setOrderCost(sparePartsCost.add(orderCost));
+            if (orderCost!=null) {
+                equOrder.setOrderCost(sparePartsCost.add(orderCost));
+            }
 
             // 保养图片
             if (StringUtils.isNotEmpty(equOrder.getPicturePath())) {