Explorar el Código

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter hace 1 año
padre
commit
e1eadab2f6
Se han modificado 1 ficheros con 3 adiciones y 1 borrados
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Ver fichero

@@ -290,7 +290,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
FinanceSetOffDetailVo dv = new FinanceSetOffDetailVo();
dv.setAdvanceId(advance.getId());
BigDecimal billSetOff = null;//账单历史抵扣
if (StringUtils.isBlank(bill.getSetOff())) {
if (StringUtils.isNotBlank(bill.getSetOff())) {
billSetOff = new BigDecimal(bill.getSetOff());
}else {
billSetOff = b0;
@@ -310,6 +310,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
dv.setSetoff(remain.toPlainString());
setoffList.add(dv);
bill.setSetOffDetailList(setoffList);
calcuteDto.setCurrentIndex(calcuteDto.getCurrentIndex()+1);
setSetOff(bill,calcuteDto);
}else {
bill.setSetOff(billSetOff.add(owe).toPlainString());
@@ -318,6 +319,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
dv.setSetoff(owe.toPlainString());
setoffList.add(dv);
bill.setSetOffDetailList(setoffList);
break;
}
}else {
calcuteDto.setCurrentIndex(calcuteDto.getCurrentIndex()+1);


Cargando…
Cancelar
Guardar