Commit Graph

49 Commits

Author SHA1 Message Date
Rzy bb9ff190c3 <feat>退款 2024-08-09 17:24:03 +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 7f20bf6925 <feat>增加解密失败报错 2024-08-08 15:46:54 +08:00
Rzy ee912a204d <feat>退款 2024-08-08 14:52:30 +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
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
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
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
陈俊宏 2927161585 记录操作日志 2024-08-06 15:41:57 +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 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
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
陈俊宏 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
wolter bf4e24619d 修改后台路由,添加auth校验 2024-08-02 14:32:44 +08:00
陈俊宏 c1e354e4ab 支付调起+订单查询 2024-08-02 13:47:52 +08:00
Rzy a056e2b26a api中间件 2024-08-02 11:41:54 +08:00
wolter 5a60a92f4b 调整字段白名单和下游通知地址由app管理,更新应用模块 2024-08-02 09:18:49 +08:00
wolter 95a050d64e 商户模块 2024-08-01 14:43:39 +08:00
wuchao 2d3aded2ef 更新--初始化版本 2024-06-17 14:10:13 +08:00
qiyunfanbo126.com 30c0cd8677 封装基础数据操作,错误返回 2024-05-07 18:38:04 +08:00
wuchao c7813a4863 用户列表 2024-05-07 09:59:56 +08:00
qiyunfanbo126.com 8c11d75d8c init项目 2024-04-29 15:13:21 +08:00