 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 |