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