 SongZhang
|
220ec46d4b
|
代客下单订单同步保存就餐人数
|
2024-09-23 13:35:05 +08:00 |
|
SongZhang
|
eacf010f15
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 13:29:53 +08:00 |
|
SongZhang
|
1a01ff5cce
|
代客下单订单同步保存餐位费
|
2024-09-23 13:29:15 +08:00 |
|
SongZhang
|
1babbfdefe
|
代客下单订单同步保存餐位费
|
2024-09-23 13:28:14 +08:00 |
 wangw
|
31b20a92fd
|
Merge branch 'ww' into test
|
2024-09-23 11:43:44 +08:00 |
|
wangw
|
6af7109afb
|
商品列表 展开问题
|
2024-09-23 11:43:26 +08:00 |
|
wangw
|
f982f82713
|
Merge branch 'ww' into test
|
2024-09-23 11:37:58 +08:00 |
|
wangw
|
01ba195445
|
商品列表 展开问题
|
2024-09-23 11:36:59 +08:00 |
|
SongZhang
|
3873009e63
|
叫号记录降序
|
2024-09-23 11:29:15 +08:00 |
|
SongZhang
|
f28466cfae
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 11:16:54 +08:00 |
|
SongZhang
|
1ab55c2c46
|
排队取号顺延之后支持重复取号
扫码取号实现
|
2024-09-23 11:16:33 +08:00 |
 yijiegong
