|
|
88b189b1c4
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:43:56 +08:00 |
|
|
|
d4cc9deed0
|
商品库存警戒线
|
2024-10-08 11:36:46 +08:00 |
|
|
|
628ef133ff
|
Merge branch 'ww' into test
|
2024-09-25 16:49:28 +08:00 |
|
|
|
4bbc2408bf
|
新增会员时 填充加入会员时间
|
2024-09-25 16:49:03 +08:00 |
|
Tankaikai
|
9970799cf7
|
Merge branch 'tkk' into test
|
2024-09-25 11:18:36 +08:00 |
|
谭凯凯
|
caaa3196b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 11:17:51 +08:00 |
|
|
|
a27f64dafa
|
增加异常反打实现，避免异常堆栈信息过长
|
2024-09-24 09:56:27 +08:00 |
|
|
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
|
|
fa94b0b1bf
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:31:10 +08:00 |
|
|
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
|
|
a84f3f39b3
|
请求员工权限
|
2024-09-14 18:04:47 +08:00 |
|
|
|
724d5fc2da
|
店铺信息
运营模式
restaurant 餐饮版 先下单后支付
munchies 快餐版（先支付后下单）
是否开启桌位费 0否1是
桌位费
就餐模式 堂食 dine-in 外带 take-out
|
2024-09-13 10:45:03 +08:00 |
|
牛叉闪闪
|
2695748ab7
|
添加pcpay 支付
|
2024-09-12 14:08:03 +08:00 |
|
|
|
668edeb23c
|
添加单独打票相关mq处理
|
2024-09-12 11:20:31 +08:00 |
|
|
|
fc00b49806
|
1.打票添加日志
|
2024-09-05 11:13:40 +08:00 |
|
|
|
83d3aa444f
|
1.代客下单 商品数量减少增加打印退单票据
|
2024-08-30 15:06:56 +08:00 |
|
|
|
0bdbd07555
|
1.修改会员余额支付备注
|
2024-08-29 13:45:26 +08:00 |
|
牛叉闪闪
|
7b0e91e4b4
|
添加会员充值退款
|
2024-08-29 09:44:45 +08:00 |
|
|
|
ae3d77e8c3
|
PC 版本管理
|
2024-08-28 16:20:04 +08:00 |
|
牛叉闪闪
|
ed5bb107d0
|
添加员工折扣
|
2024-08-26 15:42:21 +08:00 |
|
牛叉闪闪
|
a7263f85e7
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
|
2024-08-26 15:01:32 +08:00 |
|
牛叉闪闪
|
fdfeb5701a
|
添加员工折扣
|
2024-08-26 14:58:29 +08:00 |
|
|
|
abdefe6932
|
1.代客下单 会员支付，支付修改台桌状态
|
2024-08-23 17:07:43 +08:00 |
|
|
|
f2b32671b8
|
查询台桌携带订单信息 + 订单金额
|
2024-08-22 11:03:53 +08:00 |
|
|
|
8b657fdc8a
|
查询台桌携带订单信息
|
2024-08-22 10:57:19 +08:00 |
|
|
|
0e2c0a9604
|
1.代客下单会员余额支付
|
2024-08-21 17:45:16 +08:00 |
|
|
|
fbea2c6670
|
1.代客下单先付款后付款操作
|
2024-08-21 14:56:08 +08:00 |
|
|
|
b7708d82e1
|
1.代客下单后选择会员修改
|
2024-08-21 10:23:24 +08:00 |
|
|
|
eb424d8eb4
|
Merge remote-tracking branch 'origin/test' into dkxd2
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-08-21 09:11:59 +08:00 |
|
牛叉闪闪
|
af3ea12121
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 17:18:26 +08:00 |
|
牛叉闪闪
|
653254f9f3
|
添加员工折扣
|
2024-08-20 17:17:55 +08:00 |
|
|
|
796f43299f
|
1.代客下单相关接口修改
|
2024-08-20 13:23:13 +08:00 |
|
|
|
46133d7d16
|
1.查询商品返回规格上下架信息字段
|
2024-08-19 14:35:55 +08:00 |
|
|
|
61157d730c
|
1.耗材check值错误修复
|
2024-08-17 15:00:46 +08:00 |
|
|
|
5a0112132d
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-08-14 14:11:53 +08:00 |
|
牛叉闪闪
|
4a0a548565
|
加入购物车添加耗材控制
|
2024-08-14 11:35:39 +08:00 |
|
|
|
a8b9223454
|
Merge remote-tracking branch 'origin/zs2' into dev
|
2024-08-12 15:13:43 +08:00 |
|
|
|
22eadf7193
|
1.推送增加店铺开关校验
|
2024-08-12 14:35:27 +08:00 |
|
|
|
923ee6f1cb
|
1.上下架售罄接口
|
2024-08-12 14:25:14 +08:00 |
|
|
|
86df7addd6
|
1.代客下单相关接口
|
2024-08-09 16:07:00 +08:00 |
|
牛叉闪闪
|
03b8dff85b
|
添加订单备注
|
2024-07-29 10:51:11 +08:00 |
|
牛叉闪闪
|
1bf12d880c
|
添加打印日志
|
2024-07-25 15:49:44 +08:00 |
|
牛叉闪闪
|
2f35abf17a
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-07-25 10:56:45 +08:00 |
|
牛叉闪闪
|
d3e4c3ef4a
|
修改打印时间
|
2024-07-25 10:56:29 +08:00 |
|
|
|
b00dc349d6
|
1.sku上下架
|
2024-07-24 18:02:58 +08:00 |
|
牛叉闪闪
|
60267f5576
|
添加交班时间
|
2024-07-22 14:11:48 +08:00 |
|
|
|
b27b364848
|
1.线下退单
2.销售同步保存库存记录
|
2024-07-17 16:43:11 +08:00 |
|
牛叉闪闪
|
56d66097c7
|
耗材流水中添加订单信息
|
2024-07-17 11:19:45 +08:00 |
|
韩鹏辉
|
d72af13b2c
|
Merge remote-tracking branch 'origin/hph' into dev
|
2024-07-11 13:51:56 +08:00 |
|
韩鹏辉
|
6e7ee2137b
|
添加现金充值操作密码
|
2024-07-11 13:51:22 +08:00 |
|
