From cb4c0d121fee6f67c3d8723fda8acaa29482eda6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 11:48:40 +0800 Subject: [PATCH] Merge commit 'b4f929877e4882aca30f1338db2c87c1b7c524ce' into release # Conflicts: # mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java --- .../iformall/service/impl/WxBillSettleRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java index ab06c0019..1402be3f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -44,13 +44,13 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService record.setId(idWorker.nextId()); //清算完成 - if(record.getSettleMoney().intValue() == abs(record.getBalance().intValue())){ + if(record.getSettleMoney()!= null && record.getBalance()!=null && record.getSettleMoney().intValue() == abs(record.getBalance().intValue())){ WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(record.getSettleId()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); } - if(record.getBalance() < 0){ + if(record.getBalance()!=null && record.getBalance() < 0){ record.setSettleMoney(-record.getSettleMoney()); }