From 8925cead44fee678be5096dea20427d0b305dab2 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 25 Sep 2021 09:00:11 +0800
Subject: [PATCH] bug123

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 6afdad3..9cfeec1 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -1026,8 +1026,8 @@
         }
 
         sourceOrder.setArrears(sourceOrder.getArrears() - refundTotal);
-        sourceOrder.setCardPay(sourceOrder.getCardPay() + cardPayTotal);
-        sourceOrder.setCashPay(sourceOrder.getCashPay() + cashPayTotal);
+        sourceOrder.setCardPay(sourceOrder.getCardPay()==null?0:sourceOrder.getCardPay() + cardPayTotal);
+        sourceOrder.setCashPay(sourceOrder.getCashPay()==null?0:sourceOrder.getCashPay() + cashPayTotal);
         sysOrderDao.update(sourceOrder);
     }
 

--
Gitblit v1.9.1