 SongZhang
|
8a2f665aae
|
购物车列表展示已经退款的商品
|
2024-10-10 10:15:00 +08:00 |
|
SongZhang
|
69a8e4b4c8
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 10:12:55 +08:00 |
|
SongZhang
|
078cd4a001
|
购物车列表展示已经退款的商品
|
2024-10-10 10:12:43 +08:00 |
Tankaikai
|
c153597347
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 10:05:11 +08:00 |
|
谭凯凯
|
9dc0e46c76
|
新增无Token查询订单简要信息接口
|
2024-10-10 10:05:03 +08:00 |
|
SongZhang
|
f0fe3fa75b
|
餐位费选择修改
|
2024-10-10 09:57:28 +08:00 |
|
SongZhang
|
d5af516891
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:43:37 +08:00 |
|
SongZhang
|
b654321366
|
餐位费选择修改
|
2024-10-10 09:43:28 +08:00 |
|
Tankaikai
|
f1bb7d39b4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:36:38 +08:00 |
|
谭凯凯
|
bd94b97017
|
店铺小票打印记录需求
|
2024-10-10 09:36:32 +08:00 |
|
SongZhang
|
59c7fc4c9d
|
创建订单修改
|
2024-10-10 09:35:18 +08:00 |
|
SongZhang
|
a1365b0e5f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:34:23 +08:00 |
|
SongZhang
|
fbd8f306e7
|
创建订单修改
|
2024-10-10 09:34:13 +08:00 |
|
谭凯凯
|
b3b0040a36
|
店铺小票打印记录需求
|
2024-10-10 09:32:41 +08:00 |
|
SongZhang
|
e583f4ccb0
|
创建订单修改
|
2024-10-10 09:19:00 +08:00 |
|
SongZhang
|
d48cc850f5
|
创建订单修改
|
2024-10-10 09:15:00 +08:00 |
|
SongZhang
|
2a9e26e524
|
创建订单修改
|
2024-10-10 09:10:27 +08:00 |
|
Tankaikai
|
5fdd361789
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-09 18:25:28 +08:00 |
|
谭凯凯
|
2b0ca2b5b8
|
店铺小票打印记录需求
|
2024-10-09 18:25:17 +08:00 |
|
SongZhang
|
5c5ffd10da
|
手动清台设置
|
2024-10-09 13:40:58 +08:00 |
|
SongZhang
|
f96c47ecac
|
创建订单携带就餐人数
|
2024-10-09 13:29:13 +08:00 |
|
SongZhang
|
4615e0fae1
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 14:20:17 +08:00 |
|
SongZhang
|
4d5937821a
|
购物车商品数量不正确fix
|
2024-10-08 14:20:06 +08:00 |
 wangw
|
f72b7c3fa0
|
商品库存警戒线
|
2024-10-08 11:46:57 +08:00 |
|
wangw
|
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 |
|
wangw
|
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 |
|
wangw
|
d4cc9deed0
|
商品库存警戒线
|
2024-10-08 11:36:46 +08:00 |
|
SongZhang
|
44fc9927b4
|
退菜接口，sku mapper结构修改
|
2024-10-08 11:27:42 +08:00 |
|
SongZhang
|
6f0ff52897
|
选择人数添加锁
|
2024-09-28 16:26:05 +08:00 |
|
SongZhang
|
0f919e5a5d
|
pc不校验自取模式
|
2024-09-28 16:04:03 +08:00 |
|
SongZhang
|
99f029d503
|
打印简化
|
2024-09-28 15:21:48 +08:00 |
|
SongZhang
|
f0ab136220
|
打印简化
|
2024-09-28 11:43:56 +08:00 |
|
SongZhang
|
c439ac091e
|
打印简化
|
2024-09-28 10:53:19 +08:00 |
|
SongZhang
|
b1f88d9932
|
打印简化
|
2024-09-28 10:49:25 +08:00 |
|
SongZhang
|
ea21e97e29
|
打印简化
|
2024-09-28 10:40:52 +08:00 |
|
SongZhang
|
57800dab04
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 10:38:09 +08:00 |
|
SongZhang
|
19eacd1550
|
创建订单保存sendType
|
2024-09-27 10:37:57 +08:00 |
|
wangw
|
fda4c29e85
|
Merge branch 'ww' into test
|
2024-09-26 17:04:04 +08:00 |
|
wangw
|
657596f619
|
库存记录 增加操作人
|
2024-09-26 17:03:42 +08:00 |
|
wangw
|
628ef133ff
|
Merge branch 'ww' into test
|
2024-09-25 16:49:28 +08:00 |
|
wangw
|
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 |
|
SongZhang
|
501970a89b
|
修改sql日志打印
|
2024-09-24 18:06:21 +08:00 |
|
SongZhang
|
f8ea5f568a
|
叫号提示打印修改
|
2024-09-24 09:57:01 +08:00 |
|
SongZhang
|
a27f64dafa
|
增加异常反打实现，避免异常堆栈信息过长
|
2024-09-24 09:56:27 +08:00 |
|
SongZhang
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
SongZhang
|
7adf50ab99
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 15:52:09 +08:00 |
|
SongZhang
|
753f3d9d8b
|
调整mapper扫描方式，增加请求信息打印
|
2024-09-20 15:51:59 +08:00 |
 yijiegong
