Commit Graph

628 Commits

Author SHA1 Message Date
SongZhang 6416eaf548 库存修改为商品级库存 2024-10-12 09:20:33 +08:00
谭凯凯 1183132bcf 配置测试环境支付成功回调 2024-10-11 17:08:41 +08:00
谭凯凯 339cf1241c 配置测试环境支付成功回调 2024-10-11 17:04:32 +08:00
谭凯凯 85c25685ea 配置测试环境支付成功回调 2024-10-11 16:44:31 +08:00
Tankaikai 219befd1ed Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:45:44 +08:00
谭凯凯 493f8563b3 店铺管理-店铺配置:打印机设置相关接口 2024-10-11 10:45:33 +08:00
SongZhang 93ac57971b 清台状态不重置 2024-10-11 10:33:17 +08:00
SongZhang cd7af3e395 清台修改 2024-10-11 10:30:39 +08:00
SongZhang 537820890f 清台修改 2024-10-11 10:27:33 +08:00
SongZhang 915ec51813 Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:17:30 +08:00
SongZhang 95ac672597 查询购物车修改 2024-10-11 10:17:07 +08:00
谭凯凯 ed2f5763ce 店铺小票打印记录需求 2024-10-10 18:28:48 +08:00
谭凯凯 ba710c854e 配置测试环境支付成功回调 2024-10-10 16:46:34 +08:00
谭凯凯 c9da828246 配置测试环境支付成功回调 2024-10-10 15:28:29 +08:00
Tankaikai 4cb65ae32d 配置测试环境支付成功回调 2024-10-10 15:16:49 +08:00
谭凯凯 67910debe4 配置测试环境支付成功回调 2024-10-10 14:53:14 +08:00
谭凯凯 26d9ec6a6c 配置测试环境支付成功回调 2024-10-10 14:40:06 +08:00
SongZhang cb2622591c Merge remote-tracking branch 'origin/test' into test 2024-10-10 14:33:53 +08:00
SongZhang 4c7aaf8183 增加标签打印机 订单打印简化 2024-10-10 14:33:45 +08:00
谭凯凯 64e88a2662 配置测试环境支付成功回调 2024-10-10 14:25:53 +08:00
SongZhang 5612d687da 飞鹅打印机打印实现 2024-10-10 13:52:12 +08:00
SongZhang 21c39032d5 取消支付接口 2024-10-10 13:51:56 +08:00
SongZhang b3c243cf43 支付修改 2024-10-10 10:35:22 +08:00
SongZhang 9ed26c0fc4 支付修改 2024-10-10 10:32:02 +08:00
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