Commit Graph

469 Commits

Author SHA1 Message Date
牛叉闪闪
73bad5713a 添加pcpay 支付 2024-09-12 14:08:19 +08:00
牛叉闪闪
2695748ab7 添加pcpay 支付 2024-09-12 14:08:03 +08:00
668edeb23c 添加单独打票相关mq处理 2024-09-12 11:20:31 +08:00
71b6cfe95c 退款密码校验修改 2024-09-07 00:19:49 +08:00
a9d0810d1a Merge branch 'test' into dev
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
2024-09-06 23:53:05 +08:00
牛叉闪闪
7d713a0a50 修改 2024-09-06 17:38:19 +08:00
牛叉闪闪
4e2da5c676 修改 2024-09-06 17:23:52 +08:00
0d5dec10c6 Merge remote-tracking branch 'origin/test' into test 2024-09-06 11:37:32 +08:00
106c89ec58 1.生成取餐码redis报错修复 2024-09-06 11:37:22 +08:00
牛叉闪闪
781570e2bf 修改 2024-09-06 11:09:57 +08:00
b88c269a1a Merge remote-tracking branch 'origin/test' into test 2024-09-06 10:38:21 +08:00
eb1603a4ee 1.创建订单普通下单不沿用上笔 2024-09-06 10:38:10 +08:00
牛叉闪闪
f96c64f343 Merge remote-tracking branch 'origin/hph' into test 2024-09-06 10:23:53 +08:00
牛叉闪闪
c2555d890f 修改 2024-09-06 10:23:21 +08:00
牛叉闪闪
4bc2ed0bfd Merge remote-tracking branch 'origin/hph' into test 2024-09-05 17:39:54 +08:00
牛叉闪闪
9be00af38c 修改 2024-09-05 17:39:16 +08:00
牛叉闪闪
ffa9bab489 Merge remote-tracking branch 'origin/hph' into test 2024-09-05 17:34:41 +08:00
牛叉闪闪
b8f04c65c0 修改 2024-09-05 17:34:14 +08:00
e086c4df95 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/main/resources/application-pre.yml
2024-09-05 17:07:52 +08:00
牛叉闪闪
09a4918e13 修改 2024-09-05 17:06:51 +08:00
20d86c6a75 1.支付完成清除缓存 2024-09-05 16:14:00 +08:00
a3956663d7 1.支付完成清除缓存 2024-09-05 16:11:19 +08:00
b8b8ee2bf2 Merge remote-tracking branch 'origin/test' into test 2024-09-05 16:06:32 +08:00
c7626c352a 1.支付完成清除缓存 2024-09-05 16:06:22 +08:00
牛叉闪闪
d13d16238e 修改 2024-09-05 15:45:12 +08:00
牛叉闪闪
13fedb841b 修改 2024-09-05 15:24:49 +08:00
e1bd478ae5 1.添加购物车逻辑修改 2024-09-05 11:43:22 +08:00
8eab206fff 1.添加购物车逻辑修改 2024-09-05 11:34:14 +08:00
0600a1d90e 1.添加购物车逻辑修改 2024-09-05 11:28:56 +08:00
6360d01041 1.添加购物车逻辑修改 2024-09-05 11:24:42 +08:00
39fb09e99a Merge remote-tracking branch 'origin/test' into test 2024-09-05 11:13:52 +08:00
fc00b49806 1.打票添加日志 2024-09-05 11:13:40 +08:00
牛叉闪闪
3234ba957f Merge remote-tracking branch 'origin/hph' into test 2024-09-05 11:07:13 +08:00
牛叉闪闪
bca3381ec3 修改 2024-09-05 11:06:36 +08:00
af78237806 Merge remote-tracking branch 'origin/test' into test 2024-09-05 10:42:06 +08:00
01df55d60b 1.代客下单 创建订单查询条件修改 2024-09-05 10:41:56 +08:00
3b3eda15ef pre 内网访问数据库 2024-09-05 10:09:47 +08:00
牛叉闪闪
92d0fb23c8 Merge remote-tracking branch 'origin/hph' into test 2024-09-05 10:00:20 +08:00
牛叉闪闪
9f62cd4165 修改 2024-09-05 09:59:19 +08:00
6acd14da8a 1 2024-09-04 14:20:56 +08:00
3528ebb0c4 测试环境 修改数据连接地址
新增 pre 预发布配置
2024-09-04 11:31:32 +08:00
15ef38936b 测试环境 修改数据连接地址
新增 pre 预发布配置
2024-09-04 11:29:27 +08:00
1d644bc232 1.代客下单 打票未清空缓存修复 2024-09-03 11:09:12 +08:00
f3ad47f0f3 1.代客下单 加入购物车同步保存小程序缓存 2024-09-03 10:39:39 +08:00
牛叉闪闪
3e3a23becd Merge remote-tracking branch 'origin/hph' into test 2024-09-02 10:59:37 +08:00
牛叉闪闪
2985ae0f14 修改 2024-09-02 10:58:59 +08:00
牛叉闪闪
a5046976c5 Merge remote-tracking branch 'origin/hph' into test 2024-09-02 10:56:28 +08:00
牛叉闪闪
637a0cf315 修改 2024-09-02 10:55:37 +08:00
040db99d86 1.打票逻辑修改 2024-09-02 10:32:55 +08:00
4101c5235b 1.获取桌码通过tableId获取 2024-08-31 16:45:08 +08:00