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

修改合并错误

Browse Source
This commit is contained in:
zhangli
2025-09-25 15:34:31 +08:00
parent f7472da77d
commit 0988d548cd
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,7 +293,7 @@ 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 { try {
RefundRecord refundRecord = refundRecordMapper.getRefundRecordByOutRefundNo(request.getOutRefundNo()); RefundRecord refundRecord = refundRecordMapper.getRefundRecordByOutRefundNo(request.getOutRefundNo());
if (refundRecord != null) { if (refundRecord != null) {
@ -310,21 +310,19 @@ public class WechatPayService {
refundRecord.setCreateTime(new Date()); refundRecord.setCreateTime(new Date());
refundRecord.setUpdateTime(new Date()); refundRecord.setUpdateTime(new Date());
if ("SUCCESS".equals(result.get("result_code"))) { if ("SUCCESS".equals(result.get("result_code"))) {
refundRecord.setRefundStatus("PROCESSING"); // 退款处理中 refundRecord.setRefundStatus("PROCESSING"); // 退款处理中
refundRecord.setRefundStatusDesc("退款处理中"); refundRecord.setRefundStatusDesc("退款处理中");
refundRecord.setRefundId(result.get("refund_id")); refundRecord.setRefundId(result.get("refund_id"));
} else { } else {
refundRecord.setRefundStatus("FAIL"); // 退款失败 refundRecord.setRefundStatus("FAIL"); // 退款失败
refundRecord.setRefundStatusDesc(result.get("err_code_des")); refundRecord.setRefundStatusDesc(result.get("err_code_des"));
}
refundRecordMapper.insertRefundRecord(refundRecord);
logger.info("退款记录已保存，退款单号: {}", request.getOutRefundNo());
} else{
logger.info("退款记录已存在，退款单号: {}", request.getOutRefundNo());
} }
refundRecordMapper.insertRefundRecord(refundRecord);
logger.info("退款记录已保存，退款单号: {}", request.getOutRefundNo());
} catch (Exception e) { } catch (Exception e) {
logger.error("保存退款记录异常，退款单号: {}", request.getOutRefundNo(), e); logger.error("保存退款记录异常，退款单号: {}", request.getOutRefundNo(), e);
} }