 wangw
|
9e8d74845a
|
Merge branch 'ww' into test
|
2024-10-15 14:33:11 +08:00 |
|
wangw
|
a6a8c330ae
|
耗材 判断记录
|
2024-10-15 14:32:30 +08:00 |
 SongZhang
|
ef7f4ebb8e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-15 14:07:12 +08:00 |
|
SongZhang
|
1a8a15193e
|
修改接口支持打包赠送
|
2024-10-15 14:07:01 +08:00 |
|
wangw
|
1ed5338032
|
Merge branch 'ww' into test
|
2024-10-15 13:25:09 +08:00 |
|
wangw
|
01405b33e9
|
删除商品
|
2024-10-15 13:24:40 +08:00 |
|
wangw
|
544a251a67
|
Merge branch 'ww' into test
|
2024-10-15 10:06:33 +08:00 |
|
wangw
|
f8c763ad9d
|
商品修改库存 记录
|
2024-10-15 10:06:02 +08:00 |
|
wangw
|
fdf551358f
|
添加商品 规格丢失问题
|
2024-10-14 16:36:42 +08:00 |
|
wangw
|
192605ae90
|
添加商品 规格丢失问题
|
2024-10-14 16:35:09 +08:00 |
|
SongZhang
|
5e8e6661b9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 16:28:53 +08:00 |
|
SongZhang
|
4c19b6c9d3
|
取餐码获取为null修复
|
2024-10-14 16:28:37 +08:00 |
|
SongZhang
|
347431f199
|
取餐码获取为null修复
|
2024-10-14 16:28:08 +08:00 |
|
wangw
|
da9a1dc3b8
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
|
2024-10-14 15:30:07 +08:00 |
|
wangw
|
68fac45b7a
|
销售统计
|
2024-10-14 15:29:23 +08:00 |
|
wangw
|
f87a2747bc
|
Merge branch 'ww' into test
|
2024-10-14 15:22:18 +08:00 |
|
wangw
|
2d03914963
|
分类 列表 数据问题
销售统计
|
2024-10-14 15:20:35 +08:00 |
|
wangw
|
bf5e5ec7dd
|
Merge branch 'ww' into test
|
2024-10-14 14:56:57 +08:00 |
|
wangw
|
5468fa56de
|
分类 列表 数据问题
|
2024-10-14 14:55:09 +08:00 |
|
SongZhang
|
1cc7188488
|
赠送商品单独拎出
|
2024-10-14 13:40:25 +08:00 |
|
SongZhang
|
a9d92e98c5
|
退菜fix
|
2024-10-14 13:26:56 +08:00 |
|
SongZhang
|
f01c6c0e3c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 10:30:00 +08:00 |
|
SongZhang
|
5a2c3f4208
|
客座费获取修改
|
2024-10-14 10:29:51 +08:00 |
谭凯凯
|
e659d1f420
|
调整打印机配置参数
|
2024-10-14 10:24:11 +08:00 |
|
SongZhang
|
afbfde52bb
|
打印延迟3s 防止事务未提交
|
2024-10-14 10:15:41 +08:00 |
|
SongZhang
|
72dca1d7c4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 10:03:24 +08:00 |
|
SongZhang
|
c88b838e88
|
退款修改
|
2024-10-14 10:03:03 +08:00 |
|
wangw
|
958f1cfc5e
|
Merge branch 'ww' into test
|
2024-10-14 09:14:15 +08:00 |
|
wangw
|
cab483a7b9
|
耗材记录
|
2024-10-14 09:13:51 +08:00 |
|
wangw
|
fac0e9b046
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
|
2024-10-12 18:28:17 +08:00 |
|
wangw
|
f120867e35
|
耗材记录
|
2024-10-12 18:26:54 +08:00 |
|
wangw
|
527b5f059c
|
耗材记录
|
2024-10-12 18:17:04 +08:00 |
|
wangw
|
c918f2e5ce
|
耗材记录
|
2024-10-12 18:15:46 +08:00 |
|
SongZhang
|
2553a3605d
|
退款不更改购物车状态
|
2024-10-12 18:14:29 +08:00 |
|
SongZhang
|
d3cac60125
|
打包费
|
2024-10-12 17:51:37 +08:00 |
|
SongZhang
|
a8ab3706dd
|
台桌状态修改
|
2024-10-12 16:39:30 +08:00 |
|
SongZhang
|
10c11aef8f
|
已下单商品支持退单
|
2024-10-12 16:27:29 +08:00 |
|
SongZhang
|
18c1367856
|
购物车获取修改
|
2024-10-12 16:10:57 +08:00 |
|
SongZhang
|
10b2ae2537
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 15:58:08 +08:00 |
|
SongZhang
|
424082ead3
|
外带结束购物车状态
|
2024-10-12 15:57:49 +08:00 |
|
wangw
|
7c7976c197
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
|
2024-10-12 15:12:07 +08:00 |
|
wangw
|
1945d3f906
|
商品共享库存字段
|
2024-10-12 15:11:00 +08:00 |
|
SongZhang
|
cc9cfceed4
|
退款金额
|
2024-10-12 14:41:21 +08:00 |
|
SongZhang
|
1c04a44278
|
外带不校验餐位费
|
2024-10-12 14:36:35 +08:00 |
|
SongZhang
|
00f15ef7ee
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 14:33:09 +08:00 |
|
SongZhang
|
6bccfb8036
|
退款金额展示有误fix
|
2024-10-12 14:32:58 +08:00 |
|
wangw
|
e86a383c8c
|
未记录商品销售的bug
|
2024-10-12 14:16:59 +08:00 |
|
wangw
|
b0140e7b23
|
Merge branch 'ww' into test
|
2024-10-12 14:16:44 +08:00 |
|
wangw
|
70abb276bc
|
未记录商品销售的bug
|
2024-10-12 14:16:24 +08:00 |
|
SongZhang
|
ece7e3eb0e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-12 10:46:33 +08:00 |