From 24681c81c09022f584a57006f2534b5f74723414 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 30 六月 2026 09:27:31 +0800
Subject: [PATCH] 初始化项目
---
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
index 8f123f8..e2edb15 100644
--- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
+++ b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -162,6 +163,7 @@
throw exception(PAY_TRANSFER_NOT_FOUND);
}
if (PayTransferStatusEnum.isProcessing(transfer.getStatus())) { // 濡傛灉宸茬粡鏄浆璐︿腑锛岀洿鎺ヨ繑鍥烇紝涓嶇敤閲嶅鏇存柊
+ updateChannelPackageInfoIfAbsent(transfer, notify);
log.info("[notifyTransferProgressing][transfer({}) 宸茬粡鏄浆璐︿腑鐘舵�侊紝鏃犻渶鏇存柊]", transfer.getId());
return;
}
@@ -175,11 +177,35 @@
new PayTransferDO().setStatus(PayTransferStatusEnum.PROCESSING.getStatus())
.setChannelPackageInfo(notify.getChannelPackageInfo()));
if (updateCounts == 0) {
+ PayTransferDO latestTransfer = transferMapper.selectById(transfer.getId());
+ if (latestTransfer != null && PayTransferStatusEnum.isProcessing(latestTransfer.getStatus())) {
+ updateChannelPackageInfoIfAbsent(latestTransfer, notify);
+ log.info("[notifyTransferProgressing][transfer({}) 宸茶骞跺彂鏇存柊涓鸿浆璐︿腑鐘舵�侊紝鏃犻渶閲嶅鏇存柊]",
+ transfer.getId());
+ return;
+ }
throw exception(PAY_TRANSFER_NOTIFY_FAIL_STATUS_IS_NOT_WAITING);
}
log.info("[notifyTransferProgressing][transfer({}) 鏇存柊涓鸿浆璐﹁繘琛屼腑鐘舵�乚", transfer.getId());
}
+ /**
+ * 琛ュ厖娓犻亾 package 淇℃伅锛氬鐞嗗悓姝ヤ换鍔″厛鏇存柊涓鸿浆璐︿腑锛屽彂璧疯浆璐︽帴鍙ｅ悗杩斿洖 channelPackageInfo 鐨勫満鏅�
+ *
+ * @see <a href="https://github.com/YunaiV/ruoyi-vue-pro/issues/1144">Issue #1144</a>
+ */
+ private void updateChannelPackageInfoIfAbsent(PayTransferDO transfer, PayTransferRespDTO notify) {
+ if (StrUtil.isBlank(notify.getChannelPackageInfo())
+ || StrUtil.isNotBlank(transfer.getChannelPackageInfo())) {
+ return;
+ }
+ int updateCount = transferMapper.updateChannelPackageInfoIfAbsent(transfer.getId(),
+ notify.getChannelPackageInfo());
+ if (updateCount > 0) {
+ log.info("[updateChannelPackageInfoIfAbsent][transfer({}) 琛ュ厖娓犻亾 package 淇℃伅]", transfer.getId());
+ }
+ }
+
private void notifyTransferSuccess(PayChannelDO channel, PayTransferRespDTO notify) {
// 1. 鏍￠獙鐘舵��
PayTransferDO transfer = transferMapper.selectByAppIdAndNo(channel.getAppId(), notify.getOutTransferNo());
--
Gitblit v1.9.3