Просмотр исходного кода

Merge commit 'b4f929877e4882aca30f1338db2c87c1b7c524ce' into release

# Conflicts:
#	mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
cb4c0d121f
1 измененных файлов: 2 добавлений и 2 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java Просмотреть файл

@@ -44,13 +44,13 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService
record.setId(idWorker.nextId()); 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 wxBillSettle = new WxBillSettle();
wxBillSettle.setId(record.getSettleId()); wxBillSettle.setId(record.getSettleId());
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode());
wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle);
} }
if(record.getBalance() < 0){
if(record.getBalance()!=null && record.getBalance() < 0){
record.setSettleMoney(-record.getSettleMoney()); record.setSettleMoney(-record.getSettleMoney());
} }




Загрузка…
Отмена
Сохранить