|
|
eb8a91ad41
|
Merge branch 'ww' into test
|
2024-10-12 17:38:26 +08:00 |
|
|
|
440558c590
|
耗材 销售扣除
|
2024-10-12 17:37:49 +08:00 |
|
谭凯凯
|
3b77cfb33d
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-12 10:42:45 +08:00 |
|
谭凯凯
|
493f8563b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 10:45:33 +08:00 |
|
谭凯凯
|
ba710c854e
|
配置测试环境支付成功回调
|
2024-10-10 16:46:34 +08:00 |
|
谭凯凯
|
64e88a2662
|
配置测试环境支付成功回调
|
2024-10-10 14:25:53 +08:00 |
|
谭凯凯
|
2b0ca2b5b8
|
店铺小票打印记录需求
|
2024-10-09 18:25:17 +08:00 |
|
|
|
43e832826b
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:45:54 +08:00 |
|
|
|
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 |
|
|
|
44fc9927b4
|
退菜接口，sku mapper结构修改
|
2024-10-08 11:27:42 +08:00 |
|
|
|
0f919e5a5d
|
pc不校验自取模式
|
2024-09-28 16:04:03 +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 |
|
|
|
501970a89b
|
修改sql日志打印
|
2024-09-24 18:06:21 +08:00 |
|
|
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
|
|
753f3d9d8b
|
调整mapper扫描方式，增加请求信息打印
|
2024-09-20 15:51:59 +08:00 |
|
|
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
|
|
8ed1b242ff
|
Merge branch 'ww' into test
|
2024-09-14 17:41:54 +08:00 |
|
|
|
04718abc01
|
增加sql记录
|
2024-09-14 17:40:43 +08:00 |
|
牛叉闪闪
|
51b66652d4
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-13 11:09:25 +08:00 |
|
牛叉闪闪
|
074cc5374d
|
添加pcpay 支付
|
2024-09-13 11:08:33 +08:00 |
|
|
|
724d5fc2da
|
店铺信息
运营模式
restaurant 餐饮版 先下单后支付
munchies 快餐版（先支付后下单）
是否开启桌位费 0否1是
桌位费
就餐模式 堂食 dine-in 外带 take-out
|
2024-09-13 10:45:03 +08:00 |
|
牛叉闪闪
|
73bad5713a
|
添加pcpay 支付
|
2024-09-12 14:08:19 +08:00 |
|
|
|
b88c269a1a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-06 10:38:21 +08:00 |
|
牛叉闪闪
|
c2555d890f
|
修改
|
2024-09-06 10:23:21 +08:00 |
|
|
|
e086c4df95
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/main/resources/application-pre.yml
|
2024-09-05 17:07:52 +08:00 |
|
牛叉闪闪
|
13fedb841b
|
修改
|
2024-09-05 15:24:49 +08:00 |
|
|
|
3b3eda15ef
|
pre 内网访问数据库
|
2024-09-05 10:09:47 +08:00 |
|
|
|
3528ebb0c4
|
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:31:32 +08:00 |
|
|
|
15ef38936b
|
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:29:27 +08:00 |
|
牛叉闪闪
|
637a0cf315
|
修改
|
2024-09-02 10:55:37 +08:00 |
|
牛叉闪闪
|
35b9132eda
|
修改
|
2024-08-29 15:52:13 +08:00 |
|
牛叉闪闪
|
08a9a26f2d
|
修改
|
2024-08-29 15:43:12 +08:00 |
|
牛叉闪闪
|
445551f0d5
|
修改
|
2024-08-29 14:45:45 +08:00 |
|
牛叉闪闪
|
9a70e49663
|
添加会员变动与通知
|
2024-08-28 16:51:00 +08:00 |
|
牛叉闪闪
|
acf7e71769
|
添加会员变动与通知
|
2024-08-28 09:57:23 +08:00 |
|
|
|
35e039a530
|
1.代客下单 已下单商品不支持删除
|
2024-08-27 10:36:05 +08:00 |
|
|
|
f585a4f46a
|
1.代客下单
|
2024-08-27 09:11:55 +08:00 |
|
牛叉闪闪
|
ed5bb107d0
|
添加员工折扣
|
2024-08-26 15:42:21 +08:00 |
|
|
|
42e6b3a689
|
充值报错问题
|
2024-08-26 15:27:55 +08:00 |
|
|
|
6f93900c2a
|
1.代客下单 打印菜品小票,以及结算小票
|
2024-08-26 15:14:57 +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 |
|
|
|
6a6ce8ef1c
|
1.代客下单 打印菜品小票
|
2024-08-26 14:23:56 +08:00 |
|
|
|
5d74f104b2
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:45:11 +08:00 |
|
|
|
1cff6fffcc
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:38:26 +08:00 |
|
|
|
3794cd5540
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:36:42 +08:00 |
|
