 wangw
|
5922665e32
|
店铺扩展信息 通过类型查询
|
2024-09-18 10:08:02 +08:00 |
|
wangw
|
9fa99a28e3
|
店铺扩展信息 通过类型查询
|
2024-09-18 10:07:43 +08:00 |
 SongZhang
|
d0cec6c5ed
|
排号获取桌型列表fix
|
2024-09-18 10:01:27 +08:00 |
|
SongZhang
|
5a6d4ce854
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 17:22:29 +08:00 |
|
SongZhang
|
04c83a5213
|
排队桌型列表状态增加筛选
|
2024-09-14 17:22:09 +08:00 |
|
wangw
|
19a4c0124e
|
Merge branch 'ww' into test
|
2024-09-14 17:16:49 +08:00 |
|
wangw
|
5215a440c9
|
去除多余注解
配置 sql日志监听
|
2024-09-14 17:15:55 +08:00 |
 yijiegong
|
2abfc01d83
|
Merge branch 'gyj' into test
|
2024-09-14 16:59:15 +08:00 |
|
yijiegong
|
35d66973bc
|
删除注解
|
2024-09-14 16:58:47 +08:00 |
|
SongZhang
|
5351be915c
|
排队桌型列表添加总人数
|
2024-09-14 16:57:32 +08:00 |
|
SongZhang
|
b9562194b6
|
叫号报错fix
|
2024-09-14 16:48:54 +08:00 |
|
SongZhang
|
54e2bd1651
|
日志级别修改
|
2024-09-14 16:45:02 +08:00 |
|
SongZhang
|
14352a6d7b
|
排队桌型列表修改
|
2024-09-14 16:40:28 +08:00 |
|
SongZhang
|
2ff0216f68
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:28:06 +08:00 |
|
SongZhang
|
d3d401d2f3
|
排号增加天数查询限制
|
2024-09-14 16:27:54 +08:00 |
|
yijiegong
|
50dc84efd5
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:24:36 +08:00 |
|
yijiegong
|
b101bac68c
|
Merge branch 'gyj' into test
|
2024-09-14 16:23:36 +08:00 |
|
yijiegong
|
bdad979450
|
员工权限
|
2024-09-14 16:22:41 +08:00 |
|
SongZhang
|
48f82895e7
|
叫号增加微信提醒
|
2024-09-14 16:07:46 +08:00 |
|
SongZhang
|
f516dae0da
|
叫号记录增加字段
|
2024-09-14 16:05:08 +08:00 |
|
SongZhang
|
e35da7f608
|
叫号记录增加字段
|
2024-09-14 16:02:35 +08:00 |
|
SongZhang
|
a9589edca5
|
叫号记录增加字段
|
2024-09-14 15:59:46 +08:00 |
|
SongZhang
|
99e7cdf5a9
|
叫号记录增加字段
|
2024-09-14 15:55:22 +08:00 |
|
SongZhang
|
a956e7b764
|
叫号记录增加字段
|
2024-09-14 15:52:13 +08:00 |
|
SongZhang
|
90e8e4944e
|
叫号记录增加字段
|
2024-09-14 15:50:06 +08:00 |
|
SongZhang
|
6b9d488749
|
叫号微信小程序模板消息实现
|
2024-09-14 15:45:55 +08:00 |
|
SongZhang
|
675569c19e
|
排号增加叫号记录接口
|
2024-09-14 15:16:49 +08:00 |
|
SongZhang
|
077222c9b7
|
排号桌型列表返回总人数
|
2024-09-14 15:01:34 +08:00 |
|
SongZhang
|
8f2303d1bf
|
代客下单人数未保存fix
|
2024-09-14 14:50:22 +08:00 |
|
SongZhang
|
ec70083bd6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 11:47:27 +08:00 |
|
SongZhang
|
f9b5dbad58
|
台桌修改状态清除用餐人数
|
2024-09-14 11:47:03 +08:00 |
|
wangw
|
116852ce30
|
店铺参数 小程序码
|
2024-09-14 09:14:47 +08:00 |
|
wangw
|
c9c6bb6349
|
店铺参数 小程序码
|
2024-09-14 09:14:19 +08:00 |
|
SongZhang
|
78ed984ef8
|
台桌修改状态清除用餐人数
|
2024-09-13 15:45:14 +08:00 |
|
SongZhang
|
67af4f1463
|
排队取号保存号码
|
2024-09-13 15:24:11 +08:00 |
|
SongZhang
|
a73530df84
|
排队取号保存号码
|
2024-09-13 15:14:03 +08:00 |
|
SongZhang
|
5e8601745b
|
客座费修改fix
|
2024-09-13 15:13:39 +08:00 |
|
SongZhang
|
69053261e0
|
扫码排队增删改查接口
|
2024-09-13 11:49:51 +08:00 |
|
SongZhang
|
62c28fe2f6
|
扫码排队增删改查接口
|
2024-09-13 11:49:20 +08:00 |
|
SongZhang
|
b1e5ae969b
|
1.台桌列表支持精确搜索
2.台桌选择人数校验最大人数
|
2024-09-13 10:24:12 +08:00 |
|
SongZhang
|
ff27101e13
|
1.代客下单 orderDetail同步保存cartid
|
2024-09-12 16:58:35 +08:00 |
|
SongZhang
|
7c00d0d9a0
|
1.代客下单 创建订单直接付款不增加placeNum
|
2024-09-12 14:54:53 +08:00 |
|
SongZhang
|
7f0056304d
|
1.代客下单 创建订单直接付款不增加placeNum
|
2024-09-12 14:47:08 +08:00 |
|
SongZhang
|
a40431fbe7
|
1.代客下单 添加购物车新增单品备注
|
2024-09-12 14:43:54 +08:00 |
|
SongZhang
|
0f9c370118
|
1.代客下单 添加购物车新增单品备注
|
2024-09-12 14:38:45 +08:00 |
|
SongZhang
|
5c2b995d1f
|
1.代客下单 创建订单placeNum不正常修复
|
2024-09-12 14:21:56 +08:00 |
|
SongZhang
|
90d5e3888b
|
1.代客下单 退单fix
|
2024-09-12 14:08:13 +08:00 |
|
SongZhang
|
d7bf0f2811
|
1.代客下单 打印当前台桌菜品
|
2024-09-12 11:21:06 +08:00 |
|
SongZhang
|
be097e8b2d
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-12 10:47:36 +08:00 |
|
SongZhang
|
e08f83ac6e
|
1.代客下单 删除fix
|
2024-09-12 10:47:16 +08:00 |
|
wangw
|
d2d5c10b0e
|
Merge branch 'ww' into test
|
2024-09-12 10:31:53 +08:00 |
|
wangw
|
baa9c6c260
|
店铺修改 参数问题 非空
|
2024-09-12 10:31:26 +08:00 |
|
wangw
|
0a3b50ef6f
|
店铺修改 参数问题
|
2024-09-12 10:26:54 +08:00 |
|
wangw
|
8b099a2ae6
|
店铺修改 参数问题
|
2024-09-12 10:26:28 +08:00 |
|
SongZhang
|
7e29627bf6
|
1.代客下单 删除报错fix
|
2024-09-12 10:22:12 +08:00 |
|
SongZhang
|
242427f1ee
|
1.代客下单 台桌状态修改
|
2024-09-12 10:07:53 +08:00 |
|
SongZhang
|
c5d92f9ea6
|
1.代客下单 购物车返回结构修改，添加购物车不设置placeNum
|
2024-09-12 09:49:54 +08:00 |
|
SongZhang
|
48078ad2d6
|
1.代客下单 购物车返回结构修改，添加购物车不设置placeNum
|
2024-09-12 09:33:16 +08:00 |
|
SongZhang
|
7af4a48dfa
|
1.代客下单 添加台桌就餐人数
|
2024-09-11 18:04:06 +08:00 |
|
SongZhang
|
3b9617a03e
|
1.已退单商品忽略订单总价
|
2024-09-11 18:00:46 +08:00 |
|
SongZhang
|
7921c21295
|
1.取消挂单修改状态
|
2024-09-11 17:52:37 +08:00 |
|
SongZhang
|
822141899c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-11 17:37:33 +08:00 |
|
SongZhang
|
2f4fec7631
|
1.退单
|
2024-09-11 17:37:25 +08:00 |
|
wangw
|
c0bad61875
|
Merge branch 'ww' into test
|
2024-09-11 17:10:20 +08:00 |
|
wangw
|
5d15b3c309
|
翻台率 不保留小数
|
2024-09-11 17:09:44 +08:00 |
|
SongZhang
|
770c8e01f2
|
1.代客下单订单打印
2.批量生成台桌
|
2024-09-11 16:59:20 +08:00 |
|
wangw
|
1dd8dc4508
|
营业板块 金额问题
|
2024-09-11 16:54:02 +08:00 |
|
wangw
|
f039135371
|
营业板块 金额问题
|
2024-09-11 16:52:09 +08:00 |
|
SongZhang
|
2ef311f887
|
1.代客下单 创建订单更新台桌使用时间
|
2024-09-11 14:59:57 +08:00 |
|
SongZhang
|
2c99b8cd18
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:55:27 +08:00 |
|
SongZhang
|
26b3e0bc2c
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:53:21 +08:00 |
|
SongZhang
|
3ebec6f0c5
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:49:22 +08:00 |
|
SongZhang
|
f2bfc718c3
|
1.代客下单 已下单商品不支持操作
|
2024-09-11 14:08:41 +08:00 |
|
SongZhang
|
dc0f6eae1e
|
1.代客下单 客位费
|
2024-09-11 11:26:58 +08:00 |
|
SongZhang
|
373fb2bdf0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-11 11:18:45 +08:00 |
|
SongZhang
|
10290bd37b
|
1.代客下单 退单接口 选择台桌 选择人数
|
2024-09-11 11:17:39 +08:00 |
|
wangw
|
535079c14d
|
店铺信息 桌位费 收款码 付款模式 就餐形式
|
2024-09-11 11:02:29 +08:00 |
|
wangw
|
df4886d62c
|
翻台率 百分数
|
2024-09-10 16:11:36 +08:00 |
|
wangw
|
efd9d78227
|
首页 数据统计
|
2024-09-10 15:54:40 +08:00 |
|
yijiegong
|
6c480acd20
|
Merge branch 'gyj' into test
|
2024-09-10 09:21:35 +08:00 |
|
yijiegong
|
260bf68c23
|
Merge branch 'gyj' into dev
|
2024-09-10 09:19:50 +08:00 |
|
yijiegong
|
c063c19532
|
二维码下载数量限制500
|
2024-09-10 09:14:37 +08:00 |
|
SongZhang
|
6096f91b6c
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-09-10 09:10:48 +08:00 |
|
wangw
|
05adbeb584
|
sql执行时长
|
2024-09-09 18:18:30 +08:00 |
|
SongZhang
|
50e0f09be8
|
1.代客下单 扫码支付记录不准确修复
|
2024-09-09 10:55:19 +08:00 |
|
SongZhang
|
09252dda7c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-09 10:39:07 +08:00 |
|
SongZhang
|
db545ee118
|
1.代客下单 扫码支付校验相关参数
|
2024-09-09 10:38:57 +08:00 |
|
wangw
|
fec443ce6c
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
# eladmin-system/src/main/resources/config/application-pre.yml
|
2024-09-09 09:59:01 +08:00 |
|
wangw
|
c618c712f3
|
验证码 区间
|
2024-09-06 17:02:29 +08:00 |
|
wangw
|
98bb93516f
|
去除实体类TagProductDepts 没有主键的提示
|
2024-09-06 11:14:50 +08:00 |
|
SongZhang
|
72a3057126
|
1.代客下单 失败添加消息提示
|
2024-09-05 15:04:23 +08:00 |
|
SongZhang
|
b7fc525623
|
1.代客下单 失败添加消息提示
|
2024-09-05 15:01:31 +08:00 |
|
SongZhang
|
f458e6f77e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 14:57:27 +08:00 |
|
SongZhang
|
7b91549664
|
1.代客下单 失败添加消息提示
|
2024-09-05 14:57:15 +08:00 |
|
wangw
|
10373ab45f
|
版本管理列表 时间倒叙
|
2024-09-05 11:01:36 +08:00 |
|
SongZhang
|
a08d181e77
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 10:54:58 +08:00 |
|
SongZhang
|
50faef4a20
|
1.代客下单 失败添加消息提示
|
2024-09-05 10:54:36 +08:00 |
|
wangw
|
782a152243
|
pre 内网访问数据库
|
2024-09-05 10:11:11 +08:00 |
|
SongZhang
|
8f002b689d
|
1.代客下单 折扣差1修复
|
2024-09-05 09:56:38 +08:00 |
|
wangw
|
4bd99e7f6e
|
预发布 mq端口修改
|
2024-09-05 09:54:47 +08:00 |