diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java index 7c70cd272..b09d2e219 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java @@ -346,12 +346,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer salesmen=oldSettleBill.getSalesmen(); } - // 更新状态 - emisSettleBillPayLog.setPaid(1); - emisSettleBillPayLog.setStatus(20); - emisSettleBillPayLog.setStatusDesc(errMsg); - emisSettleBillPayLog.setPaySuccTime(new Date()); - emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLog); + // 获取支付账单,转为为真实支付单 EmisSettlePayRecord emisSettlePayRecord=new EmisSettlePayRecord(); @@ -397,6 +392,13 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer emisSettlePayRecordService.insertEmisSettlePayRecord(emisSettlePayRecord,emisSettleBillPayLog.getPayId()); + // 更新状态 + emisSettleBillPayLog.setPaid(1); + emisSettleBillPayLog.setStatus(20); + emisSettleBillPayLog.setStatusDesc(errMsg); + emisSettleBillPayLog.setPaySuccTime(new Date()); + emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLog); + try { // 通知销售联系人 String msg = payMan + ":在线支付账单运费成功,支付金额:" + emisSettlePayRecord.getPayMoney().stripTrailingZeros().toPlainString() + ",账单号:" + oldSettleBill.getSettleBillNo(); 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 2009df0ae..51159abe8 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 @@ -150,7 +150,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I String settleBillNo = settleBillNoArr[i]; if(!StringUtils.isEmpty(settleBillNo)) { EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo); - if(!"1".equals(emisSettleBill.getBlConfirmSite()) ){ + if( + !"1".equals(emisSettleBill.getBlConfirmSite()) + && !"7".equals(emisSettlePayRecord.getPayType()) ){ throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认,不允许收款!"); } }