Commit Graph

52 Commits

Author SHA1 Message Date
wolter 627e1c852c 后台,密钥对和api接口对应 2024-08-08 14:19:07 +08:00
wolter 342a247c67 后台,查询支付和退款回调,订单查询fix 2024-08-08 11:34:09 +08:00
Rzy cb14c35aa9 <feat>调整代码结构 2024-08-08 10:48:25 +08:00
陈俊宏 30b83b3645 Merge branch 'feature_413_cjh' into dev/dev1.0 2024-08-08 09:20:49 +08:00
陈俊宏 62d050c02f 回调log 2024-08-08 09:20:25 +08:00
wolter 3d5e33fed0 Merge remote-tracking branch 'refs/remotes/origin/feature/rzy/api_1.0' into dev/dev1.0
# Conflicts:
#	app/constants/errorcode/error_code.go
#	app/services/thirdpay/notify/notify.go
2024-08-08 09:14:08 +08:00
Rzy f85d6cc410 <feat>订单回调 2024-08-07 18:49:43 +08:00
wolter bf1bc4b1a2 后台,密钥对生成 2024-08-07 17:14:03 +08:00
陈俊宏 ad56b5f0e5 Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-07 10:32:37 +08:00
陈俊宏 75d68a3032 Merge remote-tracking branch 'origin/feature/rzy/api_1.0' into feature_413_cjh 2024-08-07 09:00:49 +08:00
陈俊宏 68b9e16864 支付回调处理 2024-08-06 18:00:49 +08:00
wolter b19576089c 订单查询 2024-08-06 17:48:17 +08:00
Rzy 4642ae73fe Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
# Conflicts:
#	app/http/entities/backend/order.go
2024-08-06 17:13:26 +08:00
Rzy fa6b385209 Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
# Conflicts:
#	app/constants/common/common.go
#	app/constants/errorcode/error_code.go
#	app/http/entities/backend/order.go
2024-08-06 17:02:25 +08:00
陈俊宏 38f3e04352 支付宝证书 2024-08-06 16:55:18 +08:00
Rzy 943c3401c6 <feat>支付接口 2024-08-06 16:53:59 +08:00
陈俊宏 6adcce1480 回调接口 2024-08-06 11:19:13 +08:00
Rzy 548491c1f1 <feat>支付部分 2024-08-05 18:45:01 +08:00
Rzy 71ccc46f23 Merge remote-tracking branch 'origin/feature_413_cjh' into feature/rzy/api_1.0 2024-08-05 17:07:35 +08:00
陈俊宏 a7cf191437 Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-05 16:42:44 +08:00
陈俊宏 0f747c2578 支付回调 2024-08-05 16:42:25 +08:00
Rzy 7dc1f9ef08 Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 2024-08-05 16:23:48 +08:00
Rzy 50924acbc7 Merge branch 'dev/dev1.0' of https://gitea.cdlsxd.cn/BaseSystem/PaymentCenter into dev/dev1.0
# Conflicts:
#	app/models/appmodel/app.go
2024-08-05 16:22:09 +08:00
Rzy 3e7df62375 <feat>网页支付 2024-08-05 16:20:01 +08:00
wolter 65621d439b 后台,更新请求日志和回调日志data 2024-08-05 15:42:20 +08:00
陈俊宏 39fb6d4d93 支付回调 2024-08-05 15:30:02 +08:00
Rzy b1a1a4cd50 <feat>api表单验证 2024-08-05 14:05:46 +08:00
Rzy b781a61f21 Merge branch 'feature/rzy/api_1.0' into dev/dev1.0
# Conflicts:
#	app/constants/common/common.go
#	app/constants/errorcode/error_code.go
#	app/data/app.go
#	app/http/controllers/base.go
#	app/http/requestmapping/front.go
#	app/http/routes/route.go
#	app/services/app.go
#	app/utils/util.go
#	go.mod
#	go.sum
2024-08-02 18:34:37 +08:00
Rzy 6e6e01a823 中间件 2024-08-02 18:25:28 +08:00
陈俊宏 fb5c0e458b 回调查询 2024-08-02 18:14:04 +08:00
陈俊宏 b8e32f407a Merge branch 'dev/dev1.0' into feature_413_cjh
# Conflicts:
#	app/constants/common/common.go
2024-08-02 17:34:07 +08:00
wolter 88b95cb67a 后台 2024-08-02 17:21:18 +08:00
陈俊宏 f1ee9b4196 支付退款+退款单查询+订单关闭 2024-08-02 16:37:07 +08:00
陈俊宏 c1e354e4ab 支付调起+订单查询 2024-08-02 13:47:52 +08:00
Rzy 28bd78ab7f Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 2024-08-02 11:44:09 +08:00
Rzy a056e2b26a api中间件 2024-08-02 11:41:54 +08:00
wolter 7a3823a2a7 更新订单和订单日志 2024-08-02 10:41:57 +08:00
wolter 5a60a92f4b 调整字段白名单和下游通知地址由app管理,更新应用模块 2024-08-02 09:18:49 +08:00
Rzy 4be80f228e <fix>(解决冲突):之后会另起分支 2024-08-01 14:53:22 +08:00
wolter 95a050d64e 商户模块 2024-08-01 14:43:39 +08:00
wolter 89f1c7895a 修改项目module 2024-07-31 17:21:03 +08:00
wuchao 2d3aded2ef 更新--初始化版本 2024-06-17 14:10:13 +08:00
wolter 337f0c4a87 fix 2024-05-08 14:14:41 +08:00
qiyunfanbo126.com c05c75362f master分支初始化 2024-05-07 18:53:07 +08:00
qiyunfanbo126.com f1a968c3a2 封装基础数据操作,错误返回 2024-05-07 18:32:07 +08:00
qiyunfanbo126.com 34a7a78894 封装基础数据操作,错误返回 2024-05-07 18:11:08 +08:00
wuchao c7813a4863 用户列表 2024-05-07 09:59:56 +08:00
wolter e2efa4bfcd init 2024-05-06 18:30:29 +08:00
wolter bfe5bfb9a8 init 2024-05-06 16:01:12 +08:00
qiyunfanbo126.com 2f268160bb 初始化,修复trace 2024-04-30 14:58:30 +08:00