aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-07-22 15:55:40 +08:00
parent e28f8c8653
commit a2e386cda8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java
View File

@ -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();

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -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,"业务账单未确认，不允许收款！");
}
}