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