 Rzy
|
c15044b862
|
<feat>修改细节
|
2024-08-09 18:13:16 +08:00 |
 陈俊宏
|
f24a725cef
|
Merge branch 'dev/dev1.0' into feature_413_cjh
|
2024-08-09 17:59:41 +08:00 |
|
陈俊宏
|
bdfd4c6b9c
|
支付服务
|
2024-08-09 17:59:19 +08:00 |
wolter
|
595726bc60
|
Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
|
2024-08-09 17:51:58 +08:00 |
|
wolter
|
413f312ef6
|
实际支付金额fix
|
2024-08-09 17:51:44 +08:00 |
|
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
|
ebea5c52e0
|
<fix>处理bug
|
2024-08-08 09:52:05 +08:00 |
|
Rzy
|
40dfffe31a
|
<fix>bug修改
|
2024-08-08 09:49:27 +08:00 |
|
陈俊宏
|
58f8cedb85
|
Merge branch 'dev/dev1.0' into feature_413_cjh
|
2024-08-08 09:43:02 +08:00 |
|
陈俊宏
|
d6bf4dd952
|
回调log记录
|
2024-08-08 09:42:46 +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 |