 Rzy
|
a54212d38c
|
解决冲突
|
2024-08-09 17:26:50 +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 |
|
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 |
|
Rzy
|
cb14c35aa9
|
<feat>调整代码结构
|
2024-08-08 10:48: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 |
|
wolter
|
b19576089c
|
订单查询
|
2024-08-06 17:48:17 +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 |
|
Rzy
|
943c3401c6
|
<feat>支付接口
|
2024-08-06 16:53:59 +08:00 |
|
wolter
|
3ed083bff6
|
订单增加字段：用户支付金额
|
2024-08-06 15:12:05 +08:00 |
|
Rzy
|
548491c1f1
|
<feat>支付部分
|
2024-08-05 18:45:01 +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
|
5326e9c8d9
|
更新models
|
2024-08-05 14:47:20 +08:00 |
|
wolter
|
490e2fa15f
|
后台，添加定时任务
|
2024-08-05 14:40:57 +08:00 |
|
Rzy
|
b1a1a4cd50
|
<feat>api表单验证
|
2024-08-05 14:05:46 +08:00 |
|
Rzy
|
4d28483087
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
# Conflicts:
# app/constants/errorcode/error_code.go
|
2024-08-05 10:56:30 +08:00 |
|
Rzy
|
13dce2d1c3
|
加密解密
|
2024-08-05 10:55:35 +08:00 |
|
Rzy
|
aa1481b923
|
合并代码
|
2024-08-02 18:38:51 +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
|
b8da95788b
|
更新支付方式请求参数
|
2024-08-02 17:23:38 +08:00 |
|
wolter
|
88b95cb67a
|
后台
|
2024-08-02 17:21:18 +08:00 |
|
陈俊宏
|
f1ee9b4196
|
支付退款+退款单查询+订单关闭
|
2024-08-02 16:37:07 +08:00 |
|
wolter
|
f8f0ac2913
|
应用和支付方式修改不能修改商户id
|
2024-08-02 13:54:25 +08:00 |
|
陈俊宏
|
c1e354e4ab
|
支付调起+订单查询
|
2024-08-02 13:47:52 +08:00 |
|
Rzy
|
28bd78ab7f
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
|
2024-08-02 11:44:09 +08:00 |
|
Rzy
|
a056e2b26a
|
api中间件
|
2024-08-02 11:41:54 +08:00 |
|
wolter
|
7a3823a2a7
|
更新订单和订单日志
|
2024-08-02 10:41:57 +08:00 |
|
wolter
|
5a60a92f4b
|
调整字段白名单和下游通知地址由app管理，更新应用模块
|
2024-08-02 09:18:49 +08:00 |
|
wolter
|
95a050d64e
|
商户模块
|
2024-08-01 14:43:39 +08:00 |
qiyunfanbo126.com
|
a8e7a96d4c
|
初始化脚手架
|
2024-05-08 12:26:02 +08:00 |
|
qiyunfanbo126.com
|
35c9dbdd95
|
新增基础请求
|
2024-05-08 11:54:08 +08:00 |
|
qiyunfanbo126.com
|
34a7a78894
|
封装基础数据操作,错误返回
|
2024-05-07 18:11:08 +08:00 |
 wuchao
|
c7813a4863
|
用户列表
|
2024-05-07 09:59:56 +08:00 |
|
wolter
|
e2efa4bfcd
|
init
|
2024-05-06 18:30:29 +08:00 |
|
qiyunfanbo126.com
|
2f268160bb
|
初始化,修复trace
|
2024-04-30 14:58:30 +08:00 |