Commit Graph

528 Commits

Author SHA1 Message Date
SongZhang 4d5937821a 购物车商品数量不正确fix 2024-10-08 14:20:06 +08:00
SongZhang 44fc9927b4 退菜接口,sku mapper结构修改 2024-10-08 11:27:42 +08:00
SongZhang 6f0ff52897 选择人数添加锁 2024-09-28 16:26:05 +08:00
SongZhang 0f919e5a5d pc不校验自取模式 2024-09-28 16:04:03 +08:00
SongZhang 99f029d503 打印简化 2024-09-28 15:21:48 +08:00
SongZhang f0ab136220 打印简化 2024-09-28 11:43:56 +08:00
SongZhang c439ac091e 打印简化 2024-09-28 10:53:19 +08:00
SongZhang b1f88d9932 打印简化 2024-09-28 10:49:25 +08:00
SongZhang ea21e97e29 打印简化 2024-09-28 10:40:52 +08:00
SongZhang 57800dab04 Merge remote-tracking branch 'origin/test' into test 2024-09-27 10:38:09 +08:00
SongZhang 19eacd1550 创建订单保存sendType 2024-09-27 10:37:57 +08:00
wangw fda4c29e85 Merge branch 'ww' into test 2024-09-26 17:04:04 +08:00
wangw 657596f619 库存记录 增加操作人 2024-09-26 17:03:42 +08:00
wangw 628ef133ff Merge branch 'ww' into test 2024-09-25 16:49:28 +08:00
wangw 4bbc2408bf 新增会员时 填充加入会员时间 2024-09-25 16:49:03 +08:00
Tankaikai 9970799cf7 Merge branch 'tkk' into test 2024-09-25 11:18:36 +08:00
谭凯凯 caaa3196b3 店铺管理-店铺配置:打印机设置相关接口 2024-09-25 11:17:51 +08:00
SongZhang 501970a89b 修改sql日志打印 2024-09-24 18:06:21 +08:00
SongZhang f8ea5f568a 叫号提示打印修改 2024-09-24 09:57:01 +08:00
SongZhang a27f64dafa 增加异常反打实现,避免异常堆栈信息过长 2024-09-24 09:56:27 +08:00
SongZhang ca49d31260 调整订单逻辑,增加店内外带用餐方式,增加多次下单标记 2024-09-24 09:55:21 +08:00
SongZhang 7adf50ab99 Merge remote-tracking branch 'origin/test' into test 2024-09-20 15:52:09 +08:00
SongZhang 753f3d9d8b 调整mapper扫描方式,增加请求信息打印 2024-09-20 15:51:59 +08:00
yijiegong 43220a03ea Merge remote-tracking branch 'origin/test' into test 2024-09-19 15:34:12 +08:00
yijiegong 851bbfc01e Merge branch 'gyj' into test 2024-09-19 15:33:53 +08:00
yijiegong 45a6bcbe9d Merge branch 'gyj' into dev 2024-09-19 15:32:36 +08:00
yijiegong 3ae12ce04d PC 最新版本下载链接 2024-09-19 15:32:04 +08:00
SongZhang fa94b0b1bf Merge remote-tracking branch 'origin/test' into test 2024-09-19 15:31:10 +08:00
SongZhang 905063987a 增加排号小票打印处理 2024-09-19 15:30:50 +08:00
yijiegong 1ad6aa3de7 支付订单增加remark字段 2024-09-19 13:44:56 +08:00
yijiegong f768f7f473 修改店铺二维码收款 2024-09-19 09:54:00 +08:00
yijiegong d7f2d5afc1 修改支付宝支付 2024-09-18 18:17:28 +08:00
yijiegong 46205fb7ce 修改支付宝支付 地址 2024-09-18 17:48:29 +08:00
yijiegong 53597281d9 修改支付宝支付 地址 2024-09-18 17:42:42 +08:00
yijiegong 9ddef54afd Merge branch 'dev' into test 2024-09-15 19:27:01 +08:00
yijiegong 4ee6999b16 耗材消耗 查询 不管是否开启库存检测 2024-09-15 19:26:42 +08:00
yijiegong a84f3f39b3 请求员工权限 2024-09-14 18:04:47 +08:00
SongZhang 89ac3c9e25 单元测试 2024-09-14 17:50:21 +08:00
SongZhang 808d363daa Merge remote-tracking branch 'origin/test' into test 2024-09-14 17:50:01 +08:00
SongZhang eb8a53718d 单元测试 2024-09-14 17:49:49 +08:00
wangw 8ed1b242ff Merge branch 'ww' into test 2024-09-14 17:41:54 +08:00
wangw 04718abc01 增加sql记录 2024-09-14 17:40:43 +08:00
SongZhang ba54bf9967 Merge remote-tracking branch 'origin/test' into test 2024-09-14 11:50:17 +08:00
SongZhang b74441a62e 打印整合修改 2024-09-14 11:49:56 +08:00
牛叉闪闪 dbb66f93fa 添加pcpay 支付 2024-09-14 09:18:57 +08:00
SongZhang 5c0adcbe37 飞鹅打印折扣空值判断 2024-09-13 15:59:33 +08:00
SongZhang 92008db954 创建订单打包费默认值 2024-09-13 15:50:22 +08:00
SongZhang eb0139282b Merge remote-tracking branch 'origin/test' into test 2024-09-13 15:32:21 +08:00
SongZhang 9a07219470 飞鹅打印机退单小票功能放开 2024-09-13 15:32:12 +08:00
牛叉闪闪 51b66652d4 Merge remote-tracking branch 'origin/hph' into test 2024-09-13 11:09:25 +08:00