From 4e14c20928c11f9e978cd13f8a544c02b8d064cd Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Fri, 11 Mar 2022 14:24:20 +0800
Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/base/springcloud/service/imp/BillServiceImp.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
index 552f80b..850c2f0 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
@@ -67,7 +67,8 @@ public class BillServiceImp implements BillService {
 		BigDecimal orderAmount = new BigDecimal(0);
 		List<String> billIdList = new ArrayList<>();
 		for (SaleBill bill : billAmountList){
-			if(bill.getPayAmount().compareTo(bill.getTotalAmount()) >= 0)
+			BigDecimal payAmount = Optional.ofNullable(bill.getPayAmount()).orElse(BigDecimal.ZERO);
+			if(payAmount.compareTo(bill.getTotalAmount()) >= 0)
 				continue;
 			billIdList.add(bill.getId());
 			orderAmount = orderAmount.add(bill.getTotalAmount());