feat: 付款结果回写支持指定付款单据号并按金蝶单据号查询
This commit is contained in:
刘泉佳
+5
-2
@@ -33,6 +33,7 @@ import org.springblade.transport.constant.HcsSyncConstant;
|
||||
import org.springblade.transport.listener.KingdeeApprovalSyncListener;
|
||||
import org.springblade.transport.pojo.dto.PaymentApplicationSaveRequest;
|
||||
import org.springblade.transport.pojo.dto.PaymentApplicationStatusRequest;
|
||||
import org.springblade.transport.pojo.dto.PaymentApplicationSyncResultRequest;
|
||||
import org.springblade.transport.pojo.entity.PaymentApplication;
|
||||
import org.springblade.transport.pojo.vo.PaymentApplicationReferenceAmountVO;
|
||||
import org.springblade.transport.pojo.vo.PaymentApplicationVO;
|
||||
@@ -142,6 +143,8 @@ public class PaymentApplicationController extends BladeController {
|
||||
}
|
||||
@PostMapping("/sync-kingdee-result")
|
||||
@ApiOperationSupport(order = 12)
|
||||
@Operation(summary = "手动回写金蝶付款结果（A103-2/A103-4）")
|
||||
public R<String> syncKingdeeResult() { return R.data(paymentApplicationService.syncKingdeePaymentResult()); }
|
||||
@Operation(summary = "手动回写金蝶付款结果（A103-2/A103-4），可指定付款单据号")
|
||||
public R<String> syncKingdeeResult(@RequestBody(required = false) PaymentApplicationSyncResultRequest request) {
|
||||
return R.data(paymentApplicationService.syncKingdeePaymentResult(request == null ? null : request.getPaymentNos()));
|
||||
}
|
||||
}
|
||||
|
||||
+4
-2
@@ -101,11 +101,13 @@ public interface IPaymentApplicationService extends BaseService<PaymentApplicati
|
||||
void unlockBill(Long id, String source);
|
||||
|
||||
/**
|
||||
* 定时回写金蝶付款结果（A103-2 付款申请单查询 / A103-4 付款处理查询）
|
||||
* 回写金蝶付款结果（A103-2 付款申请单查询 / A103-4 付款处理查询）：
|
||||
* 指定付款单据号时按金蝶单据号（billno）精确查询并仅回写指定单据，为空时回写全部待回写单据
|
||||
*
|
||||
* @param paymentNos 付款单据号列表，为空回写全部待回写单据
|
||||
* @return 执行摘要
|
||||
*/
|
||||
String syncKingdeePaymentResult();
|
||||
String syncKingdeePaymentResult(List<String> paymentNos);
|
||||
|
||||
/**
|
||||
* 回写单笔付款申请的金蝶付款申请单查询结果（A103-2），单据级事务
|
||||
|
||||
+42
-11
@@ -949,33 +949,41 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
|
||||
}
|
||||
|
||||
@Override
|
||||
public String syncKingdeePaymentResult() {
|
||||
public String syncKingdeePaymentResult(List<String> paymentNos) {
|
||||
return kingdeeSyncLockSupport.runSingleFlight(PAY_RESULT_SYNC_LOCK_PREFIX, bfiProperties.getPayResult().getLockLeaseSeconds(),
|
||||
"金蝶付款结果回写", this::executePaymentResultSync);
|
||||
"金蝶付款结果回写", () -> this.executePaymentResultSync(paymentNos));
|
||||
}
|
||||
|
||||
/**
|
||||
* 金蝶付款结果回写主体，由 {@link #syncKingdeePaymentResult()} 在分布式锁保护下调用，执行流程：
|
||||
* 金蝶付款结果回写主体，由 {@link #syncKingdeePaymentResult(List)} 在分布式锁保护下调用，执行流程：
|
||||
* <pre>
|
||||
* ① 圈定待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询），
|
||||
* 生成失败单据一并纳入：金蝶侧已生成说明上次推送实际成功（如下推超时但远端已落单、本地事务回滚），
|
||||
* 手动指定付款单据号（paymentNos）时仅回写指定单据；生成失败单据一并纳入：
|
||||
* 金蝶侧已生成说明上次推送实际成功（如下推超时但远端已落单、本地事务回滚），
|
||||
* 查得即回填纠正为已生成，避免人工重推产生重复单据，未查得则保持生成失败等待人工重推；
|
||||
* ② A103-2 付款申请单查询回填：按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改一条，
|
||||
* ② A103-2 付款申请单查询回填：指定单据号时按金蝶单据号（billno）精确查询（无金蝶单据号兜底按来源单号），
|
||||
* 定时全量回写按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改一条，
|
||||
* 回填金蝶单号/内码/同步状态/已付金额并联动预结算与正式结算付款记录；连续两轮查询未命中按金蝶反审核删除解锁；
|
||||
* ③ A103-4 付款处理查询补付款记录：付款中/已付款单据 + 已付款无付款记录单据（补偿），
|
||||
* 按付款组织 + awrp_sourcebillno（金蝶单据号）数组精确查询，双键勾稽后回填付款记录；
|
||||
* ④ 汇总执行摘要：各计数随流程累计，单笔失败仅计数不中断整轮
|
||||
* </pre>
|
||||
*
|
||||
* @param paymentNos 付款单据号列表，为空回写全部待回写单据
|
||||
* @return 执行摘要
|
||||
*/
|
||||
private String executePaymentResultSync() {
|
||||
// ① 待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询）
|
||||
private String executePaymentResultSync(List<String> paymentNos) {
|
||||
// ① 待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询），
|
||||
// 手动指定付款单据号时仅圈定指定单据
|
||||
List<PaymentApplication> applications = list(Wrappers.<PaymentApplication>lambdaQuery()
|
||||
.eq(PaymentApplication::getApprovalStatus, TransportBusiConstant.APPROVED)
|
||||
.in(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED,
|
||||
KingdeeBfiConstant.KINGDEE_STATUS_PAYING, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
|
||||
.in(Func.isNotEmpty(paymentNos), PaymentApplication::getPaymentNo, paymentNos)
|
||||
.orderByAsc(PaymentApplication::getId));
|
||||
if (Func.isNotEmpty(paymentNos)) {
|
||||
log.info("手动回写金蝶付款结果, 指定付款单据号: {}, 圈定待回写单据 {} 笔", paymentNos, applications.size());
|
||||
}
|
||||
// 自代理：applyPayApplyResult/applyPayBillRecord 带单据级事务，跨方法调用确保注解生效，单笔失败仅回滚自身
|
||||
IPaymentApplicationService self = SpringUtil.getBean(IPaymentApplicationService.class);
|
||||
int updated = 0;
|
||||
@@ -983,11 +991,17 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
|
||||
int paidCount = 0;
|
||||
Map<String, BfiPayApplyVO> payApplyMap = new HashMap<>();
|
||||
if (!applications.isEmpty()) {
|
||||
// ② A103-2 付款申请单查询：按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改的一条
|
||||
List<String> paymentNos = applications.stream()
|
||||
// ② A103-2 付款申请单查询：指定单据号时按金蝶单据号（billno）精确查询，无金蝶单据号的兜底按来源单号查询；
|
||||
// 定时全量回写按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改的一条
|
||||
List<String> billNos = applications.stream()
|
||||
.map(PaymentApplication::getKingdeeBillNo).filter(Func::isNotEmpty).distinct().toList();
|
||||
List<String> fallbackSrcCodes = applications.stream()
|
||||
.filter(application -> Func.isEmpty(application.getKingdeeBillNo()))
|
||||
.map(PaymentApplication::getPaymentNo).filter(Func::isNotEmpty).distinct().toList();
|
||||
this.batchForeach(paymentNos, PAY_RESULT_QUERY_BATCH, batch ->
|
||||
payApplyMap.putAll(this.latestPayApplyBySrcCode(this.queryPayApplyPages(batch))));
|
||||
this.batchForeach(billNos, PAY_RESULT_QUERY_BATCH,
|
||||
batch -> payApplyMap.putAll(this.latestPayApplyBySrcCode(this.queryPayApplyPagesByBillNo(batch))));
|
||||
this.batchForeach(fallbackSrcCodes, PAY_RESULT_QUERY_BATCH,
|
||||
batch -> payApplyMap.putAll(this.latestPayApplyBySrcCode(this.queryPayApplyPages(batch))));
|
||||
// 逐单回写：查得即回填并清零消失计数；未查得累计消失轮次（批次其余单据正常返回，排除服务整体故障）
|
||||
for (PaymentApplication application : applications) {
|
||||
BfiPayApplyVO payApply = payApplyMap.get(application.getPaymentNo());
|
||||
@@ -1195,6 +1209,23 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* A103-2 分页查询：金蝶单据号批量精确查询（手动指定付款单据号回写场景），自动翻页。
|
||||
* 按金蝶单据号查询时不传来源单据号（awrp_src_code），单据号在金蝶侧全局唯一
|
||||
*
|
||||
* @param billNos 金蝶单据号批次
|
||||
* @return 付款申请单列表
|
||||
*/
|
||||
private List<BfiPayApplyVO> queryPayApplyPagesByBillNo(List<String> billNos) {
|
||||
BfiPayApplyQueryDTO param = new BfiPayApplyQueryDTO();
|
||||
param.setBillno(billNos);
|
||||
return BfiUtil.queryAllPages(pageNo -> {
|
||||
param.setPageNo(pageNo);
|
||||
param.setPageSize(PAY_RESULT_PAGE_SIZE);
|
||||
return bfiService.queryPayApply(param);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* A103-2 幂等预检：按来源单号查询金蝶付款申请单是否已生成，同一来源单号取最近修改的一条。
|
||||
* 用于正式付款链路恢复场景：财务应付单已生成说明上次同步可能已保存成功而在下推/落库环节中断，
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ public class PaymentKingdeeResultTask {
|
||||
}
|
||||
// ① A103-2/A103-4 付款结果回写
|
||||
try {
|
||||
String summary = paymentApplicationService.syncKingdeePaymentResult();
|
||||
String summary = paymentApplicationService.syncKingdeePaymentResult(null);
|
||||
log.info("定时回写金蝶付款结果：{}", summary);
|
||||
} catch (Exception exception) {
|
||||
log.error("定时回写金蝶付款结果异常", exception);
|
||||
|
||||
Reference in New Issue
Block a user