 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 |
|
SongZhang
|
20d2683708
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCashierCartMapper.java
# src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-09-13 10:06:15 +08:00 |
|
牛叉闪闪
|
50041dc1cc
|
Merge remote-tracking branch 'origin/test' into hph
|
2024-09-12 14:34:47 +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 |
|
牛叉闪闪
|
77fa9ac80f
|
修改退款判断值
|
2024-09-09 09:50: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 |
|
牛叉闪闪
|
b8f04c65c0
|
修改
|
2024-09-05 17:34:14 +08:00 |
|
SongZhang
|
e086c4df95
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/main/resources/application-pre.yml
|
2024-09-05 17:07:52 +08:00 |
|
牛叉闪闪
|
09a4918e13
|
修改
|
2024-09-05 17:06:51 +08:00 |
|
SongZhang
|
20d86c6a75
|
1.支付完成清除缓存
|
2024-09-05 16:14:00 +08:00 |
|
SongZhang
|
a3956663d7
|
1.支付完成清除缓存
|
2024-09-05 16:11:19 +08:00 |
|
SongZhang
|
b8b8ee2bf2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 16:06:32 +08:00 |
|
SongZhang
|
c7626c352a
|
1.支付完成清除缓存
|
2024-09-05 16:06:22 +08:00 |
|
牛叉闪闪
|
d13d16238e
|
修改
|
2024-09-05 15:45:12 +08:00 |
|
牛叉闪闪
|
13fedb841b
|
修改
|
2024-09-05 15:24:49 +08:00 |
|
SongZhang
|
e1bd478ae5
|
1.添加购物车逻辑修改
|
2024-09-05 11:43:22 +08:00 |
|
SongZhang
|
8eab206fff
|
1.添加购物车逻辑修改
|
2024-09-05 11:34:14 +08:00 |
|
SongZhang
|
0600a1d90e
|
1.添加购物车逻辑修改
|
2024-09-05 11:28:56 +08:00 |
|
SongZhang
|
6360d01041
|
1.添加购物车逻辑修改
|
2024-09-05 11:24:42 +08:00 |
|
SongZhang
|
39fb09e99a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 11:13:52 +08:00 |
|
SongZhang
|
fc00b49806
|
1.打票添加日志
|
2024-09-05 11:13:40 +08:00 |