Explorar el Código

Merge commit 'b4f929877e4882aca30f1338db2c87c1b7c524ce' into release

# Conflicts:
#	mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
release_toaliyun_real
luozukai hace 6 años
padre
commit
cb4c0d121f
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  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 Ver fichero

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



Cargando…
Cancelar
Guardar