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

198 Commits

Author SHA1 Message Date
Rzy c13634ed08 <feat>退款 2024-08-09 17:49:41 +08:00
Rzy a54212d38c 解决冲突 2024-08-09 17:26:50 +08:00
Rzy bb9ff190c3 <feat>退款 2024-08-09 17:24:03 +08:00
wolter 78380d3a70 前台,订单查询fix 2024-08-09 17:14:30 +08:00
wolter 9a413afa51 后台,订单日志列表增加查询条件 2024-08-09 16:40:21 +08:00
Rzy 7ed9cb048d Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 2024-08-09 16:12:31 +08:00
Rzy d76344573d <feat>rsa加密长度限制改善 2024-08-09 16:12:13 +08:00
wolter b0be00741f 后台,订单日志列表 2024-08-09 16:05:34 +08:00
wolter 966aba1dc4 调整api接口返回加密 2024-08-09 15:23:08 +08:00
陈俊宏 a6e8412654 Merge branch 'feature_413_cjh' into dev/dev1.0 2024-08-09 11:42:14 +08:00
陈俊宏 583aee88e2 支付服务 2024-08-09 11:41:08 +08:00
Rzy 92733acffa <feat>订单重复创建问题 2024-08-09 11:20:33 +08:00
Rzy 1630304f3d <feat>解除pay和paycheck之间的强关联性 2024-08-09 10:43:00 +08:00
Rzy 50ef2fd13a <feat>区分是否需要记录日志 2024-08-09 10:08:30 +08:00
wolter b3d8acba93 前台,调整回调通知地址 2024-08-08 18:32:56 +08:00
wolter 8c05e8ff06 后台,应用通知地址 2024-08-08 18:16:53 +08:00
wolter 5e0627a0f3 增加下游回调日志记录 2024-08-08 17:55:26 +08:00
陈俊宏 f6bdfdf84c Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 2024-08-08 17:25:58 +08:00
陈俊宏 6357d6706d 记录third表的日志信息 2024-08-08 17:25:42 +08:00
Rzy 9b7f904108 回调判断 2024-08-08 17:00:22 +08:00
Rzy 0755b14aa2 <feat>去掉删除判断 2024-08-08 16:37:23 +08:00
Rzy 1f7d46c110 <feat>去掉删除判断 2024-08-08 16:20:36 +08:00
Rzy 7f20bf6925 <feat>增加解密失败报错 2024-08-08 15:46:54 +08:00
wolter 39e64c8a22 后台，rsa生成密钥调整,关闭订单fix 2024-08-08 15:44:02 +08:00
陈俊宏 e5f50423ad Merge branch 'dev/dev1.0' into feature_413_cjh 2024-08-08 15:06:28 +08:00
陈俊宏 222522dc76 记录third表 2024-08-08 14:59:15 +08:00
Rzy 9c725163c8 Merge branch 'feature/rzy/api_1.0' into dev/dev1.0 2024-08-08 14:53:39 +08:00
Rzy ee912a204d <feat>退款 2024-08-08 14:52:30 +08:00
wolter 627e1c852c 后台，密钥对和api接口对应 2024-08-08 14:19:07 +08:00
wolter 342a247c67 后台，查询支付和退款回调,订单查询fix 2024-08-08 11:34:09 +08:00
陈俊宏 c9c7bdbc16 支付宝回调签名 2024-08-08 11:24:56 +08:00
Rzy aa43040aa2 <feat>调整代码结构 2024-08-08 11:15:50 +08:00
Rzy cb14c35aa9 <feat>调整代码结构 2024-08-08 10:48:25 +08:00
Rzy 40dfffe31a <fix>bug修改 2024-08-08 09:49:27 +08:00
Rzy 7ed1ca131b Merge branch 'feature/rzy/api_1.0' into dev/dev1.0 2024-08-08 09:30:39 +08:00
Rzy f225fc0f8c <feat>完善支付 2024-08-08 09:30:02 +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 3061987dae Merge branch 'refs/heads/feature/zxp' into dev/dev1.0 2024-08-08 09:18:49 +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
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