xxm1995
|
7aab411f8c
|
Merge branch 'master' into gateway
|
2024-03-26 17:16:10 +08:00 |
|
喵呀
|
f69ca550b1
|
fix 异步支付失败数据保存不全
|
2024-03-26 09:15:27 +00:00 |
|
xxm1995
|
bb8565c769
|
Merge branch 'master' into gateway
# Conflicts:
# _doc/Task.md
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java
# daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml
|
2024-03-26 17:03:36 +08:00 |
|
xxm1995
|
7d0d5d7110
|
fix 异步支付失败情况下数据保存不完整问题
|
2024-03-26 16:48:39 +08:00 |
|
xxm1995
|
ef0398ebe2
|
build 升级版本号
2.0.4
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
4b9df729f5
|
feat 云闪付支持对账,支持对账文件手动导入
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
2f884136fd
|
feat 云闪付对账处理
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
68334cd0dc
|
feat 云闪付对账处理
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
6057802c45
|
feat 支持支付限额配置, 修改支付方法适配限额校验
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
746b53b659
|
doc 更新微信群连接
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
c7f4faf79f
|
feat 支付限额配置
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
c8ebf069ad
|
feat 支付流程调整为多阶段, 预防掉单问题, 增加更多测试类
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
70e0922073
|
feat 支付流程拆分为三类进行分别处理, 更新配置文件
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
012e08c37a
|
feat 支付流程改为先落库, 后支付
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
15314197e9
|
doc 补充时序图
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
bb93ba7c2c
|
feat 结算台增加云闪付演示, 增加生产环境配置文件
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
04b607368b
|
fix 订单数量值和金额查询错误
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
27c6aba9b1
|
feat 驾驶舱接口
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
8b230a41cc
|
feat 驾驶舱接口
|
2024-03-26 05:41:46 +00:00 |
|
xxm1995
|
8c74eb7fee
|
build 升级版本号
|
2024-03-26 12:34:12 +08:00 |
|
xxm1995
|
591b34cc14
|
feat 云闪付支持对账,支持对账文件手动导入
|
2024-03-25 22:48:52 +08:00 |
|
xxm1995
|
3eb0f4589f
|
feat 云闪付对账处理
|
2024-03-25 17:42:52 +08:00 |
|
xxm1995
|
9bf5c701ef
|
feat 云闪付对账处理
|
2024-03-24 23:18:05 +08:00 |
|
xxm1995
|
c290c1ea0f
|
feat 支持支付限额配置, 修改支付方法适配限额校验
|
2024-03-24 15:25:26 +08:00 |
|
xxm1995
|
659413357c
|
doc 更新微信群连接
|
2024-03-24 09:45:33 +08:00 |
|
xxm1995
|
86b9c60f65
|
feat 支付限额配置
|
2024-03-23 23:16:52 +08:00 |
|
xxm1995
|
5e4de478ef
|
feat 支付流程调整为多阶段, 预防掉单问题, 增加更多测试类
|
2024-03-23 19:20:07 +08:00 |
|
xxm1995
|
88c7de465c
|
feat 支付流程拆分为三类进行分别处理, 更新配置文件
|
2024-03-22 23:42:08 +08:00 |
|
xxm1995
|
730876021e
|
feat 支付流程改为先落库, 后支付
|
2024-03-21 23:23:21 +08:00 |
|
xxm1995
|
90505b9f6d
|
doc 补充时序图
|
2024-03-21 13:46:41 +08:00 |
|
xxm1995
|
a8c1bb470b
|
feat 结算台增加云闪付演示, 增加生产环境配置文件
|
2024-03-18 23:30:31 +08:00 |
|
xxm1995
|
fe18f41f84
|
fix 订单数量值和金额查询错误
|
2024-03-18 14:18:48 +08:00 |
|
xxm1995
|
095850700a
|
feat 驾驶舱接口
|
2024-03-18 00:10:15 +08:00 |
|
xxm1995
|
f5a9bf72aa
|
feat 驾驶舱接口
|
2024-03-17 19:39:21 +08:00 |
|
喵呀
|
61b9b962e4
|
!11 2.0.3
Merge pull request !11 from 喵呀/gateway
2.0.3
|
2024-03-15 01:14:56 +00:00 |
|
xxm1995
|
7cead5ab4e
|
Merge branch 'master' of github.com:dromara/dax-pay into gateway
# Conflicts:
# README.md
# _config/sql/2.0.2/2.0.2.update.data.sql
# _doc/ChangeLog.md
# _doc/Task.md
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/configuration/sequence/DaxPaySequenceConfiguration.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayReconcileService.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatPayReconcileService.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/task/notice/entity/ClientNoticeTask.java
# pom.xml
|
2024-03-15 09:11:55 +08:00 |
|
xxm1995
|
41d67a9feb
|
doc 任务更新
|
2024-03-15 08:59:28 +08:00 |
|
xxm1995
|
fe133e675b
|
Merge branch 'gateway' of gitee.com:bootx/daxpay into union_pay
# Conflicts:
# _doc/Task.md
# daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/UnionPayController.java
# daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java
# daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayWayEnum.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/UnionPayWay.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/dao/RefundOrderManager.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/UnionPayReconcileStrategy.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/sdk/union/api/UnionPayKit.java
# daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/RefundSyncTaskService.java
|
2024-03-14 20:17:37 +08:00 |
|
xxm1995
|
e288762601
|
build 数据脚本和版本号更新
|
2024-03-14 20:14:35 +08:00 |
|
xxm1995
|
034cedfbde
|
fix 退款同步任务查询条件限定错误
|
2024-03-14 19:23:19 +08:00 |
|
xxm1995
|
c393ee6661
|
style 一些常量和参数的调整
|
2024-03-13 17:47:09 +08:00 |
|
bootx
|
2a5a6e4831
|
feat 联调wap和web支付
|
2024-03-12 23:44:28 +08:00 |
|
bootx
|
5afc344ced
|
feat 联调wap和web支付
|
2024-03-12 14:47:36 +00:00 |
|
xxm1995
|
495f97dbc2
|
feat wap和web支付
|
2024-03-12 14:47:36 +00:00 |
|
xxm1995
|
d69fdea2dd
|
feat 退款订单定时同步任务
|
2024-03-12 14:47:36 +00:00 |
|
bootx
|
ce048d3747
|
feat 云闪付条码支付/APP支付
|
2024-03-12 14:47:36 +00:00 |
|
xxm1995
|
4e3ac1dca6
|
feat 云闪付支付对接
|
2024-03-12 14:47:36 +00:00 |
|
xxm1995
|
f92788998b
|
doc 更新用户协议和开源协议
|
2024-03-12 14:47:36 +00:00 |
|
bootx
|
21c0433706
|
feat 云闪付对接调试, 重写SDK中一份调用逻辑
|
2024-03-12 14:47:36 +00:00 |
|
xxm1995
|
861b5cbfb3
|
feat 云闪付对接
|
2024-03-12 14:47:36 +00:00 |
|