dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-04 03:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

style 字段名称修改

Browse Source
This commit is contained in:
bootx
2024-05-07 23:12:47 +08:00
parent 8047c85ed6
commit 58ee11d560
10 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_doc/Task.md
View File

@@ -38,6 +38,7 @@
- [x] 数据加密方式改为类型处理器模式
- [ ] 页面优化
2.0.7: 分账完善和基础架构优化
- [ ] 集成bootx-platform到项目中
- [ ] 资金流水优化
- [ ] 支持分账组分账和自己传接收方进行分账
- [ ] DEMO增加获取微信OpenID和支付宝OpenId功能

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/CallbackLocal.java
View File

@@ -62,5 +62,5 @@ public class CallbackLocal {
private PayCallbackStatusEnum callbackStatus = PayCallbackStatusEnum.SUCCESS;
/** 提示信息 */
private String msg;
private String errorMsg;
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCallbackService.java
View File

@@ -67,7 +67,7 @@ public class AliPayCallbackService {
// 验证消息
if (!this.verifyNotify()) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("验证信息格式不通过");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("验证信息格式不通过");
// 消息有问题, 保存记录并返回
callbackService.saveCallbackRecord();
return null;
@@ -88,7 +88,7 @@ public class AliPayCallbackService {
return this.getReturnMsg();
} catch (Exception e) {
log.error("回调处理失败", e);
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("回调处理失败: "+e.getMessage());
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("回调处理失败: "+e.getMessage());
callbackService.saveCallbackRecord();
throw e;
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayCallbackService.java
View File

@@ -64,7 +64,7 @@ public class UnionPayCallbackService {
// 验证消息
if (!this.verifyNotify()) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("验证信息格式不通过");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("验证信息格式不通过");
// 消息有问题, 保存记录并返回
callbackService.saveCallbackRecord();
return null;
@@ -85,7 +85,7 @@ public class UnionPayCallbackService {
return this.getReturnMsg();
} catch (Exception e) {
log.error("回调处理失败", e);
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("回调处理失败: "+e.getMessage());
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("回调处理失败: "+e.getMessage());
callbackService.saveCallbackRecord();
throw e;
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCallbackService.java
View File

@@ -64,7 +64,7 @@ public class WeChatPayCallbackService {
// 验证消息
if (!this.verifyNotify()) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("验证信息格式不通过");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("验证信息格式不通过");
// 消息有问题, 保存记录并返回
callbackService.saveCallbackRecord();
return null;
@@ -85,7 +85,7 @@ public class WeChatPayCallbackService {
return this.getReturnMsg();
} catch (Exception e) {
log.error("回调处理失败", e);
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setMsg("回调处理失败: "+e.getMessage());
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.FAIL).setErrorMsg("回调处理失败: "+e.getMessage());
callbackService.saveCallbackRecord();
throw e;
}

14
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java
View File

@@ -44,7 +44,7 @@ public class PayCallbackService {
// 加锁
LockInfo lock = lockTemplate.lock("callback:payment:" + callbackInfo.getTradeNo(),10000, 200);
if (Objects.isNull(lock)){
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setMsg("回调正在处理中，忽略本次回调请求");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setErrorMsg("回调正在处理中，忽略本次回调请求");
log.warn("订单号: {} 回调正在处理中，忽略本次回调请求", callbackInfo.getTradeNo());
return;
}
@@ -53,7 +53,7 @@ public class PayCallbackService {
PayOrder payOrder = payOrderQueryService.findByOrderNo(callbackInfo.getTradeNo()).orElse(null);
// 本地支付单不存在,记录回调记录, TODO 需要补单或进行退款
if (Objects.isNull(payOrder)) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.NOT_FOUND).setMsg("支付单不存在,记录回调记录");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.NOT_FOUND).setErrorMsg("支付单不存在,记录回调记录");
return;
}
// 设置订单关联网关订单号
@@ -80,17 +80,17 @@ public class PayCallbackService {
// 回调时间超出了支付单超时时间, 记录一下, 不做处理 TODO 考虑不全, 需要做退款or人工处理
if (Objects.nonNull(payOrder.getExpiredTime())
&& LocalDateTimeUtil.ge(LocalDateTime.now(), payOrder.getExpiredTime())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setMsg("回调时间超出了支付单支付有效时间");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setErrorMsg("回调时间超出了支付单支付有效时间");
return;
}
// 支付单已经被支付,不需要重复处理
if (Objects.equals(payOrder.getStatus(), PayStatusEnum.SUCCESS.getCode())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setMsg("支付单已经是支付成功状态,不进行处理");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setErrorMsg("支付单已经是支付成功状态,不进行处理");
return;
}
// 支付单已被取消,记录回调记录 TODO 考虑不全, 需要做退款or人工处理
if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.PROGRESS.getCode())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setMsg("支付单不是待支付状态,记录回调记录");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setErrorMsg("支付单不是待支付状态,记录回调记录");
return;
}
// 设置支付成功时间
@@ -107,12 +107,12 @@ public class PayCallbackService {
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
// payment已被取消,记录回调记录,后期处理 TODO 考虑不完善, 后续优化
if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.PROGRESS.getCode())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setMsg("支付单已经取消,记录回调记录");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setErrorMsg("支付单已经取消,记录回调记录");
return;
}
// payment支付成功, 状态非法 TODO 考虑不完善, 后续优化
if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.SUCCESS.getCode())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setMsg("支付单状态非法,支付网关状态为失败,但支付单状态为已完成");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.EXCEPTION).setErrorMsg("支付单状态非法,支付网关状态为失败,但支付单状态为已完成");
return;
}
// 执行支付关闭修复逻辑

