| @@ -634,7 +634,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| //能够覆盖账单金额 | //能够覆盖账单金额 | ||||
| if (moneyDecimal.compareTo(new BigDecimal(payway.getReceive())) <= 0 ) { | if (moneyDecimal.compareTo(new BigDecimal(payway.getReceive())) <= 0 ) { | ||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,moneyDecimal.toPlainString(),null,payway.getId()); | |||||
| createFinanceReceiveBill(addreceive,bill,moneyDecimal.toPlainString(),null,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.getReceive()).subtract(moneyDecimal); | ||||
| if (remain.compareTo(new BigDecimal(0))==0) { | if (remain.compareTo(new BigDecimal(0))==0) { | ||||
| @@ -645,7 +645,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| break; | break; | ||||
| }else { | }else { | ||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,payway.getReceive(),null,payway.getId()); | |||||
| createFinanceReceiveBill(addreceive,bill,payway.getReceive(),null,payway.getPayWay()); | |||||
| sb.append(payway.getPayWayName()).append("收款").append(payway.getReceive()).append(","); | sb.append(payway.getPayWayName()).append("收款").append(payway.getReceive()).append(","); | ||||
| receivePayWayList.remove(i); | receivePayWayList.remove(i); | ||||
| BigDecimal needlat = moneyDecimal.subtract(new BigDecimal(payway.getReceive())); | BigDecimal needlat = moneyDecimal.subtract(new BigDecimal(payway.getReceive())); | ||||
| @@ -880,7 +880,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| //能够覆盖账单金额 | //能够覆盖账单金额 | ||||
| if (moneyDecimal.compareTo(new BigDecimal(payway.getReceive())) <= 0 ) { | if (moneyDecimal.compareTo(new BigDecimal(payway.getReceive())) <= 0 ) { | ||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,null,moneyDecimal.toPlainString(),payway.getId()); | |||||
| 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.getReceive()).subtract(moneyDecimal); | ||||
| if (remain.compareTo(new BigDecimal(0))==0) { | if (remain.compareTo(new BigDecimal(0))==0) { | ||||
| @@ -891,7 +891,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| break; | break; | ||||
| }else { | }else { | ||||
| //创建一个实收款单关联 | //创建一个实收款单关联 | ||||
| createFinanceReceiveBill(addreceive,bill,null,payway.getReceive(),payway.getId()); | |||||
| createFinanceReceiveBill(addreceive,bill,null,payway.getReceive(),payway.getPayWay()); | |||||
| sb.append(payway.getPayWayName()).append("付款").append(payway.getReceive()).append(","); | sb.append(payway.getPayWayName()).append("付款").append(payway.getReceive()).append(","); | ||||
| receivePayWayList.remove(i); | receivePayWayList.remove(i); | ||||
| BigDecimal needlat = moneyDecimal.subtract(new BigDecimal(payway.getReceive())); | BigDecimal needlat = moneyDecimal.subtract(new BigDecimal(payway.getReceive())); | ||||