BaseSystem
/
PaymentCenter
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
220 Commits 9 Branches 0 Tags 4.1 MiB
Commit Graph

207 Commits

Author SHA1 Message Date
wolter bf1bc4b1a2 后台，密钥对生成 2024-08-07 17:14:03 +08:00
Rzy d169ca7366 Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 2024-08-07 11:51:34 +08:00
Rzy 0834171ea3 <feat>订单回调 2024-08-07 11:12:06 +08:00
wolter 514104a391 定时查询退款单 2024-08-07 10:49:06 +08:00
陈俊宏 ad56b5f0e5 Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-07 10:32:37 +08:00
陈俊宏 82ef285e7d 订单查询 2024-08-07 10:32:15 +08:00
陈俊宏 ca42c43bd2 回调 触发下游回调 2024-08-07 10:22:40 +08:00
陈俊宏 6ab982e874 Merge remote-tracking branch 'origin/feature/rzy/api_1.0' into feature_413_cjh 2024-08-07 10:16:13 +08:00
wolter c79e316233 Merge remote-tracking branch 'refs/remotes/origin/feature/rzy/api_1.0' into feature/zxp 2024-08-07 10:03:42 +08:00
Rzy c8a188e362 回调修改 2024-08-07 10:01:38 +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
wolter e261a39cf5 Merge remote-tracking branch 'refs/remotes/origin/feature/rzy/api_1.0' into feature/zxp 2024-08-07 08:48:28 +08:00
Rzy 7a887833ad 回调 2024-08-06 18:46:05 +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 6cfc7c0c06 <feat>解决冲突 2024-08-06 17:12:18 +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
陈俊宏 2d4d674145 Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-06 16:56:26 +08:00
陈俊宏 d979b7a966 支付宝证书 2024-08-06 16:56:00 +08:00
陈俊宏 38f3e04352 支付宝证书 2024-08-06 16:55:18 +08:00
Rzy 943c3401c6 <feat>支付接口 2024-08-06 16:53:59 +08:00
陈俊宏 0d38872fa6 Merge branch 'feature_413_cjh' into dev/dev1.0 2024-08-06 15:42:22 +08:00
陈俊宏 2927161585 记录操作日志 2024-08-06 15:41:57 +08:00
陈俊宏 e9d3dbece0 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 2024-08-06 15:12:23 +08:00
wolter 3ed083bff6 订单增加字段：用户支付金额 2024-08-06 15:12:05 +08:00
陈俊宏 7ee666e459 order_third_pay_log 更新数据表结构 2024-08-06 15:11:51 +08:00
陈俊宏 d488dddefd 微信发起支付 将订单号转化为字符串 2024-08-06 14:32:50 +08:00
陈俊宏 daf5e2134f 测试阿里 2024-08-06 14:07:56 +08:00
陈俊宏 6adcce1480 回调接口 2024-08-06 11:19:13 +08:00
陈俊宏 74d1472a43 支付配置 2024-08-06 11:09:39 +08:00
陈俊宏 e8576d67d9 支付配置 2024-08-06 10:35:30 +08:00
陈俊宏 9f052435cc 支付配置 2024-08-06 10:22:03 +08:00
Rzy 548491c1f1 <feat>支付部分 2024-08-05 18:45:01 +08:00
wolter 50382f2c0a 后台，定时任务查询订单状态和关闭订单 2024-08-05 17:51:57 +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
Rzy 79723bd945 支付准备 2024-08-05 17:07:11 +08:00
wolter 0ac4feb07a 后台，订单字段调整fix 2024-08-05 17:01:58 +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
wolter 5326e9c8d9 更新models 2024-08-05 14:47:20 +08:00
wolter 490e2fa15f 后台，添加定时任务 2024-08-05 14:40:57 +08:00
Rzy b1a1a4cd50 <feat>api表单验证 2024-08-05 14:05:46 +08:00
Rzy 8ead5e11e2 加密解密 2024-08-05 10:59:02 +08:00
Rzy 4d28483087 Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 
# Conflicts:
#	app/constants/errorcode/error_code.go
 2024-08-05 10:56:30 +08:00