6
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/RefundCallbackService.java
View File

@@ -41,7 +41,7 @@ public class RefundCallbackService {
// 加锁
LockInfo lock = lockTemplate.lock("callback:refund:" + callbackInfo.getTradeNo(),10000, 200);
if (Objects.isNull(lock)){
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setMsg("回调正在处理中，忽略本次回调请求");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setErrorMsg("回调正在处理中，忽略本次回调请求");
log.warn("订单号: {} 回调正在处理中，忽略本次回调请求", callbackInfo.getTradeNo());
return;
}
@@ -50,12 +50,12 @@ public class RefundCallbackService {
RefundOrder refundOrder = refundOrderManager.findByRefundNo(callbackInfo.getTradeNo()).orElse(null);
// 退款单不存在,记录回调记录
if (Objects.isNull(refundOrder)) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.NOT_FOUND).setMsg("退款单不存在,记录回调记录");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.NOT_FOUND).setErrorMsg("退款单不存在,记录回调记录");
return;
}
// 退款单已经被处理, 记录回调记录
if (!Objects.equals(RefundStatusEnum.PROGRESS.getCode(), refundOrder.getStatus())) {
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setMsg("退款单状态已处理,记录回调记录");
callbackInfo.setCallbackStatus(PayCallbackStatusEnum.IGNORE).setErrorMsg("退款单状态已处理,记录回调记录");
return;
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/PayCallbackRecord.java
View File

@@ -73,7 +73,7 @@ public class PayCallbackRecord extends MpCreateEntity implements EntityBaseFunct
/** 提示信息 */
@DbColumn(comment = "提示信息")
private String msg;
private String errorMsg;
/**
* 转换

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/service/PayCallbackRecordService.java
View File

@@ -56,7 +56,7 @@ public class PayCallbackRecordService {
.setCallbackType(callbackInfo.getCallbackType().getCode())
.setRepairOrderNo(callbackInfo.getRepairNo())
.setStatus(callbackInfo.getCallbackStatus().getCode())
.setMsg(callbackInfo.getMsg());
.setErrorMsg(callbackInfo.getErrorMsg());
callbackRecordManager.save(payNotifyRecord);
}
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/callback/PayCallbackRecordDto.java
View File

@@ -55,6 +55,6 @@ public class PayCallbackRecordDto extends BaseDto {
/** 提示信息 */
@Schema(description = "提示信息")
private String msg;
private String errorMsg;
}