sczx_group/sczx_singlepay
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sczx_group:27f5576aa28d6f8b787df8aa7bbdcbaca262f24e
Branches Tags
sczx_group:main sczx_group:zhangli-test
...
compare: sczx_group:0988d548cdf7964412143957369fb924e0f70da7
Branches Tags
sczx_group:main sczx_group:zhangli-test

2 Commits
27f5576aa2 ... 0988d548cd

Author SHA1 Message Date
zhangli
0988d548cd 修改合并错误 2025-09-25 15:34:31 +08:00
zhangli
f7472da77d 退款增加判断 2025-09-25 15:28:58 +08:00
2 changed files with 48 additions and 45 deletions
Expand all files Collapse all files

11
src/main/java/com/sczx/pay/service/WechatPayService.java
View File

@ -293,10 +293,13 @@ public class WechatPayService {
/**
* 记录退款信息到数据库
*/
private void recordRefundInfo(RefundRequest request, CompanyWechatConfig companyConfig, Map<String, String> result,BigDecimal totalFee) {
private void recordRefundInfo(RefundRequest request, CompanyWechatConfig companyConfig, Map<String, String> result, BigDecimal totalFee) {
try {
RefundRecord refundRecord = refundRecordMapper.getRefundRecordByOutRefundNo(request.getOutRefundNo());
if (refundRecord == null) {
if (refundRecord != null) {
logger.warn("已存在对应的退款记录，退款单号: {}", request.getOutRefundNo());
return;
}
refundRecord = new RefundRecord();
refundRecord.setCompanyId(request.getCompanyId());
refundRecord.setOutTradeNo(request.getOutTradeNo());
@ -318,9 +321,7 @@ public class WechatPayService {
refundRecordMapper.insertRefundRecord(refundRecord);
logger.info("退款记录已保存，退款单号: {}", request.getOutRefundNo());
} else{
logger.info("退款记录已存在，退款单号: {}", request.getOutRefundNo());
}
} catch (Exception e) {
logger.error("保存退款记录异常，退款单号: {}", request.getOutRefundNo(), e);

12
src/main/java/com/sczx/pay/service/impl/AlipayServiceImpl.java
View File

@ -606,9 +606,12 @@ public class AlipayServiceImpl implements AlipayService {
*/
private void recordRefundInfo(AlipayRefundRequest request) {
try {
RefundRecord refundRecord = refundRecordMapper.getRefundRecordByOutRefundNo(request.getOutRequestNo());
if(refundRecord == null){
PaymentRecord paymentRecord = paymentRecordMapper.getPaymentRecordByOutTradeNo(request.getOutTradeNo());
RefundRecord refundRecord = refundRecordMapper.getRefundRecordByOutRefundNo(request.getOutRequestNo());
if (refundRecord != null) {
log.warn("已存在对应的退款记录，退款单号: {}", request.getOutRequestNo());
return;
}
refundRecord = new RefundRecord();
refundRecord.setCompanyId(request.getCompanyId());
refundRecord.setOutTradeNo(request.getOutTradeNo());
@ -623,11 +626,10 @@ public class AlipayServiceImpl implements AlipayService {
refundRecord.setRefundStatusDesc("退款处理中");
refundRecord.setRefundId(request.getOutRequestNo());
refundRecord.setPayChannel(PaymentRecord.PayChannel.ALIPAY.name());
refundRecordMapper.insertRefundRecord(refundRecord);
log.info("退款记录已保存，退款单号: {}", request.getOutRequestNo());
}else {
log.info("退款记录已存在，退款单号: {}", request.getOutRequestNo());
}
} catch (Exception e) {
log.error("保存退款记录异常，退款单号: {}", request.getOutRequestNo(), e);
}