From 0ecdfc4ddc9c23f4bf5ac5e6c69299c84b045a78 Mon Sep 17 00:00:00 2001 From: nws <3239709711@qq.com> Date: Thu, 11 Jan 2024 02:26:39 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E8=AE=B0=E5=BD=95/=E6=94=AF=E4=BB=98=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=AE=B0=E5=BD=95/=E6=94=AF=E4=BB=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95/=E6=94=AF=E4=BB=98=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 21 +++++++++---- .../record/PayRepairRecordController.java | 2 +- .../platform/daxpay/code/PayStatusEnum.java | 2 +- ...usEnum.java => PayCallbackStatusEnum.java} | 21 +++---------- .../service/code/PayRepairTypeEnum.java | 2 +- .../callback/result/PayCallbackResult.java | 5 ++-- .../callback/service/PayCallbackService.java | 18 +++++------ .../payment/sync/service/PaySyncService.java | 2 +- .../callback/entity/PayCallbackRecord.java | 10 ++----- .../convert/PayRepairRecordConvert.java | 2 +- .../record/repair/entity/PayRepairRecord.java | 25 ++++++++++++---- .../service/PayRepairRecordService.java | 2 +- .../record/sync/dao/PaySyncRecordManager.java | 2 +- .../record/sync/entity/PaySyncRecord.java | 7 ++--- .../record/callback/PayCallbackRecordDto.java | 10 ++----- .../repair/PayRepairRecordDto.java | 30 ++++++++++++++----- .../dto/record/sync/PaySyncRecordDto.java | 15 ++++++---- .../service/func/AbsPayCallbackStrategy.java | 2 +- .../param/record/PaySyncRecordQuery.java | 2 +- 19 files changed, 100 insertions(+), 80 deletions(-) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/{PayNotifyStatusEnum.java => PayCallbackStatusEnum.java} (55%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/{order => record}/repair/PayRepairRecordDto.java (61%) diff --git a/_doc/Task.md b/_doc/Task.md index f52d739f4..a08aa721b 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -36,12 +36,23 @@ - [x] 增加支付修复记录 - 2024-01-07: - [x] 抽取签名工具类 - - [ ] 增加消息通知机制(通知客户端) - - [ ] (前端) 更新代码为platform最新版本 - - [ ] (前端) 平台配置 - - [ ] (前端) 接口配置 + - [x] 增加消息通知机制(通知客户端) +- 2024-01-08: + - [x] (前端) 更新代码为platform最新版本 + - [x] (前端) 接口配置 +- 2024-01-09: + - [x] (前端) 支付配置 +- 2024-01-10: + - [x] 支付常量数据维护 + - [x] (前端) 支付回调记录 +- 2024-01-11: + - [x] (前端) 支付关闭记录 + - [x] (前端) 支付修复记录 + - [x] (前端) - **任务池** - - [ ] 支付宝方式支持 + - [ ] 支付宝方式支持撤销方式, + - [ ] 支持转账操作, 通过支付通道专有参数进行实现, 转账时只能单个通道进行操作 + - [ ] 支付成功回调后, 如果订单已超时, 则进入待退款订单中，提示进行退款，或者自动退款 - [ ] 退款状态同步逻辑 - [ ] 退款回调的处理 - [ ] 支付状态同步处理考虑退款情况 diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/record/PayRepairRecordController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/record/PayRepairRecordController.java index 357b8b859..f9f724880 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/record/PayRepairRecordController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/record/PayRepairRecordController.java @@ -5,7 +5,7 @@ import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.daxpay.service.core.record.repair.service.PayRepairRecordService; -import cn.bootx.platform.daxpay.service.dto.order.repair.PayRepairRecordDto; +import cn.bootx.platform.daxpay.service.dto.record.repair.PayRepairRecordDto; import cn.bootx.platform.daxpay.service.param.record.PayRepairRecordQuery; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java index 2db6e7146..3b59f11b0 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java @@ -15,10 +15,10 @@ import java.util.Objects; @Getter @RequiredArgsConstructor public enum PayStatusEnum { - FAIL("fail","失败"), PROGRESS("progress","支付中"), SUCCESS("success","成功"), CLOSE("close","支付关闭"), + FAIL("fail","失败"), PARTIAL_REFUND("partial_refund","部分退款"), REFUNDED("refunded","全部退款"); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayCallbackStatusEnum.java similarity index 55% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayCallbackStatusEnum.java index b8998ec96..675e45aea 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayCallbackStatusEnum.java @@ -4,33 +4,20 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * 支付回调通知状态 + * 支付回调处理状态 * @author xxm * @since 2023/12/20 */ @Getter @AllArgsConstructor -public enum PayNotifyStatusEnum { +public enum PayCallbackStatusEnum { - // 回调处理状态 - /** 失败 */ - FAIL("fail","失败"), - - /** 成功 */ SUCCESS("success","成功"), - - /** 忽略 */ + FAIL("fail","失败"), IGNORE("ignore","忽略"), - - /** 超时 */ TIMEOUT("timeout","超时"), - - /** 未找到本地订单 需要行进订单撤销 */ NOT_FOUND("not_found","未找到"); - /** 状态 */ private final String code; - - /** 状态描述 */ - private final String desc; + private final String name; } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java index 85acab277..1a4d31baa 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java @@ -12,7 +12,7 @@ import lombok.Getter; @AllArgsConstructor public enum PayRepairTypeEnum { - SUCCESS("success","成功"), + SUCCESS("success","支付成功"), CLOSE_LOCAL("close_local","关闭本地支付"), WAIT("wait","待支付"), /** 同时也会关闭本地支付 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java index 82c4fa344..3a25278b8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java @@ -1,6 +1,6 @@ package cn.bootx.platform.daxpay.service.core.payment.callback.result; -import cn.bootx.platform.daxpay.code.PayStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayCallbackStatusEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -16,10 +16,11 @@ public class PayCallbackResult { /** * 处理状态 - * @see PayStatusEnum + * @see PayCallbackStatusEnum */ private String status; + /** 提示信息 */ private String msg; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java index 066468554..d461e1760 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.service.core.payment.callback.service; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; -import cn.bootx.platform.daxpay.service.code.PayNotifyStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayCallbackStatusEnum; import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; @@ -43,17 +43,17 @@ public class PayCallbackService { // 支付单不存在,记录回调记录, TODO 取消支付网关的订单支付情况 if (Objects.isNull(payOrder)) { - return new PayCallbackResult().setStatus(PayNotifyStatusEnum.NOT_FOUND.getCode()).setMsg("支付单不存在,记录回调记录"); + return new PayCallbackResult().setStatus(PayCallbackStatusEnum.NOT_FOUND.getCode()).setMsg("支付单不存在,记录回调记录"); } // 回调时间超出了支付单超时时间, 记录一下, 不做处理 TODO 这块应该把订单给当成正常结束给处理了, if (Objects.nonNull(payOrder.getExpiredTime()) && LocalDateTimeUtil.ge(LocalDateTime.now(), payOrder.getExpiredTime())) { - return new PayCallbackResult().setStatus(PayNotifyStatusEnum.TIMEOUT.getCode()).setMsg("回调时间超出了支付单支付有效时间"); + return new PayCallbackResult().setStatus(PayCallbackStatusEnum.TIMEOUT.getCode()).setMsg("回调时间超出了支付单支付有效时间"); } // 成功状态 - if (Objects.equals(PayNotifyStatusEnum.SUCCESS.getCode(), tradeStatus)) { + if (Objects.equals(PayCallbackStatusEnum.SUCCESS.getCode(), tradeStatus)) { return this.success(payOrder); } else { @@ -66,16 +66,16 @@ public class PayCallbackService { * 成功处理 使用补偿 */ private PayCallbackResult success(PayOrder payOrder) { - PayCallbackResult result = new PayCallbackResult().setStatus(PayNotifyStatusEnum.SUCCESS.getCode()); + PayCallbackResult result = new PayCallbackResult().setStatus(PayCallbackStatusEnum.SUCCESS.getCode()); // 支付单已经被支付,不需要重复处理 if (Objects.equals(payOrder.getStatus(), PayStatusEnum.SUCCESS.getCode())) { - return result.setStatus(PayNotifyStatusEnum.IGNORE.getCode()).setMsg("支付单已经是支付成功状态,不进行处理"); + return result.setStatus(PayCallbackStatusEnum.IGNORE.getCode()).setMsg("支付单已经是支付成功状态,不进行处理"); } // 支付单已被取消,记录回调记录 TODO 考虑不全, 需要做支付订单的取消处理 if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.PROGRESS.getCode())) { - return result.setStatus(PayNotifyStatusEnum.FAIL.getCode()).setMsg("支付单不是待支付状态,记录回调记录"); + return result.setStatus(PayCallbackStatusEnum.FAIL.getCode()).setMsg("支付单不是待支付状态,记录回调记录"); } // 执行支付完成修复逻辑 @@ -94,12 +94,12 @@ public class PayCallbackService { // payment已被取消,记录回调记录,后期处理 TODO 考虑不完善, 后续优化 if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.PROGRESS.getCode())) { - return result.setStatus(PayNotifyStatusEnum.IGNORE.getCode()).setMsg("支付单已经取消,记录回调记录"); + return result.setStatus(PayCallbackStatusEnum.IGNORE.getCode()).setMsg("支付单已经取消,记录回调记录"); } // payment支付成功, 状态非法 TODO 考虑不完善, 后续优化 if (!Objects.equals(payOrder.getStatus(), PayStatusEnum.SUCCESS.getCode())) { - return result.setStatus(PayNotifyStatusEnum.FAIL.getCode()).setMsg("支付单状态非法,支付网关状态为失败,但支付单状态为已完成"); + return result.setStatus(PayCallbackStatusEnum.FAIL.getCode()).setMsg("支付单状态非法,支付网关状态为失败,但支付单状态为已完成"); } // 执行支付关闭修复逻辑 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java index 81dc24933..2fd923f11 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java @@ -241,7 +241,7 @@ public class PaySyncService { PaySyncRecord paySyncRecord = new PaySyncRecord() .setPaymentId(payOrder.getId()) .setBusinessNo(payOrder.getBusinessNo()) - .setChannel(payOrder.getAsyncChannel()) + .setAsyncChannel(payOrder.getAsyncChannel()) .setSyncInfo(syncResult.getSyncInfo()) .setGatewayStatus(syncResult.getSyncStatus().getCode()) .setRepairOrder(repair) diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/PayCallbackRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/PayCallbackRecord.java index 3b0117568..0bae9b710 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/PayCallbackRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/PayCallbackRecord.java @@ -3,7 +3,7 @@ package cn.bootx.platform.daxpay.service.core.record.callback.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.PayStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayCallbackStatusEnum; import cn.bootx.platform.daxpay.service.core.record.callback.convert.PayCallbackRecordConvert; import cn.bootx.platform.daxpay.service.dto.record.callback.PayCallbackRecordDto; import cn.bootx.table.modify.annotation.DbColumn; @@ -44,15 +44,9 @@ public class PayCallbackRecord extends MpCreateEntity implements EntityBaseFunct @DbColumn(comment = "通知消息") private String notifyInfo; - /** - * 支付状态 - * @see PayStatusEnum - */ - @DbColumn(comment = "支付状态") - private String payStatus; - /** * 回调处理状态 + * @see PayCallbackStatusEnum */ @DbColumn(comment = "回调处理状态") private String status; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/convert/PayRepairRecordConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/convert/PayRepairRecordConvert.java index 7a92487d9..d8f84707e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/convert/PayRepairRecordConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/convert/PayRepairRecordConvert.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.service.core.record.repair.convert; import cn.bootx.platform.daxpay.service.core.record.repair.entity.PayRepairRecord; -import cn.bootx.platform.daxpay.service.dto.order.repair.PayRepairRecordDto; +import cn.bootx.platform.daxpay.service.dto.record.repair.PayRepairRecordDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/entity/PayRepairRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/entity/PayRepairRecord.java index 18a7e81e0..aa574c2ef 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/entity/PayRepairRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/entity/PayRepairRecord.java @@ -2,8 +2,11 @@ package cn.bootx.platform.daxpay.service.core.record.repair.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.platform.daxpay.code.PayStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; import cn.bootx.platform.daxpay.service.core.record.repair.convert.PayRepairRecordConvert; -import cn.bootx.platform.daxpay.service.dto.order.repair.PayRepairRecordDto; +import cn.bootx.platform.daxpay.service.dto.record.repair.PayRepairRecordDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; @@ -31,11 +34,17 @@ public class PayRepairRecord extends MpCreateEntity implements EntityBaseFunctio @DbColumn(comment = "业务号") private String businessNo; - /** 修复来源 */ + /** + * 修复来源 + * @see PayRepairSourceEnum + */ @DbColumn(comment = "修复来源") private String repairSource; - /** 修复类型 */ + /** + * 修复类型 + * @see PayRepairTypeEnum + */ @DbColumn(comment = "修复类型") private String repairType; @@ -43,11 +52,17 @@ public class PayRepairRecord extends MpCreateEntity implements EntityBaseFunctio @DbColumn(comment = "修复的异步通道") private String asyncChannel; - /** 修复前状态 */ + /** + * 修复前状态 + * @see PayStatusEnum + */ @DbColumn(comment = "修复前状态") private String beforeStatus; - /** 修复后状态 */ + /** + * 修复后状态 + * @see PayStatusEnum + */ @DbColumn(comment = "修复后状态") private String afterStatus; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/service/PayRepairRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/service/PayRepairRecordService.java index a3501e0a1..b1ef44aee 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/service/PayRepairRecordService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/repair/service/PayRepairRecordService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.daxpay.service.core.record.repair.dao.PayRepairRecordManager; import cn.bootx.platform.daxpay.service.core.record.repair.entity.PayRepairRecord; -import cn.bootx.platform.daxpay.service.dto.order.repair.PayRepairRecordDto; +import cn.bootx.platform.daxpay.service.dto.record.repair.PayRepairRecordDto; import cn.bootx.platform.daxpay.service.param.record.PayRepairRecordQuery; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java index 941bf1fb6..fbb003001 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java @@ -30,7 +30,7 @@ public class PaySyncRecordManager extends BaseManager mpPage = MpUtil.getMpPage(pageParam, PaySyncRecord.class); return lambdaQuery().orderByDesc(MpIdEntity::getId) .like(Objects.nonNull(param.getPaymentId()), PaySyncRecord::getPaymentId, param.getPaymentId()) - .eq(Objects.nonNull(param.getChannel()), PaySyncRecord::getChannel, param.getChannel()) + .eq(Objects.nonNull(param.getAsyncChannel()), PaySyncRecord::getAsyncChannel, param.getAsyncChannel()) .eq(Objects.nonNull(param.getStatus()), PaySyncRecord::getGatewayStatus, param.getStatus()) .page(mpPage); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java index 0258e62f0..3859e15f4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java @@ -7,7 +7,6 @@ import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; import cn.bootx.platform.daxpay.service.core.record.sync.convert.PaySyncRecordConvert; import cn.bootx.platform.daxpay.service.dto.record.sync.PaySyncRecordDto; import cn.bootx.table.modify.annotation.DbColumn; -import cn.bootx.table.modify.annotation.DbComment; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; @@ -37,11 +36,11 @@ public class PaySyncRecord extends MpCreateEntity implements EntityBaseFunction< private String businessNo; /** - * 支付通道 + * 同步通道 * @see PayChannelEnum#getCode() */ - @DbColumn(comment = "支付通道") - private String channel; + @DbColumn(comment = "同步通道") + private String asyncChannel; /** 通知消息 */ @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/callback/PayCallbackRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/callback/PayCallbackRecordDto.java index a751bd661..05489f24e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/callback/PayCallbackRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/callback/PayCallbackRecordDto.java @@ -2,7 +2,7 @@ package cn.bootx.platform.daxpay.service.dto.record.callback; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.PayStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayCallbackStatusEnum; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; @@ -39,15 +39,9 @@ public class PayCallbackRecordDto extends BaseDto { @Schema(description = "通知消息") private String notifyInfo; - /** - * 支付状态 - * @see PayStatusEnum - */ - @Schema(description = "支付状态") - private String payStatus; - /** * 回调处理状态 + * @see PayCallbackStatusEnum */ @Schema(description = "回调处理状态") private String status; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/repair/PayRepairRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/repair/PayRepairRecordDto.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/repair/PayRepairRecordDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/repair/PayRepairRecordDto.java index b53a4837f..5f0354aeb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/repair/PayRepairRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/repair/PayRepairRecordDto.java @@ -1,6 +1,9 @@ -package cn.bootx.platform.daxpay.service.dto.order.repair; +package cn.bootx.platform.daxpay.service.dto.record.repair; import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.daxpay.code.PayStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; import cn.bootx.table.modify.annotation.DbColumn; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -26,23 +29,36 @@ public class PayRepairRecordDto extends BaseDto { @Schema(description = "业务号") private String businessNo; - /** 修复来源 */ + /** + * 修复来源 + * @see PayRepairSourceEnum + */ @Schema(description = "修复来源") private String repairSource; - /** 修复类型 */ + /** + * 修复类型 + * @see PayRepairTypeEnum + */ @Schema(description = "修复类型") private String repairType; + /** 修复的异步通道 */ @DbColumn(comment = "修复的异步通道") private String asyncChannel; - /** 修复前状态 */ - @Schema(description = "修复前状态") + /** + * 修复前状态 + * @see PayStatusEnum + */ + @Schema(description = "修复前订单状态") private String beforeStatus; - /** 修复后状态 */ - @Schema(description = "修复后状态") + /** + * 修复后状态 + * @see PayStatusEnum + */ + @Schema(description = "修复后订单状态") private String afterStatus; /** 金额变动 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/sync/PaySyncRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/sync/PaySyncRecordDto.java index d2ed6dd04..173ae573a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/sync/PaySyncRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/record/sync/PaySyncRecordDto.java @@ -26,14 +26,17 @@ public class PaySyncRecordDto extends BaseDto { @Schema(description = "支付记录id") private Long paymentId; + @Schema(description = "业务号") + private String businessNo; + /** - * 支付通道 + * 同步通道 * @see PayChannelEnum#getCode() */ - @Schema(description = "支付通道") - private String channel; + @Schema(description = "同步通道") + private String asyncChannel; - /** 通知消息 */ + /** 同步消息 */ @Schema(description = "同步消息") private String syncInfo; @@ -45,13 +48,13 @@ public class PaySyncRecordDto extends BaseDto { private String status; /** - * 支付单如果状态不一致, 是否修复成功 + * 支付单如果状态不一致, 是否进行修复 */ @DbColumn(comment = "是否进行修复") private boolean repairOrder; @Schema(description = "错误消息") - private String msg; + private String errorMsg; /** 同步时间 */ @Schema(description = "同步时间") diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java index a9d659927..fc6329fe9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java @@ -105,7 +105,7 @@ public abstract class AbsPayCallbackStrategy implements PayStrategy { .setNotifyTime(LocalDateTime.now()) .setPaymentId(this.getPaymentId()) .setPayChannel(this.getPayChannel().getCode()) - .setPayStatus(result.getStatus()) + .setStatus(result.getStatus()) .setMsg(result.getMsg()); callbackRecordManager.save(payNotifyRecord); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/record/PaySyncRecordQuery.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/record/PaySyncRecordQuery.java index f8ee2d269..4877bf146 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/record/PaySyncRecordQuery.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/record/PaySyncRecordQuery.java @@ -28,7 +28,7 @@ public class PaySyncRecordQuery { * @see PayChannelEnum#getCode() */ @Schema(description = "支付通道") - private String channel; + private String asyncChannel; /** 通知消息 */ @Schema(description = "同步消息")