 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 |
wolter
|
50382f2c0a
|
后台，定时任务查询订单状态和关闭订单
|
2024-08-05 17:51:57 +08:00 |
|
Rzy
|
79723bd945
|
支付准备
|
2024-08-05 17:07:11 +08:00 |
|
wolter
|
0ac4feb07a
|
后台，订单字段调整fix
|
2024-08-05 17:01:58 +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 |
|
wolter
|
490e2fa15f
|
后台，添加定时任务
|
2024-08-05 14:40:57 +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 |
 陈俊宏
|
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
|
88b95cb67a
|
后台
|
2024-08-02 17:21:18 +08:00 |
|
陈俊宏
|
c1e354e4ab
|
支付调起+订单查询
|
2024-08-02 13:47:52 +08:00 |
|
wolter
|
7a3823a2a7
|
更新订单和订单日志
|
2024-08-02 10:41:57 +08:00 |
|
陈俊宏
|
0b844afa5f
|
Merge branch 'dev/dev1.0' into feature_413_cjh
|
2024-08-02 09:23:06 +08:00 |
|
wolter
|
5a60a92f4b
|
调整字段白名单和下游通知地址由app管理，更新应用模块
|
2024-08-02 09:18:49 +08:00 |
|
陈俊宏
|
1a292ff5d3
|
Merge branch 'dev/dev1.0' into feature_413_cjh
# Conflicts:
# app/constants/common/common.go
# app/data/app.go
# app/data/order_log.go
# app/data/pay_channel.go
|
2024-08-01 14:48:39 +08:00 |
|
陈俊宏
|
d343257e23
|
支付提交一波
|
2024-08-01 14:46:56 +08:00 |
|
wolter
|
95a050d64e
|
商户模块
|
2024-08-01 14:43:39 +08:00 |
|
wolter
|
689b0f80db
|
增加data层，更新model数据表
|
2024-07-31 18:38:17 +08:00 |