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()); }