Rzy 13dce2d1c3 加密解密 2024-08-05 10:55:35 +08:00
Rzy aa1481b923 合并代码 2024-08-02 18:38:51 +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 f1bb1ad53b fix 2024-08-02 17:32:49 +08:00
wolter b8da95788b 更新支付方式请求参数 2024-08-02 17:23:38 +08:00
wolter 88b95cb67a 后台 2024-08-02 17:21:18 +08:00
陈俊宏 4842aa47a3 必要位置添加日志 2024-08-02 16:53:48 +08:00
陈俊宏 a79b18d279 支付退款+退款单查询+订单关闭 2024-08-02 16:37:37 +08:00
陈俊宏 f1ee9b4196 支付退款+退款单查询+订单关闭 2024-08-02 16:37:07 +08:00
wolter bf4e24619d 修改后台路由，添加auth校验 2024-08-02 14:32:44 +08:00
wolter f8f0ac2913 应用和支付方式修改不能修改商户id 2024-08-02 13:54:25 +08:00
陈俊宏 4d4338f178 支付调起+订单查询 2024-08-02 13:49:28 +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
Rzy 753b466605 Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 2024-08-02 09:42:03 +08:00
陈俊宏 0b844afa5f Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-02 09:23:06 +08:00
wolter 5a60a92f4b 调整字段白名单和下游通知地址由app管理，更新应用模块 2024-08-02 09:18:49 +08:00
Rzy dd3255e220 <feat>新增rsa,sm2,sm4加解密以及测试用例 2024-08-01 16:40:54 +08:00
Rzy 4be80f228e <fix>(解决冲突)：之后会另起分支 2024-08-01 14:53:22 +08:00
陈俊宏 1a292ff5d3 Merge branch 'dev/dev1.0' into feature_413_cjh 
# Conflicts:
#	app/constants/common/common.go
#	app/data/app.go
#	app/data/order_log.go
#	app/data/pay_channel.go
 2024-08-01 14:48:39 +08:00
陈俊宏 d343257e23 支付提交一波 2024-08-01 14:46:56 +08:00
wolter 95a050d64e 商户模块 2024-08-01 14:43:39 +08:00
wolter 689b0f80db 增加data层，更新model数据表 2024-07-31 18:38:17 +08:00
wolter 89f1c7895a 修改项目module 2024-07-31 17:21:03 +08:00
wuchao 2d3aded2ef 更新--初始化版本 2024-06-17 14:10:13 +08:00
qiyunfanbo126.com 806f3b9781 增加队列 2024-05-27 10:39:55 +08:00
qiyunfanbo126.com b657e551ea Merge remote-tracking branch 'origin/master' 2024-05-09 16:16:33 +08:00
qiyunfanbo126.com 8d8f58aab9 初始化 2024-05-09 16:16:08 +08:00
wolter 337f0c4a87 fix 2024-05-08 14:14:41 +08:00
qiyunfanbo126.com a8e7a96d4c 初始化脚手架 2024-05-08 12:26:02 +08:00
qiyunfanbo126.com 35c9dbdd95 新增基础请求 2024-05-08 11:54:08 +08:00
wolter 8ce86e4621 随机字符串生成 2024-05-08 11:13:57 +08:00
qiyunfanbo126.com 461c734a6e 优化参数查询 2024-05-08 10:33:45 +08:00
qiyunfanbo126.com 213ba47a8b master分支初始化 2024-05-07 18:55:11 +08:00
qiyunfanbo126.com 4deb5edc39 master分支初始化 2024-05-07 18:54:38 +08:00
qiyunfanbo126.com c05c75362f master分支初始化 2024-05-07 18:53:07 +08:00
qiyunfanbo126.com 928463b30c Merge remote-tracking branch 'origin/master' 2024-05-07 18:48:15 +08:00
wolter 3c0e3e4e6a fix 2024-05-07 18:44:13 +08:00
qiyunfanbo126.com 30c0cd8677 封装基础数据操作,错误返回 2024-05-07 18:38:04 +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 a5c7896d0a 用户列表 2024-05-07 10:07:09 +08:00
wuchao 3f0836c5cd 用户列表 2024-05-07 10:00:35 +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 60601f3220 封装基础数据操作 2024-04-30 17:20:44 +08:00
qiyunfanbo126.com 2f268160bb 初始化,修复trace 2024-04-30 14:58:30 +08:00
qiyunfanbo126.com 5c4305ba24 初始化,修复trace 2024-04-30 14:54:24 +08:00
qiyunfanbo126.com 9ad70b7101 初始化,修复trace 2024-04-30 11:47:28 +08:00
qiyunfanbo126.com 8cee5f1f2f 初始化 2024-04-30 11:42:21 +08:00
qiyunfanbo126.com 8c11d75d8c init项目 2024-04-29 15:13:21 +08:00