|
43220a03ea
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:34:12 +08:00 |
|
yijiegong
|
851bbfc01e
|
Merge branch 'gyj' into test
|
2024-09-19 15:33:53 +08:00 |
|
yijiegong
|
45a6bcbe9d
|
Merge branch 'gyj' into dev
|
2024-09-19 15:32:36 +08:00 |
|
yijiegong
|
3ae12ce04d
|
PC 最新版本下载链接
|
2024-09-19 15:32:04 +08:00 |
|
SongZhang
|
fa94b0b1bf
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:31:10 +08:00 |
|
SongZhang
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
yijiegong
|
1ad6aa3de7
|
支付订单增加remark字段
|
2024-09-19 13:44:56 +08:00 |
|
yijiegong
|
f768f7f473
|
修改店铺二维码收款
|
2024-09-19 09:54:00 +08:00 |
|
yijiegong
|
d7f2d5afc1
|
修改支付宝支付
|
2024-09-18 18:17:28 +08:00 |
|
yijiegong
|
46205fb7ce
|
修改支付宝支付 地址
|
2024-09-18 17:48:29 +08:00 |
|
yijiegong
|
53597281d9
|
修改支付宝支付 地址
|
2024-09-18 17:42:42 +08:00 |
|
yijiegong
|
9ddef54afd
|
Merge branch 'dev' into test
|
2024-09-15 19:27:01 +08:00 |
|
yijiegong
|
4ee6999b16
|
耗材消耗 查询 不管是否开启库存检测
|
2024-09-15 19:26:42 +08:00 |
|
yijiegong
|
a84f3f39b3
|
请求员工权限
|
2024-09-14 18:04:47 +08:00 |
|
SongZhang
|
89ac3c9e25
|
单元测试
|
2024-09-14 17:50:21 +08:00 |
|
SongZhang
|
808d363daa
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 17:50:01 +08:00 |
|
SongZhang
|
eb8a53718d
|
单元测试
|
2024-09-14 17:49:49 +08:00 |
|
wangw
|
8ed1b242ff
|
Merge branch 'ww' into test
|
2024-09-14 17:41:54 +08:00 |
|
wangw
|
04718abc01
|
增加sql记录
|
2024-09-14 17:40:43 +08:00 |
|
SongZhang
|
ba54bf9967
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 11:50:17 +08:00 |
|
SongZhang
|
b74441a62e
|
打印整合修改
|
2024-09-14 11:49:56 +08:00 |
牛叉闪闪
|
dbb66f93fa
|
添加pcpay 支付
|
2024-09-14 09:18:57 +08:00 |
|
SongZhang
|
5c0adcbe37
|
飞鹅打印折扣空值判断
|
2024-09-13 15:59:33 +08:00 |
|
SongZhang
|
92008db954
|
创建订单打包费默认值
|
2024-09-13 15:50:22 +08:00 |
|
SongZhang
|
eb0139282b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-13 15:32:21 +08:00 |
|
SongZhang
|
9a07219470
|
飞鹅打印机退单小票功能放开
|
2024-09-13 15:32:12 +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 |
|
牛叉闪闪
|
0775b09c77
|
添加pcpay 支付
|
2024-09-13 11:06:36 +08:00 |
|
wangw
|
2d6c02cfd5
|
Merge branch 'ww' into test
|
2024-09-13 10:47:36 +08:00 |
|
wangw
|
724d5fc2da
|
店铺信息
运营模式
restaurant 餐饮版 先下单后支付
munchies 快餐版（先支付后下单）
是否开启桌位费 0否1是
桌位费
就餐模式 堂食 dine-in 外带 take-out
|
2024-09-13 10:45:03 +08:00 |
|
SongZhang
|
3029e6c8be
|
飞鹅打印机打印菜品小票根据使用类型区分type
|
2024-09-13 10:10:43 +08:00 |
|
SongZhang
|
2af6d62737
|
飞鹅打印机打印菜品小票根据使用类型区分type
|
2024-09-13 10:08:18 +08:00 |
|
牛叉闪闪
|
6a9f084df1
|
添加pcpay 支付
|
2024-09-12 14:34:19 +08:00 |
|
牛叉闪闪
|
73bad5713a
|
添加pcpay 支付
|
2024-09-12 14:08:19 +08:00 |
|
牛叉闪闪
|
2695748ab7
|
添加pcpay 支付
|
2024-09-12 14:08:03 +08:00 |
|
SongZhang
|
668edeb23c
|
添加单独打票相关mq处理
|
2024-09-12 11:20:31 +08:00 |
|
yijiegong
|
71b6cfe95c
|
退款密码校验修改
|
2024-09-07 00:19:49 +08:00 |
|
yijiegong
|
a9d0810d1a
|
Merge branch 'test' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
|
2024-09-06 23:53:05 +08:00 |
|
牛叉闪闪
|
7d713a0a50
|
修改
|
2024-09-06 17:38:19 +08:00 |
|
牛叉闪闪
|
4e2da5c676
|
修改
|
2024-09-06 17:23:52 +08:00 |
|
SongZhang
|
0d5dec10c6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-06 11:37:32 +08:00 |
|
SongZhang
|
106c89ec58
|
1.生成取餐码redis报错修复
|
2024-09-06 11:37:22 +08:00 |
|
牛叉闪闪
|
781570e2bf
|
修改
|
2024-09-06 11:09:57 +08:00 |
|
SongZhang
|
b88c269a1a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-06 10:38:21 +08:00 |
|
SongZhang
|
eb1603a4ee
|
1.创建订单普通下单不沿用上笔
|
2024-09-06 10:38:10 +08:00 |
|
牛叉闪闪
|
f96c64f343
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-06 10:23:53 +08:00 |
|
牛叉闪闪
|
c2555d890f
|
修改
|
2024-09-06 10:23:21 +08:00 |
|
牛叉闪闪
|
4bc2ed0bfd
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 17:39:54 +08:00 |
|
牛叉闪闪
|
9be00af38c
|
修改
|
2024-09-05 17:39:16 +08:00 |
|
牛叉闪闪
|
ffa9bab489
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-09-05 17:34:41 +08:00 |