 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 |
|
Rzy
|
3e7df62375
|
<feat>网页支付
|
2024-08-05 16:20:01 +08:00 |
|
wolter
|
65621d439b
|
后台，更新请求日志和回调日志data
|
2024-08-05 15:42:20 +08:00 |
|
陈俊宏
|
39fb6d4d93
|
支付回调
|
2024-08-05 15:30:02 +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
|
8ead5e11e2
|
加密解密
|
2024-08-05 10:59:02 +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 |
|
陈俊宏
|
fb5c0e458b
|
回调查询
|
2024-08-02 18:14:04 +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
|
f1bb1ad53b
|
fix
|
2024-08-02 17:32:49 +08:00 |
|
wolter
|
b8da95788b
|
更新支付方式请求参数
|
2024-08-02 17:23:38 +08:00 |
|
wolter
|
88b95cb67a
|
后台
|
2024-08-02 17:21:18 +08:00 |
|
陈俊宏
|
4842aa47a3
|
必要位置添加日志
|
2024-08-02 16:53:48 +08:00 |
|
陈俊宏
|
a79b18d279
|
支付退款+退款单查询+订单关闭
|
2024-08-02 16:37:37 +08:00 |
|
陈俊宏
|
f1ee9b4196
|
支付退款+退款单查询+订单关闭
|
2024-08-02 16:37:07 +08:00 |
|
wolter
|
bf4e24619d
|
修改后台路由，添加auth校验
|
2024-08-02 14:32:44 +08:00 |
|
wolter
|
f8f0ac2913
|
应用和支付方式修改不能修改商户id
|
2024-08-02 13:54:25 +08:00 |
|
陈俊宏
|
4d4338f178
|
支付调起+订单查询
|
2024-08-02 13:49:28 +08:00 |