| @@ -877,11 +877,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| while (receivePayWayList.size() > 0 ) { | while (receivePayWayList.size() > 0 ) { | ||||
| WxFinanceReceivePayway payway = receivePayWayList.get(0); | WxFinanceReceivePayway payway = receivePayWayList.get(0); | ||||
| //能够覆盖账单金额 | //能够覆盖账单金额 | ||||
| if (moneyDecimal.compareTo(new BigDecimal(payway.getReceive())) <= 0 ) { | |||||
| if (moneyDecimal.compareTo(new BigDecimal(payway.getPay())) <= 0 ) { | |||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,null,moneyDecimal.toPlainString(),payway.getPayWay()); | createFinanceReceiveBill(addreceive,bill,null,moneyDecimal.toPlainString(),payway.getPayWay()); | ||||
| sb.append(payway.getPayWayName()).append("付款").append(moneyDecimal.toPlainString()).append(","); | sb.append(payway.getPayWayName()).append("付款").append(moneyDecimal.toPlainString()).append(","); | ||||
| BigDecimal remain = new BigDecimal(payway.getReceive()).subtract(moneyDecimal); | |||||
| BigDecimal remain = new BigDecimal(payway.getPay()).subtract(moneyDecimal); | |||||
| if (remain.compareTo(new BigDecimal(0))==0) { | if (remain.compareTo(new BigDecimal(0))==0) { | ||||
| receivePayWayList.remove(0); | receivePayWayList.remove(0); | ||||
| }else { | }else { | ||||
| @@ -890,10 +890,10 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| return; | return; | ||||
| }else { | }else { | ||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,null,payway.getReceive(),payway.getPayWay()); | |||||
| sb.append(payway.getPayWayName()).append("付款").append(payway.getReceive()).append(","); | |||||
| createFinanceReceiveBill(addreceive,bill,null,payway.getPay(),payway.getPayWay()); | |||||
| sb.append(payway.getPayWayName()).append("付款").append(payway.getPay()).append(","); | |||||
| receivePayWayList.remove(0); | receivePayWayList.remove(0); | ||||
| moneyDecimal = moneyDecimal.subtract(new BigDecimal(payway.getReceive())); | |||||
| moneyDecimal = moneyDecimal.subtract(new BigDecimal(payway.getPay())); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||