|
|
532dec69e3
|
1.代客下单 同步查询小程序购物车商品
|
2024-08-23 09:41:27 +08:00 |
|
|
|
9e26fad331
|
1.代客下单 会员支付实现
|
2024-08-23 09:20:51 +08:00 |
|
|
|
c408e8e168
|
Merge branch 'gyj' into test
|
2024-08-22 16:20:51 +08:00 |
|
|
|
2a6c54ba47
|
桌台统计添加收银台
|
2024-08-22 16:20:20 +08:00 |
|
|
|
bffa05f07f
|
Merge branch 'ww' into test
|
2024-08-22 16:04:30 +08:00 |
|
|
|
91e2e0caaf
|
活动赠送商品
订单超时 回滚赠送使用数量
|
2024-08-22 16:04:12 +08:00 |
|
|
|
d981259995
|
1.代客下单 挂单不增加masterId
|
2024-08-21 13:29:30 +08:00 |
|
|
|
a9e5ad8229
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:36:57 +08:00 |
|
|
|
edadbb5662
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:02:38 +08:00 |
|
|
|
91751b0f32
|
1.代客下单 台桌状态同步更新
|
2024-08-21 10:45:59 +08:00 |
|
|
|
7d1571628f
|
1.代客下单 选择会员fix
|
2024-08-20 18:15:37 +08:00 |
|
|
|
4e5c560d95
|
1.代客下单 选择会员fix
|
2024-08-20 18:11:13 +08:00 |
|
|
|
98cf4f2f6d
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 17:05:46 +08:00 |
|
|
|
376af15266
|
1.代客下单 新增后付款下单
|
2024-08-20 17:05:36 +08:00 |
|
牛叉闪闪
|
972ab851c8
|
修改增加减少用户资金接口
|
2024-08-20 15:30:21 +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 |
|
