Commit Graph

29 Commits

Author SHA1 Message Date
wolter 9a2c47ec0d feat: 收银台页面调整展示内容,付款模板页面调整展示内容,接口错误提示修改 2024-12-24 14:57:33 +08:00
wolter 2a21f854e1 feat: 收银台 2024-12-23 15:42:16 +08:00
wolter 0ae425e4bb feat: 下单接口v2 2024-12-21 15:48:48 +08:00
wolter 81dfd00cf9 feat: 微信支付2 2024-12-06 19:51:52 +08:00
陈俊宏 6357d6706d 记录third表的日志信息 2024-08-08 17:25:42 +08:00
wolter 3061987dae Merge branch 'refs/heads/feature/zxp' into dev/dev1.0 2024-08-08 09:18:49 +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
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
陈俊宏 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 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 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
陈俊宏 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
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 95a050d64e 商户模块 2024-08-01 14:43:39 +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