diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 60af74023..6c89beb70 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,8 @@ # CHANGELOG +## [v2.0.2] +- fix: 前端支付订单查询条件中"支付ID"条件不生效 + + ## [v2.0.1] - 增加支付、退款时客户通知功能,支持多次重发 - 开源文档增加支付通知和退款通知文档 diff --git a/_doc/Task.md b/_doc/Task.md index c314e52bd..730156cff 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,28 +1,16 @@ -2.0.1: -- [x] 完善各种同步支付方式 - - [x] 现金支付, 现金流水 - - [x] 钱包支付, 钱包流水 - - [x] 储值卡支付, 储值卡流水 -- [x] 支付回调通知和退款回调通知功能 - - [x] 回调任务发起 - - [ ] 支付关闭发送回调 - - [ ] 退款关闭发送回调 - - [x] 回调调用记录 - - [x] SDK接收对象编写 - - [x] Demo模块接收回调演示 -- [x] 通道配置启用停用配置生效 -- [x] 支付对账的序列化生成器有问题,待platform更新 2.0.2: - [ ] 对账功能补全账单比对功能 - [ ] 数据库表进行规则, 字段设置长度, 增加索引 - [ ] 退款操作支持重试 +- [x] 支付对账的序列化生成器有问题,待platform更新 2.0.x 版本内容 - [ ] 云闪付接入 - [ ] 增加各类日志记录,例如钱包的各项操作 - [ ] 支付流程也改为先落库后支付情况, 避免极端情况导致掉单 - [ ] 支付流程涉及异步支付时, 更换支付方式需要控制预防客户重复付款 +- [ ] 增加撤销功能,用于处理线下支付订单的情况 **任务池** - [x] 支付SDK编写 @@ -30,7 +18,6 @@ - [x] 增加聚合支付功能支持 - [x] 增加手机用户收银台功能 - [ ] 订单超时支持数据表级别触发 -- [ ] 支付宝关闭支付时支持撤销方式, - [ ] 支持转账操作, 通过支付通道专有参数进行实现, 转账时只能单个通道进行操作 - [ ] 支付成功回调后, 如果订单已超时, 则进入待退款订单中,提示进行退款,或者自动退款 - [x] 增加回调机制(通知客户端) diff --git a/daxpay-single/daxpay-single-admin/src/main/resources/static/front/.gitkeep b/daxpay-single/daxpay-single-admin/src/main/resources/static/front/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/daxpay-single/daxpay-single-gateway/src/main/resources/static/h5/.gitkeep b/daxpay-single/daxpay-single-gateway/src/main/resources/static/h5/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderQuery.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderQuery.java index 31cdf8115..ae1a9a4f3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderQuery.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderQuery.java @@ -23,7 +23,7 @@ public class PayOrderQuery extends QueryOrder { @QueryParam(type = QueryParam.CompareTypeEnum.EQ) @Schema(description = "支付订单id") - private Long paymentId; + private Long id; /** 关联的业务号 */ @QueryParam(type = QueryParam.CompareTypeEnum.LIKE)