 Rzy
|
37100eb589
|
Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
|
2024-08-12 14:38:27 +08:00 |
|
Rzy
|
8549c0fbbd
|
<feat>调整结构，可以返回第三方消息
|
2024-08-12 14:37:48 +08:00 |
wolter
|
553679efa5
|
测试：微信唤起支付
|
2024-08-12 14:37:36 +08:00 |
|
Rzy
|
e2378b0a39
|
去掉第三方消息返回给接口
|
2024-08-12 14:33:09 +08:00 |
|
Rzy
|
8fb2f52108
|
去掉第三方消息返回给接口
|
2024-08-12 14:32:46 +08:00 |
|
Rzy
|
b3b782dfe6
|
去掉第三方消息返回给接口
|
2024-08-12 14:31:56 +08:00 |
|
Rzy
|
7a45794fbc
|
<feat>退款单判重和第三方消息处理返回
|
2024-08-12 14:09:11 +08:00 |
|
wolter
|
e1bd366989
|
前台，响应fix
|
2024-08-12 13:42:22 +08:00 |
|
wolter
|
4032cbdd5b
|
后台，应用可不加密
|
2024-08-12 11:08:24 +08:00 |
|
Rzy
|
18d5f96096
|
Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
|
2024-08-12 10:51:20 +08:00 |
|
Rzy
|
1d5303a4d1
|
<feat>不加密类型
|
2024-08-12 10:50:55 +08:00 |
|
wolter
|
e760d92332
|
fix:记录请求日志
|
2024-08-12 09:52:05 +08:00 |
|
Rzy
|
848ebcc443
|
<feat>报错内容错误
|
2024-08-12 09:18:06 +08:00 |
|
Rzy
|
c15044b862
|
<feat>修改细节
|
2024-08-09 18:13:16 +08:00 |
|
Rzy
|
a54212d38c
|
解决冲突
|
2024-08-09 17:26:50 +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 |
|
Rzy
|
50ef2fd13a
|
<feat>区分是否需要记录日志
|
2024-08-09 10:08:30 +08:00 |
|
wolter
|
8c05e8ff06
|
后台,应用通知地址
|
2024-08-08 18:16:53 +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 |
|
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
|
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 |
|
陈俊宏
|
38f3e04352
|
支付宝证书
|
2024-08-06 16:55:18 +08:00 |
|
Rzy
|
943c3401c6
|
<feat>支付接口
|
2024-08-06 16:53:59 +08:00 |
|
wolter
|
3ed083bff6
|
订单增加字段：用户支付金额
|
2024-08-06 15:12:05 +08:00 |
|
陈俊宏
|
6adcce1480
|
回调接口
|
2024-08-06 11:19:13 +08:00 |
|
陈俊宏
|
9f052435cc
|
支付配置
|
2024-08-06 10:22:03 +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 |
|
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 |