|
|
376af15266
|
1.代客下单 新增后付款下单
|
2024-08-20 17:05:36 +08:00 |
|
|
|
830271a838
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 14:47:50 +08:00 |
|
|
|
b388b3a044
|
1.库存排序
|
2024-08-20 14:47:32 +08:00 |
|
牛叉闪闪
|
049f52499e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 14:46:52 +08:00 |
|
牛叉闪闪
|
d6b8919294
|
修改增加减少用户资金接口
|
2024-08-20 14:46:12 +08:00 |
|
|
|
fcfe0a2f53
|
1.库存排序
|
2024-08-20 14:39:01 +08:00 |
|
|
|
d6bbe73d58
|
1.代客下单 会员点单 取消点单
|
2024-08-19 17:42:47 +08:00 |
|
|
|
15de68b704
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:24:45 +08:00 |
|
|
|
2252f4edcb
|
Merge remote-tracking branch 'origin/test' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
|
2024-08-19 16:15:52 +08:00 |
|
|
|
ea86b42847
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:15:01 +08:00 |
|
|
|
a74612f5a6
|
1.代客下单 桌号获取
|
2024-08-19 14:12:07 +08:00 |
|
牛叉闪闪
|
635625842a
|
添加增加减少会员余额接口
|
2024-08-19 11:23:59 +08:00 |
|
|
|
4909ebe807
|
1.代客下单 删除订单接口
|
2024-08-19 11:23:59 +08:00 |
|
|
|
8da97add53
|
1.商品不推送修复
|
2024-08-19 11:23:58 +08:00 |
|
|
|
2250bda5c1
|
分组时间管控
|
2024-08-19 11:23:58 +08:00 |
|
|
|
0ec21c31e9
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
|
|
8d73b216ef
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
|
|
96f1dcb768
|
1.代客下单 删除订单接口
|
2024-08-19 10:11:51 +08:00 |
|
|
|
b13a48d5e5
|
1.商品不推送修复
|
2024-08-17 16:49:18 +08:00 |
|
|
|
7eab45ae49
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 15:22:38 +08:00 |
|
|
|
89582d3bc8
|
1.代客下单 挂起订单
|
2024-08-17 15:21:45 +08:00 |
|
|
|
1de1edb537
|
分组时间管控
|
2024-08-17 14:38:00 +08:00 |
|
GYJ
|
8e0f237e2e
|
台桌数据导出修改
|
2024-08-17 11:29:59 +08:00 |
|
|
|
e938911e4a
|
1.代客下单 挂起订单
|
2024-08-17 10:03:11 +08:00 |
|
|
|
5732e6974f
|
商品分组-时段 跨日的展示 次日
|
2024-08-16 18:00:25 +08:00 |
|
|
|
adee84544d
|
数据报表-销量-统计
|
2024-08-16 14:52:59 +08:00 |
|
|
|
7c122565fc
|
1.增加库存记录mq处理
|
2024-08-16 14:45:50 +08:00 |
|
|
|
b8a60a1549
|
1.增加库存记录mq处理
|
2024-08-16 13:38:52 +08:00 |
|
|
|
d32f9705a0
|
1.代客下单,支付,挂起,下单接口开发
|
2024-08-16 11:12:25 +08:00 |
|
|
|
199e787d92
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-16 09:23:43 +08:00 |
|
|
|
7271e77b05
|
数据报表-销量-统计
商品 规格 返回
|
2024-08-15 18:23:46 +08:00 |
|
GYJ
|
a183d2bfec
|
修改销量和台桌导出 -- 合并
|
2024-08-15 17:33:03 +08:00 |
|
GYJ
|
fa566a7057
|
Merge branch 'refs/heads/gyj' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-08-15 17:31:07 +08:00 |
|
GYJ
|
3d9e4ee511
|
修改销量和台桌导出
|
2024-08-15 17:25:36 +08:00 |
|
|
|
a0930151a8
|
1.推送修改
|
2024-08-14 15:05:16 +08:00 |
|
|
|
441ecf38f1
|
1.代客下单相关接口
|
2024-08-14 15:04:53 +08:00 |
|
|
|
cd6d6f2e07
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
|
2024-08-14 11:17:16 +08:00 |
|
|
|
7715b758f1
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-14 10:28:04 +08:00 |
|
牛叉闪闪
|
6e03ad4997
|
添加订单数量和充值金额字段
|
2024-08-14 10:19:47 +08:00 |
|
|
|
c35df24d2d
|
分组增加可售时段
|
2024-08-14 09:43:25 +08:00 |
|
|
|
a7de11423f
|
1.数据报表导出cpu拉高问题修复
2.代客下单相关接口
|
2024-08-13 14:39:32 +08:00 |
|
|
|
e53037232f
|
1.数据报表导出cpu拉高问题修复
|
2024-08-13 10:59:27 +08:00 |
|
|
|
fd5b79d6ec
|
1.代客下单规格修改接口
|
2024-08-13 09:48:03 +08:00 |
|
|
|
7f1c028fed
|
1.代课下单支持赠送
|
2024-08-13 09:02:44 +08:00 |
|
|
|
0e9996bcf0
|
1.通知中心相关接口
2.代客下单
|
2024-08-12 14:55:21 +08:00 |
|
|
|
8e1aa5bc19
|
修改商品 规格
|
2024-08-08 14:25:42 +08:00 |
|
GYJ
|
bff2ad2250
|
优化台桌统计
|
2024-08-08 10:42:13 +08:00 |
|
GYJ
|
b218436a1c
|
优化台桌统计
|
2024-08-08 10:41:12 +08:00 |
|
|
|
9e13d1ff98
|
商品规格修改
|
2024-08-08 09:12:35 +08:00 |
|
牛叉闪闪
|
e89b9e4eef
|
Merge remote-tracking branch 'origin/dev'
|
2024-08-05 10:20:33 +08:00 |
|