 陈俊宏
|
86af800c7c
|
Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
|
2024-08-12 14:55:02 +08:00 |
|
陈俊宏
|
5247c2999f
|
微信回调APPID问题
|
2024-08-12 14:54:52 +08:00 |
 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
|
05b0663c21
|
后台，生成密钥对rsa加密去掉换行
|
2024-08-12 13:44: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
|
ef153770af
|
fix:退款
|
2024-08-12 10:47:40 +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 |
|
陈俊宏
|
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 |