dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-02 02:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
222 Commits 2 Branches 16 Tags
c8ebf069ad0bc30a483029abf91a0a702745b430
Commit Graph

222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
喵呀
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
bootx
f85279e524 feat 联调wap和web支付 2024-03-12 22:46:18 +08:00
xxm1995
77ed232e40 feat wap和web支付 2024-03-12 18:46:55 +08:00
xxm1995
197382b1f8 feat 退款订单定时同步任务 2024-03-12 17:57:15 +08:00
bootx
b1de4e83f8 feat 云闪付条码支付/APP支付 2024-03-11 23:41:19 +08:00
xxm1995
3c2deabfdf feat 云闪付支付对接 2024-03-11 18:47:01 +08:00
xxm1995
c5ab2fe9b0 doc 更新用户协议和开源协议 2024-03-11 13:28:49 +08:00
bootx
e6e5ae2c2b doc 更新微信群二维码 2024-03-10 22:49:47 +08:00
bootx
843e4b4b52 doc 更新微信群二维码 2024-03-10 22:48:18 +08:00
bootx
8404e17086 feat 云闪付对接调试, 重写SDK中一份调用逻辑 2024-03-10 22:45:57 +08:00
xxm1995
aee7c18ebb feat 云闪付对接 2024-03-08 18:27:27 +08:00
xxm1995
0d49b9dadd feat 云闪付对接 2024-03-07 18:06:55 +08:00
bootx
f6cd4b0a46 feat 云闪付对接 2024-03-06 23:23:59 +08:00
bootx
cfbd7e2e32 fix 编译不通过 2024-03-06 21:35:11 +08:00
xxm1995
f44a2d7e2f feat 退款重试功能 2024-03-06 18:39:02 +08:00
xxm1995
d73bd4e8ea fix 对账定时任务cron表达式错误 2024-03-06 13:01:43 +08:00
bootx
60d3dd9c11 feat 手动触发通知消息发送, 通知任务增加订单的状态类型 2024-03-05 23:23:44 +08:00
xxm1995
6a1e3f8d6b build 数据脚本更新 2024-03-05 22:01:22 +08:00
bootx
6f56784e2e feat 对账差异单和定时任务开发 2024-03-05 22:01:22 +08:00
bootx
70be334823 doc 更新微信二维码 2024-03-05 22:01:22 +08:00
bootx
738a1753de feat 对账开发 2024-03-05 22:01:22 +08:00
bootx
ee97b517a4 feat 对账开发 2024-03-05 22:01:22 +08:00
bootx
264e113c0e feat 对账差异单 2024-03-05 22:01:22 +08:00
bootx
a886c17ea6 feat 对账差异单 2024-03-05 22:01:22 +08:00
xxm1995
75ef54085d feat 支付对账开发, 调整支付宝流水表数据结构, 支付修复策略问题调试 2024-03-05 22:01:22 +08:00
xxm1995
ba7eb68780 fix 前端支付订单查询条件中"支付ID"条件不生效 2024-03-05 22:01:22 +08:00
xxm1995
bc43d57cfb fix 对账明细未记录订单时间 2.0.2 2024-03-05 18:29:02 +08:00