Commit Graph

511 Commits

Author SHA1 Message Date
SongZhang fbe7b72e4b 1.代客下单 结算单打印 2024-08-27 11:41:52 +08:00
SongZhang 9942bc6de6 Merge remote-tracking branch 'origin/test' into dkxd2 2024-08-27 10:59:37 +08:00
SongZhang 838351f279 1.代客下单 结算单打印 2024-08-27 10:57:45 +08:00
SongZhang d8bac55fb0 1.代客下单 结算单打印 2024-08-27 10:57:29 +08:00
牛叉闪闪 6e5216192d 修改支付逻辑 2024-08-27 10:48:37 +08:00
SongZhang 35e039a530 1.代客下单 已下单商品不支持删除 2024-08-27 10:36:05 +08:00
牛叉闪闪 2461e5d808 修改支付逻辑 2024-08-27 09:45:03 +08:00
SongZhang 6705689d34 Merge remote-tracking branch 'origin/test' into dkxd2 2024-08-27 09:12:11 +08:00
SongZhang f585a4f46a 1.代客下单 2024-08-27 09:11:55 +08:00
牛叉闪闪 253e2f9c0b 修改支付逻辑 2024-08-27 09:11:14 +08:00
牛叉闪闪 a1d0fa1a7f 修改支付逻辑 2024-08-26 18:27:12 +08:00
牛叉闪闪 bc5bdf1421 修改支付逻辑 2024-08-26 18:22:52 +08:00
牛叉闪闪 cf2dfc295c 修改支付逻辑 2024-08-26 18:02:06 +08:00
牛叉闪闪 ddf9af76b5 修改支付逻辑 2024-08-26 17:31:27 +08:00
牛叉闪闪 0f74c30e58 修改支付逻辑 2024-08-26 17:00:38 +08:00
牛叉闪闪 651f2c1427 修改支付逻辑 2024-08-26 16:25:00 +08:00
牛叉闪闪 d3b3fe2492 修改支付逻辑 2024-08-26 15:49:19 +08:00
牛叉闪闪 ed5bb107d0 添加员工折扣 2024-08-26 15:42:21 +08:00
wangw 42e6b3a689 充值报错问题 2024-08-26 15:27:55 +08:00
SongZhang 6f93900c2a 1.代客下单 打印菜品小票,以及结算小票 2024-08-26 15:14:57 +08:00
牛叉闪闪 b0f62d3dad 添加员工折扣 2024-08-26 15:03:35 +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
SongZhang 6a6ce8ef1c 1.代客下单 打印菜品小票 2024-08-26 14:23:56 +08:00
SongZhang 5e6c6284ed 1.代客下单 打印菜品小票 2024-08-26 13:57:41 +08:00
SongZhang 5d74f104b2 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:45:11 +08:00
SongZhang 1cff6fffcc 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:38:26 +08:00
SongZhang 3794cd5540 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:36:42 +08:00
SongZhang 02be5222b5 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:33:25 +08:00
SongZhang 8f4e56f889 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 11:28:00 +08:00
SongZhang abdefe6932 1.代客下单 会员支付,支付修改台桌状态 2024-08-23 17:07:43 +08:00
SongZhang baf91df968 1.代客下单 无法下单fix 2024-08-23 13:47:07 +08:00
牛叉闪闪 86ae5f962b 添加员工折扣 2024-08-22 15:11:27 +08:00
牛叉闪闪 b5daf8aef1 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
2024-08-22 15:09:46 +08:00
yijiegong f2b32671b8 查询台桌携带订单信息 + 订单金额 2024-08-22 11:03:53 +08:00
yijiegong 8b657fdc8a 查询台桌携带订单信息 2024-08-22 10:57:19 +08:00
yijiegong 1e66c99606 购物车加入bug fix 2024-08-22 10:37:15 +08:00
yijiegong 1a968775ff 商品列表角标 2024-08-22 09:56:19 +08:00
yijiegong 2ae71952de Merge remote-tracking branch 'origin/test' into test 2024-08-22 09:38:56 +08:00
yijiegong 24586d3b13 修改查询购物车信息出错 2024-08-22 09:38:42 +08:00
SongZhang 0e2c0a9604 1.代客下单会员余额支付 2024-08-21 17:45:16 +08:00
SongZhang da54cc30b7 1.打票增加代客下单重复校验 2024-08-21 17:00:08 +08:00
SongZhang 6f3dcca911 1.打票增加代客下单重复校验 2024-08-21 16:47:44 +08:00
SongZhang fbea2c6670 1.代客下单先付款后付款操作 2024-08-21 14:56:08 +08:00
SongZhang b7708d82e1 1.代客下单后选择会员修改 2024-08-21 10:23:24 +08:00
SongZhang e04c3ee084 1.增加台桌会员id 2024-08-21 09:49:24 +08:00
SongZhang 2b7ca62abf 1.增加台桌状态 2024-08-21 09:21:07 +08:00
SongZhang da9f1ab68f 1.增加台桌状态 2024-08-21 09:12:52 +08:00
SongZhang 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
SongZhang a12a1d2e1f 1.增加台桌状态 2024-08-21 09:09:44 +08:00