diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index 752bbff84..bf2993e3d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -110,6 +110,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I throw new EmisBizError(EmisBizErrorType.FAIL,"账单编号不能为空"); } + + // || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getPayMoney()) == 0 if("1".equals(emisSettlePayRecord.getRecType())) { if (emisSettlePayRecord.getPayMoney() == null ) { @@ -129,6 +131,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认,不允许收款!"); } + // 多账单合并收款 + String [] settleBillNoArr = WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()).split(","); + // 不重复的 id流水号 String payId= WaybillHelper.genPayId(); emisSettlePayRecord.setPayId(payId); @@ -142,10 +147,15 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 插入账单和支付单关联关系 - EmisSettlePayBillRel emisSettlePayBillRel=new EmisSettlePayBillRel(); - emisSettlePayBillRel.setPayId(payId); - emisSettlePayBillRel.setSettleBillNo(emisSettlePayRecord.getSettleBillNo()); - emisSettlePayBillRelMapper.insertEmisSettlePayBillRel(emisSettlePayBillRel); + for(int i=0;i listRel=emisSettlePayRecord.getPayRelList(); @@ -167,8 +177,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I emisSettlePayRecordMapper.insertEmisSettlePayRecord(emisSettlePayRecord); // 重新计算账单收款信息 - emisSettleBillService.reCalcSettleBillPayStatus(emisSettlePayRecord.getSettleBillNo()); - + for(int i=0;i