 wangw
|
07c9cb349d
|
Merge branch 'ww' into test
|
2024-09-29 10:59:30 +08:00 |
|
wangw
|
e28cb5d1f5
|
营业板块 翻台率
|
2024-09-29 10:57:27 +08:00 |
 SongZhang
|
c5d68ffffc
|
修改会员点单信息
|
2024-09-29 10:51:10 +08:00 |
|
SongZhang
|
1fa1921735
|
修改会员点单信息
|
2024-09-29 10:42:32 +08:00 |
|
SongZhang
|
4c56736535
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-29 10:40:52 +08:00 |
|
SongZhang
|
185b50a84e
|
修改会员点单信息
|
2024-09-29 10:40:42 +08:00 |
|
wangw
|
45907f107d
|
Merge branch 'ww' into test
|
2024-09-29 10:30:23 +08:00 |
|
wangw
|
bfb9f82659
|
营业板块
|
2024-09-29 10:29:55 +08:00 |
|
wangw
|
66c28248b7
|
Merge branch 'ww' into test
|
2024-09-29 10:04:28 +08:00 |
|
wangw
|
08f01e04ea
|
销售趋势柱状图 左下
|
2024-09-29 10:01:54 +08:00 |
|
SongZhang
|
29d09abd5f
|
退款相关实现
台桌列表获取报错fix
|
2024-09-29 09:55:37 +08:00 |
|
SongZhang
|
c2ff66d937
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-29 09:55:31 +08:00 |
|
SongZhang
|
2186cd5a04
|
退款相关实现
台桌列表获取报错fix
|
2024-09-29 09:55:20 +08:00 |
Tankaikai
|
3c5c0f7f47
|
Merge branch 'tkk' into test
|
2024-09-29 09:42:03 +08:00 |
|
谭凯凯
|
ae1a748ef2
|
移除alipayAppId、alipayAppToken
|
2024-09-29 09:41:31 +08:00 |
|
wangw
|
4e14710e3d
|
Merge branch 'ww' into test
|
2024-09-29 09:30:39 +08:00 |
|
wangw
|
d1d42e8fdf
|
数据统计 销售趋势
|
2024-09-29 09:29:01 +08:00 |
|
SongZhang
|
ffe39b3113
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-28 16:14:46 +08:00 |
|
SongZhang
|
84acdd0161
|
选择人数添加锁
|
2024-09-28 16:14:30 +08:00 |
|
wangw
|
e36fb3f55e
|
Merge branch 'ww' into test
|
2024-09-28 14:56:09 +08:00 |
|
wangw
|
29277ec4eb
|
报损 返回信息
|
2024-09-28 14:55:49 +08:00 |
|
wangw
|
7fbabbfeec
|
Merge branch 'ww' into test
|
2024-09-28 14:43:08 +08:00 |
|
wangw
|
dfcd29c738
|
商品报损 状态码
|
2024-09-28 14:42:44 +08:00 |
|
wangw
|
a8f7d019c9
|
Merge branch 'ww' into test
|
2024-09-28 14:13:55 +08:00 |
|
wangw
|
58b25c7e0f
|
商品报损
|
2024-09-28 14:13:39 +08:00 |
|
wangw
|
d785bd7fa8
|
Merge branch 'ww' into test
|
2024-09-28 11:21:29 +08:00 |
|
SongZhang
|
a4ce1f0299
|
票据打印简化
|
2024-09-28 11:00:13 +08:00 |
|
wangw
|
6973d62dd6
|
保存库存 报错问题
|
2024-09-28 10:51:35 +08:00 |
|
SongZhang
|
c763257ea0
|
票据打印简化
|
2024-09-28 10:45:42 +08:00 |
|
SongZhang
|
083f7fedcb
|
票据打印简化
|
2024-09-28 10:40:12 +08:00 |
|
SongZhang
|
b1835e370d
|
删除购物车修改
|
2024-09-28 09:54:26 +08:00 |
|
SongZhang
|
76264b379a
|
创建订单修改
|
2024-09-28 09:45:07 +08:00 |
|
SongZhang
|
70291911a6
|
加入购物车修改
|
2024-09-28 09:41:17 +08:00 |
|
SongZhang
|
492fa159b9
|
加入购物车修改
|
2024-09-28 09:31:30 +08:00 |
|
SongZhang
|
2eaa98a4bc
|
加入购物车修改
|
2024-09-28 09:20:13 +08:00 |
|
SongZhang
|
b50e76c04e
|
加入购物车修改
|
2024-09-28 09:15:30 +08:00 |
|
SongZhang
|
96f81b1b69
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 18:00:42 +08:00 |
|
SongZhang
|
f7663fa62c
|
就餐模式切换修改
|
2024-09-27 18:00:20 +08:00 |
|
Tankaikai
|
c24207bce4
|
Merge branch 'tkk' into test
|
2024-09-27 17:53:45 +08:00 |
|
谭凯凯
|
1add18e7dd
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-27 17:52:55 +08:00 |
|
SongZhang
|
808e0a43bd
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 17:42:26 +08:00 |
|
SongZhang
|
723cf01696
|
获取key报错fix
|
2024-09-27 17:42:05 +08:00 |
|
Tankaikai
|
b1f2d56fa4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 17:33:45 +08:00 |
|
Tankaikai
|
1980c8e88d
|
Merge branch 'tkk' into test
|
2024-09-27 17:33:15 +08:00 |
|
SongZhang
|
5376962c34
|
创建订单fix
|
2024-09-27 17:33:08 +08:00 |
|
谭凯凯
|
cb4fa67e48
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-27 17:32:30 +08:00 |
|
SongZhang
|
e9e3d8ac80
|
用餐人数修改
|
2024-09-27 17:27:04 +08:00 |
|
SongZhang
|
5d665893f2
|
列表不查询挂单商品
|
2024-09-27 16:45:44 +08:00 |
|
SongZhang
|
ce001560cb
|
手动清台模式不清空台桌状态
|
2024-09-27 16:32:49 +08:00 |
|
SongZhang
|
3121ab5adb
|
查询购物车限制时间
|
2024-09-27 16:22:09 +08:00 |
|
SongZhang
|
7bd4d05381
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 16:08:38 +08:00 |
|
SongZhang
|
8f41aa713c
|
台桌不返回订单id fix
|
2024-09-27 16:08:29 +08:00 |
|
wangw
|
51f60c002c
|
Merge branch 'ww' into test
|
2024-09-27 16:01:55 +08:00 |
|
wangw
|
95c83b23d5
|
店铺付款二维码
|
2024-09-27 16:01:18 +08:00 |
|
Tankaikai
|
408209950b
|
Merge branch 'tkk' into test
|
2024-09-27 15:56:17 +08:00 |
|
谭凯凯
|
50a2773b5a
|
增加系统参数配置相关接口，增加店铺订单支付链接获取接口
|
2024-09-27 15:55:49 +08:00 |
|
Tankaikai
|
fe9b27bbff
|
Merge branch 'tkk' into test
|
2024-09-27 15:46:49 +08:00 |
|
谭凯凯
|
f739b3b1a6
|
增加系统参数配置相关接口，增加店铺订单支付链接获取接口
|
2024-09-27 15:46:22 +08:00 |
|
Tankaikai
|
70af101daf
|
Merge branch 'tkk' into test
|
2024-09-27 15:41:19 +08:00 |
|
谭凯凯
|
bf735b1a31
|
增加系统参数配置相关接口，增加店铺订单支付链接获取接口
|
2024-09-27 15:39:30 +08:00 |
|
wangw
|
7ae3992afc
|
Merge branch 'ww' into test
|
2024-09-27 15:23:58 +08:00 |
|
wangw
|
1208a38018
|
商品列表 售罄/下架
|
2024-09-27 15:22:56 +08:00 |
 yijiegong
