Commit Graph

511 Commits

Author SHA1 Message Date
SongZhang 106c89ec58 1.生成取餐码redis报错修复 2024-09-06 11:37:22 +08:00
牛叉闪闪 781570e2bf 修改 2024-09-06 11:09:57 +08:00
SongZhang b88c269a1a Merge remote-tracking branch 'origin/test' into test 2024-09-06 10:38:21 +08:00
SongZhang 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
SongZhang 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
SongZhang 20d86c6a75 1.支付完成清除缓存 2024-09-05 16:14:00 +08:00
SongZhang a3956663d7 1.支付完成清除缓存 2024-09-05 16:11:19 +08:00
SongZhang b8b8ee2bf2 Merge remote-tracking branch 'origin/test' into test 2024-09-05 16:06:32 +08:00
SongZhang 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
SongZhang e1bd478ae5 1.添加购物车逻辑修改 2024-09-05 11:43:22 +08:00
SongZhang 8eab206fff 1.添加购物车逻辑修改 2024-09-05 11:34:14 +08:00
SongZhang 0600a1d90e 1.添加购物车逻辑修改 2024-09-05 11:28:56 +08:00
SongZhang 6360d01041 1.添加购物车逻辑修改 2024-09-05 11:24:42 +08:00
SongZhang 39fb09e99a Merge remote-tracking branch 'origin/test' into test 2024-09-05 11:13:52 +08:00
SongZhang 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
SongZhang af78237806 Merge remote-tracking branch 'origin/test' into test 2024-09-05 10:42:06 +08:00
SongZhang 01df55d60b 1.代客下单 创建订单查询条件修改 2024-09-05 10:41:56 +08:00
wangw 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
wangw 6acd14da8a 1 2024-09-04 14:20:56 +08:00
wangw 3528ebb0c4 测试环境 修改数据连接地址
新增 pre 预发布配置
2024-09-04 11:31:32 +08:00
wangw 15ef38936b 测试环境 修改数据连接地址
新增 pre 预发布配置
2024-09-04 11:29:27 +08:00
SongZhang 1d644bc232 1.代客下单 打票未清空缓存修复 2024-09-03 11:09:12 +08:00
SongZhang 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
SongZhang 040db99d86 1.打票逻辑修改 2024-09-02 10:32:55 +08:00
SongZhang 4101c5235b 1.获取桌码通过tableId获取 2024-08-31 16:45:08 +08:00
SongZhang ed78691326 1.退款下票数量错误fix 2024-08-30 16:45:19 +08:00
SongZhang cff864f2da 1.退款下票数量错误fix 2024-08-30 15:47:38 +08:00
SongZhang f857715b0f 1.代客下单 商品数量减少增加打印退单票据 2024-08-30 15:15:54 +08:00
SongZhang 83d3aa444f 1.代客下单 商品数量减少增加打印退单票据 2024-08-30 15:06:56 +08:00
牛叉闪闪 e0b62b66d4 修改 2024-08-30 14:40:43 +08:00
yijiegong 187a757575 密码校验修改 2024-08-30 11:16:36 +08:00
SongZhang 32590bb35a Merge remote-tracking branch 'origin/test' into test 2024-08-30 10:42:28 +08:00
SongZhang 4bea33ff3e 1.代客下单退款单打印 2024-08-30 10:42:17 +08:00