|
2426a8155e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 11:01:42 +08:00 |
|
yijiegong
|
e54aaa7c14
|
Merge branch 'gyj' into test
|
2024-09-23 11:01:28 +08:00 |
|
yijiegong
|
1e54eb1456
|
hasPermission 增加默认值
|
2024-09-23 11:00:55 +08:00 |
|
wangw
|
a3c9deda29
|
员工 实体类 位置
|
2024-09-23 11:00:25 +08:00 |
|
SongZhang
|
871b0c5262
|
排队取号顺延之后支持重复取号
|
2024-09-23 10:59:48 +08:00 |
|
SongZhang
|
2eff0601c7
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 10:25:37 +08:00 |
|
SongZhang
|
272ebd6663
|
代客下单获取下单次数增加useType
|
2024-09-23 10:25:09 +08:00 |
|
yijiegong
|
96bfc97675
|
增加员工权限 员工权限bug
|
2024-09-23 10:13:16 +08:00 |
|
yijiegong
|
48abe51c47
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 10:10:40 +08:00 |
|
yijiegong
|
c946db4348
|
增加员工权限 员工权限bug
|
2024-09-23 10:10:19 +08:00 |
|
SongZhang
|
0fdae37924
|
代客下单选择人数增加用餐类型
|
2024-09-23 09:56:54 +08:00 |
|
SongZhang
|
f5d64cbb4a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 09:51:26 +08:00 |
|
SongZhang
|
0e23f94e80
|
叫号添加顺延
|
2024-09-23 09:51:05 +08:00 |
|
yijiegong
|
869059bf59
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 09:50:12 +08:00 |
|
yijiegong
|
db371bf9fb
|
Merge branch 'gyj' into test
|
2024-09-23 09:49:42 +08:00 |
|
yijiegong
|
039c0e9166
|
增加员工权限 - 先插入 员工
|
2024-09-23 09:49:27 +08:00 |
|
wangw
|
f70ef125ed
|
员工 实体类 位置
|
2024-09-23 09:48:25 +08:00 |
|
wangw
|
099b6bed74
|
Merge branch 'ww' into test
|
2024-09-20 18:24:22 +08:00 |
|
wangw
|
00512ba83b
|
商品快捷操作接口 以及 落地记录2
|
2024-09-20 18:24:06 +08:00 |
|
wangw
|
0abcbbec32
|
Merge branch 'ww' into test
|
2024-09-20 18:18:13 +08:00 |
|
wangw
|
de8199df49
|
商品快捷操作接口 以及 落地记录
|
2024-09-20 18:17:26 +08:00 |
|
SongZhang
|
9e25471e1e
|
代码合并
|
2024-09-20 17:43:27 +08:00 |
|
yijiegong
|
546b63e336
|
Merge branch 'gyj' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-09-20 17:35:45 +08:00 |
|
yijiegong
|
c3597cd28e
|
修改台桌统计导出数据
|
2024-09-20 17:15:05 +08:00 |
|
wangw
|
d8ed96dff7
|
交班2
|
2024-09-20 16:10:36 +08:00 |
|
SongZhang
|
bd2e79027d
|
修改排号卓型校验nearNum
|
2024-09-20 11:24:58 +08:00 |
|
SongZhang
|
b81e72a0cc
|
修改排号卓型不校验nearNum
|
2024-09-20 11:22:49 +08:00 |
|
SongZhang
|
5c0b87634c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 11:13:38 +08:00 |
|
SongZhang
|
948932cb0a
|
桌型列表isPostpone改为布尔值
|
2024-09-20 11:12:44 +08:00 |
|
wangw
|
4f89609f07
|
Merge branch 'ww' into test
|
2024-09-20 11:00:03 +08:00 |
|
wangw
|
7d5ebbfb65
|
交班 api/tbHandover/handoverData
|
2024-09-20 10:59:22 +08:00 |
|
SongZhang
|
4a2fc4e2e0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 09:49:41 +08:00 |
|
SongZhang
|
34c052902a
|
增加排号卓型添加顺延字段
|
2024-09-20 09:49:31 +08:00 |
|
wangw
|
c020a64469
|
Merge branch 'ww' into test
|
2024-09-20 09:28:44 +08:00 |
|
wangw
|
05e1d5390c
|
规格返回 上下架字段
|
2024-09-20 09:28:33 +08:00 |
|
wangw
|
6a96987857
|
Merge branch 'ww' into test
|
2024-09-20 09:23:57 +08:00 |
|
wangw
|
0f2eea3e13
|
商品价格范围为空问题
|
2024-09-20 09:23:45 +08:00 |
|
SongZhang
|
0d06185849
|
过号发送过号模板消息
|
2024-09-19 17:51:58 +08:00 |
|
SongZhang
|
aded35b3c1
|
排队叫号添加微信模板消息提醒
|
2024-09-19 17:46:08 +08:00 |
|
SongZhang
|
395cd4750c
|
增加小程序模板消息配置
|
2024-09-19 17:29:16 +08:00 |
|
SongZhang
|
14c437a30e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 17:28:18 +08:00 |
|
SongZhang
|
25e45d779d
|
增加小程序模板消息配置
|
2024-09-19 17:27:55 +08:00 |
|
wangw
|
e56c7c6d81
|
商品 上下架
|
2024-09-19 17:13:17 +08:00 |
|
wangw
|
f55f709fec
|
商品 上下架
|
2024-09-19 17:12:08 +08:00 |
|
SongZhang
|
e72cc189da
|
台桌信息返回当前订单id
|
2024-09-19 17:05:27 +08:00 |
|
SongZhang
|
9cd49383ff
|
取号打票
|
2024-09-19 16:53:51 +08:00 |
|
SongZhang
|
e525d7e058
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 16:53:38 +08:00 |
|
SongZhang
|
4e76bb2736
|
代客下单就餐模式判断
|
2024-09-19 16:53:18 +08:00 |
|
wangw
|
f8ac16b457
|
Merge branch 'ww' into test
|
2024-09-19 16:06:55 +08:00 |
|
wangw
|
df3e3604f2
|
商品详情 增加关于耗材的 信息
/api/tbProskuCon/V2 新增商品耗材绑定关系
|
2024-09-19 16:06:30 +08:00 |
|
SongZhang
|
d7eaca4af2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 11:14:38 +08:00 |
|
SongZhang
|
b4c1743a26
|
代客下单就餐模式切换接口
|
2024-09-19 11:14:17 +08:00 |
|
wangw
|
4a6d12f3ad
|
商品列表 V2
|
2024-09-19 11:13:18 +08:00 |
|
wangw
|
aa880477cb
|
店铺扩展信息 通过类型查询 title字段
|
2024-09-19 11:13:18 +08:00 |
|
SongZhang
|
a262f6f6b5
|
代客下单就餐模式切换接口
|
2024-09-19 10:58:16 +08:00 |
|
wangw
|
e4a8991205
|
商品列表 V2
|
2024-09-19 10:37:59 +08:00 |
|
SongZhang
|
2f6bbd4dec
|
挂单报错fix
|
2024-09-19 10:17:27 +08:00 |
|
SongZhang
|
079bf18d4c
|
叫号配置接口
|
2024-09-19 10:16:50 +08:00 |
|
SongZhang
|
66dc7c8581
|
代客下单 下单根据店铺配置校验餐位费
|
2024-09-18 17:51:55 +08:00 |
|
wangw
|
e4b25899e5
|
店铺扩展信息 通过类型查询 title字段
|
2024-09-18 17:32:55 +08:00 |
|
SongZhang
|
1b3158930f
|
代客下单支持外带用餐模式
|
2024-09-18 17:29:10 +08:00 |
|
SongZhang
|
e9fa13fdd8
|
排队取号时间格式修改
|
2024-09-18 11:09:32 +08:00 |
|
SongZhang
|
116ced92cb
|
排队取号记录修改
|
2024-09-18 10:38:51 +08:00 |
|
SongZhang
|
510372ff46
|
排队取号返回叫号信息
|
2024-09-18 10:31:52 +08:00 |
|
SongZhang
|
1cd6bca4ba
|
排号修改叫号状态修改
|
2024-09-18 10:22:32 +08:00 |
|
SongZhang
|
d0042e3d63
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-18 10:20:48 +08:00 |
|
SongZhang
|
e129be76e8
|
排号修改叫号状态修改
|
2024-09-18 10:20:26 +08:00 |
|
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 |
|
wangw
|
1cb099702a
|
预发布 mq端口修改
|
2024-09-05 09:47:07 +08:00 |
|
SongZhang
|
3174c9abf3
|
1.代客下单 扫码支付，储值卡扫码支付, 台桌状态
|
2024-09-05 09:27:35 +08:00 |
|
SongZhang
|
fed5b28ce2
|
1.代客下单 扫码支付，储值卡扫码支付, 台桌状态
|
2024-09-05 09:24:50 +08:00 |
|
wangw
|
53512a0b37
|
简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:32:01 +08:00 |
|
wangw
|
be701b46ec
|
简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:30:56 +08:00 |
|
SongZhang
|
8247b3b4bd
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 10:19:08 +08:00 |
|
SongZhang
|
963920fd2a
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 10:18:07 +08:00 |
|
SongZhang
|
0b645bd695
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 09:21:25 +08:00 |
|
SongZhang
|
44329cc64e
|
1.代客下单 支付折扣
|
2024-09-03 11:09:36 +08:00 |
|
wangw
|
37be5a521e
|
设置验证码接口
|
2024-09-03 10:57:18 +08:00 |
|
SongZhang
|
d63861ac13
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-03 10:42:09 +08:00 |
|
SongZhang
|
1b9b088e43
|
1.代客下单 创建订单删除小程序购物车缓存
|
2024-09-03 10:41:57 +08:00 |
牛叉闪闪
|
6e31bb6251
|
添加会员流水
|
2024-09-02 16:27:55 +08:00 |
|
牛叉闪闪
|
4b5c272cd9
|
添加会员流水
|
2024-09-02 15:03:40 +08:00 |
|
SongZhang
|
5480d0eb5f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-02 14:51:05 +08:00 |
|
SongZhang
|
be4f8cbbdd
|
1.代客下单 创建订单增加锁
2.代客下单 主扫支付
|
2024-09-02 14:50:40 +08:00 |
|
牛叉闪闪
|
923c204c3c
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
|
2024-09-02 14:43:29 +08:00 |
|
牛叉闪闪
|
b1219a114b
|
添加会员流水
|
2024-09-02 14:41:57 +08:00 |
|
牛叉闪闪
|
94e875008b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-01 13:37:28 +08:00 |
|
牛叉闪闪
|
e823832cdb
|
添加多规格商品价格最大值
|
2024-09-01 13:36:28 +08:00 |
|
SongZhang
|
cce10b9475
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-31 16:48:48 +08:00 |
|
SongZhang
|
68b9b1ab98
|
1.代客下单 创建订单保存订单id到缓存
2.修复挂起订单重复打票
|
2024-08-31 16:48:37 +08:00 |
|
yijiegong
|
e131095e45
|
Merge branch 'test' into dev
|
2024-08-31 09:13:18 +08:00 |
|
yijiegong
|
c2843ecc3d
|
店铺扩展默认参数修改
|
2024-08-31 09:12:05 +08:00 |
|
SongZhang
|
7b62f75cca
|
1.代客下单 创建订单保存台桌名称
|
2024-08-30 17:27:55 +08:00 |
|
SongZhang
|
d6756ee2e3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-30 15:27:42 +08:00 |
|
SongZhang
|
26f6af0256
|
1.代客下单 添加购物车接口添加id
|
2024-08-30 15:27:31 +08:00 |
|
yijiegong
|
77f01cabdc
|
userId 为null处理
|
2024-08-30 11:49:42 +08:00 |
|
yijiegong
|
33a0722c8c
|
userId 为null处理
|
2024-08-30 11:33:10 +08:00 |
|
yijiegong
|
b0392f70e1
|
userId 为null处理
|
2024-08-30 11:32:09 +08:00 |
|
yijiegong
|
9ea2ecf552
|
查询会员订单数量bug修复
|
2024-08-30 11:26:23 +08:00 |
|
SongZhang
|
52410b73f1
|
1.代客下单 支持下单修改会员
|
2024-08-29 18:26:22 +08:00 |
|
SongZhang
|
a68b7ee991
|
1.代客下单，折扣
|
2024-08-29 17:59:16 +08:00 |
|
SongZhang
|
71bc936074
|
1.代客下单，折扣
|
2024-08-29 17:57:56 +08:00 |
|
SongZhang
|
297ccc0233
|
1.代客下单，折扣
|
2024-08-29 14:13:19 +08:00 |
|
SongZhang
|
417451f432
|
1.修改会员余额支付备注
|
2024-08-29 13:45:49 +08:00 |
|
SongZhang
|
0fe0722893
|
1.代客下单 挂起订单增加masterId
|
2024-08-29 11:27:51 +08:00 |
|
wangw
|
dc176f6e46
|
代客下单 商品列表 数据缺失问题
|
2024-08-28 18:04:57 +08:00 |
|
wangw
|
59843ce046
|
代客下单 createOrder 报错问题
|
2024-08-28 17:32:07 +08:00 |
|
wangw
|
979a3a6ade
|
版本文件 接口记录
|
2024-08-28 16:21:55 +08:00 |
|
wangw
|
17fc234975
|
版本管理 和 版本文件上传
|
2024-08-28 15:45:46 +08:00 |
|
wangw
|
09c6cd178a
|
订单生成 库存消耗记录 并记录销量
|
2024-08-28 15:45:21 +08:00 |
|
wangw
|
fcff40f72b
|
店铺扩展信息 初始化数据
|
2024-08-28 15:44:33 +08:00 |
|
牛叉闪闪
|
221ad5a8d4
|
添加退款、会员退款、会员充值控制
|
2024-08-28 14:09:56 +08:00 |
|
yijiegong
|
8558343524
|
Merge branch 'gyj' into test
|
2024-08-28 13:35:19 +08:00 |
|
yijiegong
|
e48029a9a4
|
广告查询bug修改
|
2024-08-28 13:34:11 +08:00 |
|
wangw
|
489b3597d6
|
店铺扩展数据 初始化四条数据
|
2024-08-27 17:57:13 +08:00 |
|
牛叉闪闪
|
2ca427f808
|
添加退款、会员退款、会员充值控制
|
2024-08-27 17:33:10 +08:00 |
|
yijiegong
|
e9711dffe3
|
Merge branch 'gyj' into test
|
2024-08-27 16:00:10 +08:00 |
|
yijiegong
|
d7fe7cf40a
|
订单查询增加userId参数筛选
|
2024-08-27 15:59:43 +08:00 |
|
SongZhang
|
30407b1715
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-27 15:58:45 +08:00 |
|
SongZhang
|
2e5cc6ab92
|
1.代客下单 specSnap为null fix
|
2024-08-27 15:53:38 +08:00 |
|
wangw
|
b01812bce9
|
获取会员页面 二维码
|
2024-08-27 15:47:29 +08:00 |
|
牛叉闪闪
|
58a3ac0ed0
|
添加退款、会员退款、会员充值控制
|
2024-08-27 14:42:19 +08:00 |
|
yijiegong
|
6863fbc100
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-08-27 11:06:16 +08:00 |
|
SongZhang
|
4929e467ab
|
1.代客下单 masterId实时更新修复
|
2024-08-27 10:44:50 +08:00 |
|
yijiegong
|
d78a7a7ac6
|
添加最后登录时间 1
|
2024-08-26 11:41:35 +08:00 |
|
yijiegong
|
6ba0544243
|
添加最后登录时间
|
2024-08-26 11:38:24 +08:00 |
|
yijiegong
|
bbcd6edf20
|
添加最后登录时间
|
2024-08-26 11:33:11 +08:00 |
|
牛叉闪闪
|
f0476f05e0
|
添加退款、会员退款、会员充值控制
|
2024-08-26 10:53:48 +08:00 |
|
SongZhang
|
48aab9eeac
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:21:21 +08:00 |
|
SongZhang
|
078a986e6b
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:17:38 +08:00 |
|
SongZhang
|
d272efa45f
|
1.代客下单 只查询当天挂起订单
|
2024-08-26 09:21:50 +08:00 |
|
SongZhang
|
29ccf35e5f
|
1.代客下单 存单返回备注内容
|
2024-08-23 17:48:36 +08:00 |
|
SongZhang
|
f9931b50ea
|
1.代客下单 存单保存备注
|
2024-08-23 17:26:54 +08:00 |
|
SongZhang
|
f6e473b8bb
|
1.代客下单 取单不操作购物车状态
|
2024-08-23 15:34:13 +08:00 |
|
SongZhang
|
98bc995b71
|
1.代客下单 挂单列表数量不准确fix
|
2024-08-23 14:57:51 +08:00 |
|
SongZhang
|
96791306f2
|
1.代客下单 挂单之后masterId未增加修复
|
2024-08-23 14:51:47 +08:00 |
|
SongZhang
|
b4f113e811
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:23:35 +08:00 |
|
SongZhang
|
01d92b3812
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:14:59 +08:00 |
|
SongZhang
|
e16d9dfcb1
|
1.代客下单 创建订单会员为null修复
|
2024-08-23 13:34:03 +08:00 |
|
SongZhang
|
64e89d5ed6
|
1.代客下单 取单sql fix
|
2024-08-23 13:31:10 +08:00 |