|
a799256302
|
Merge branch 'gyj' into test
|
2024-09-27 14:58:41 +08:00 |
|
yijiegong
|
a4b1beec18
|
退货数据显示为负数
|
2024-09-27 14:58:21 +08:00 |
|
wangw
|
4ff17e7aba
|
Merge branch 'ww' into test
|
2024-09-27 14:31:45 +08:00 |
|
wangw
|
74fee9a48e
|
耗材重复绑定问题
|
2024-09-27 14:31:16 +08:00 |
|
wangw
|
f5de0d16c3
|
快捷接口 问题
|
2024-09-27 14:17:40 +08:00 |
|
wangw
|
ba06410d44
|
快捷接口 问题
|
2024-09-27 14:17:15 +08:00 |
|
SongZhang
|
325e982645
|
修改支持备注
|
2024-09-27 14:03:21 +08:00 |
|
SongZhang
|
5bf555c8a9
|
修改支持备注
|
2024-09-27 11:39:54 +08:00 |
|
SongZhang
|
a2ccfb0628
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 11:30:05 +08:00 |
|
SongZhang
|
f4bf18218f
|
就餐模式切换设置打包费
|
2024-09-27 11:29:34 +08:00 |
|
yijiegong
|
9522fc1110
|
Merge branch 'gyj' into test
|
2024-09-27 10:46:58 +08:00 |
|
yijiegong
|
57e4a9261b
|
增加获取订阅消息二维码接口
|
2024-09-27 10:46:32 +08:00 |
|
SongZhang
|
5be2e74d81
|
就餐模式切换携带tableId
|
2024-09-27 10:27:30 +08:00 |
|
SongZhang
|
e55c1744ad
|
代客下单逻辑修改
|
2024-09-27 10:21:40 +08:00 |
|
SongZhang
|
bee3d67106
|
代客下单逻辑修改
|
2024-09-27 10:17:32 +08:00 |
|
SongZhang
|
36d81b71d4
|
代客下单逻辑修改
|
2024-09-27 10:14:11 +08:00 |
|
SongZhang
|
11121d6ca2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 10:05:57 +08:00 |
|
SongZhang
|
19533f37b4
|
创建订单保存sendType
|
2024-09-27 10:05:49 +08:00 |
|
wangw
|
7285de2024
|
Merge branch 'ww' into test
|
2024-09-27 09:59:10 +08:00 |
|
wangw
|
5be1876d3d
|
商品/耗材 记录接口
|
2024-09-27 09:58:03 +08:00 |
|
SongZhang
|
cf9ff5c380
|
就餐模式获取调整
|
2024-09-27 09:41:54 +08:00 |
|
SongZhang
|
b4f227878a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 09:12:25 +08:00 |
|
SongZhang
|
1b88298536
|
就餐模式获取调整
|
2024-09-27 09:12:14 +08:00 |
|
wangw
|
86dc91cb4e
|
Merge branch 'ww' into test
|
2024-09-26 18:09:32 +08:00 |
|
wangw
|
0447d240b2
|
商品报损 报错
主页接口 报错
|
2024-09-26 18:09:14 +08:00 |
|
SongZhang
|
6686f0c549
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 17:49:18 +08:00 |
|
SongZhang
|
1db4743ac8
|
代客下单调整
|
2024-09-26 17:49:07 +08:00 |
|
wangw
|
e5f632c036
|
Merge branch 'ww' into test
|
2024-09-26 17:24:16 +08:00 |
|
wangw
|
90382c8f59
|
主页板块报错问题
|
2024-09-26 17:23:55 +08:00 |
|
Tankaikai
|
39e8cded74
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 17:11:16 +08:00 |
|
Tankaikai
|
4dec40c568
|
Merge branch 'tkk' into test
|
2024-09-26 17:10:42 +08:00 |
|
谭凯凯
|
2e6518a975
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-26 17:10:08 +08:00 |
|
wangw
|
1198781b61
|
库存记录 操作人
|
2024-09-26 17:02:16 +08:00 |
|
wangw
|
3302b8dd24
|
库存记录 操作人
|
2024-09-26 17:01:35 +08:00 |
|
Tankaikai
|
7467cfa444
|
Merge branch 'tkk' into test
|
2024-09-26 16:57:10 +08:00 |
|
谭凯凯
|
61b92e07ba
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-26 16:56:36 +08:00 |
|
SongZhang
|
efb7e64323
|
代客下单调整
|
2024-09-26 16:22:02 +08:00 |
|
SongZhang
|
a5c11fee41
|
代客下单调整
|
2024-09-26 16:16:50 +08:00 |
|
SongZhang
|
fbb586b3a4
|
代客下单调整
|
2024-09-26 15:54:27 +08:00 |
|
SongZhang
|
1d5c6d7f69
|
代客下单调整
|
2024-09-26 15:47:59 +08:00 |
|
SongZhang
|
d6d1691098
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 15:29:37 +08:00 |
|
SongZhang
|
094f84e92b
|
代客下单调整
|
2024-09-26 15:29:25 +08:00 |
|
wangw
|
c824146e1c
|
Merge branch 'ww' into test
|
2024-09-26 15:15:26 +08:00 |
|
wangw
|
386126cb5e
|
首页 统计 数据统计(包括弹窗)/销量统计
快捷修改接口 报错问题
|
2024-09-26 15:14:46 +08:00 |
|
wangw
|
b2dad3b3fd
|
首页 统计 数据统计(包括弹窗)/销量统计
快捷修改接口 报错问题
|
2024-09-26 15:14:40 +08:00 |
|
SongZhang
|
223585f5b9
|
餐位费支持删除
|
2024-09-26 10:41:40 +08:00 |
|
SongZhang
|
efb5281d90
|
餐位费支持删除
|
2024-09-26 10:36:43 +08:00 |
|
SongZhang
|
7877060aa0
|
修复餐位费无法结算
|
2024-09-26 10:09:25 +08:00 |
|
SongZhang
|
344c1ae874
|
修复餐位费无法结算
|
2024-09-26 10:06:51 +08:00 |
|
SongZhang
|
af74c43374
|
叫号列表固定查询0,1状态
|
2024-09-26 09:55:08 +08:00 |
|
SongZhang
|
4b60df1987
|
不统计顺延的桌号
|
2024-09-26 09:50:23 +08:00 |
|
SongZhang
|
dde33361eb
|
叫号最先保存叫号信息
|
2024-09-26 09:45:25 +08:00 |
|
SongZhang
|
224cc4999c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 09:38:14 +08:00 |
|
SongZhang
|
4acff0f20d
|
修复台桌金额展示有误
|
2024-09-26 09:38:04 +08:00 |
|
Tankaikai
|
8275b2709e
|
Merge branch 'tkk' into test
|
2024-09-25 18:20:49 +08:00 |
|
谭凯凯
|
0ed1e068ed
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 18:20:06 +08:00 |
|
SongZhang
|
55eb77f824
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-25 18:13:40 +08:00 |
|
SongZhang
|
f89a5f5280
|
修改台桌日期字段类型
|
2024-09-25 18:13:30 +08:00 |
|
wangw
|
b06487848f
|
Merge branch 'ww' into test
|
2024-09-25 17:39:33 +08:00 |
|
wangw
|
57269a1e92
|
耗材 记录 统计 Bug
|
2024-09-25 17:38:54 +08:00 |
|
wangw
|
ba025f0e09
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
|
2024-09-25 17:21:29 +08:00 |
|
wangw
|
faa463e396
|
耗材报损
耗材记录统计bug
|
2024-09-25 17:20:35 +08:00 |
|
wangw
|
f9f69f93cd
|
商品库存数据统计
商品库存查询变动记录
耗材库存数据统计
商品列表排序
耗材列表排序
商品报损
耗材报损
|
2024-09-25 16:00:34 +08:00 |
|
wangw
|
46beff3cd9
|
商品库存数据统计
商品库存查询变动记录
耗材库存数据统计
商品列表排序
耗材列表排序
商品报损
耗材报损
|
2024-09-25 16:00:05 +08:00 |
|
Tankaikai
|
999126b034
|
Merge branch 'tkk' into test
|
2024-09-25 15:50:06 +08:00 |
|
谭凯凯
|
80edd84c4f
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 15:49:26 +08:00 |
|
wangw
|
e4b9834684
|
Merge branch 'ww' into test
|
2024-09-25 09:33:33 +08:00 |
|
wangw
|
8f5ca9b7f3
|
数据统计 报错问题
|
2024-09-25 09:32:13 +08:00 |
|
SongZhang
|
5e9d45520f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-24 18:14:50 +08:00 |
|
SongZhang
|
e745d54af6
|
订单详情返回就餐形式
|
2024-09-24 18:14:41 +08:00 |
|
wangw
|
0d77408fa5
|
Merge branch 'ww' into test
|
2024-09-24 18:14:23 +08:00 |
|
wangw
|
056126127b
|
数据统计 销售数量 视图数据
新增店铺 店铺名称 校验
|
2024-09-24 18:14:04 +08:00 |
|
wangw
|
5042ebe490
|
Merge branch 'ww' into test
|
2024-09-24 17:46:40 +08:00 |
|
wangw
|
d8841522ad
|
商品 耗材 绑定关系 接口日志
问题处理 不传规格id时 过滤
|
2024-09-24 17:46:21 +08:00 |
|
wangw
|
6c2ef5d75b
|
Merge branch 'ww' into test
|
2024-09-24 17:14:18 +08:00 |
|
wangw
|
418e834fe3
|
商品列表 耗材弹窗 添加至商品/添加至规格 1/2
|
2024-09-24 17:13:57 +08:00 |
|
wangw
|
b4c795e7d5
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
|
2024-09-24 17:08:14 +08:00 |
|
wangw
|
0de9071813
|
商品列表 耗材弹窗 添加至商品/添加至规格
|
2024-09-24 17:05:54 +08:00 |
|
SongZhang
|
064e683a68
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-24 16:35:16 +08:00 |
|
SongZhang
|
0a14ecdf16
|
叫号列表查询条件修改，取消顺延功能
|
2024-09-24 16:34:56 +08:00 |
|
wangw
|
415e6ff469
|
绑定至规格
|
2024-09-24 16:28:40 +08:00 |
|
wangw
|
82c72c9e0c
|
绑定至规格
|
2024-09-24 16:28:08 +08:00 |
|
wangw
|
8e27e25936
|
Merge branch 'ww' into test
|
2024-09-24 16:13:13 +08:00 |
|
wangw
|
c20c9c54af
|
商品 库存警戒线
快捷修改 商品退款退回库存
|
2024-09-24 16:09:47 +08:00 |
|
wangw
|
7b47f40fe8
|
库存记录 存入 统计 列表 详情列表
|
2024-09-24 15:16:30 +08:00 |
|
wangw
|
5b6e8caf35
|
上下架 报错问题
|
2024-09-24 15:16:30 +08:00 |
|
wangw
|
81a4bfdf72
|
库存记录 存入 统计 列表 详情列表
|
2024-09-24 15:15:35 +08:00 |
|
wangw
|
6b15377285
|
上下架 报错问题
|
2024-09-24 15:14:36 +08:00 |