Commit Graph

567 Commits

Author SHA1 Message Date
谭凯凯
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
cb2622591c Merge remote-tracking branch 'origin/test' into test 2024-10-10 14:33:53 +08:00
4c7aaf8183 增加标签打印机 订单打印简化 2024-10-10 14:33:45 +08:00
谭凯凯
64e88a2662 配置测试环境支付成功回调 2024-10-10 14:25:53 +08:00
5612d687da 飞鹅打印机打印实现 2024-10-10 13:52:12 +08:00
21c39032d5 取消支付接口 2024-10-10 13:51:56 +08:00
b3c243cf43 支付修改 2024-10-10 10:35:22 +08:00
9ed26c0fc4 支付修改 2024-10-10 10:32:02 +08:00
8a2f665aae 购物车列表展示已经退款的商品 2024-10-10 10:15:00 +08:00
69a8e4b4c8 Merge remote-tracking branch 'origin/test' into test 2024-10-10 10:12:55 +08:00
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
f0fe3fa75b 餐位费选择修改 2024-10-10 09:57:28 +08:00
d5af516891 Merge remote-tracking branch 'origin/test' into test 2024-10-10 09:43:37 +08:00
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
59c7fc4c9d 创建订单修改 2024-10-10 09:35:18 +08:00
a1365b0e5f Merge remote-tracking branch 'origin/test' into test 2024-10-10 09:34:23 +08:00
fbd8f306e7 创建订单修改 2024-10-10 09:34:13 +08:00
谭凯凯
b3b0040a36 店铺小票打印记录需求 2024-10-10 09:32:41 +08:00
e583f4ccb0 创建订单修改 2024-10-10 09:19:00 +08:00
d48cc850f5 创建订单修改 2024-10-10 09:15:00 +08:00
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
5c5ffd10da 手动清台设置 2024-10-09 13:40:58 +08:00
f96c47ecac 创建订单携带就餐人数 2024-10-09 13:29:13 +08:00
4615e0fae1 Merge remote-tracking branch 'origin/test' into test 2024-10-08 14:20:17 +08:00
4d5937821a 购物车商品数量不正确fix 2024-10-08 14:20:06 +08:00
f72b7c3fa0 商品库存警戒线 2024-10-08 11:46:57 +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
6f0ff52897 选择人数添加锁 2024-09-28 16:26:05 +08:00
0f919e5a5d pc不校验自取模式 2024-09-28 16:04:03 +08:00
99f029d503 打印简化 2024-09-28 15:21:48 +08:00
f0ab136220 打印简化 2024-09-28 11:43:56 +08:00
c439ac091e 打印简化 2024-09-28 10:53:19 +08:00
b1f88d9932 打印简化 2024-09-28 10:49:25 +08:00
ea21e97e29 打印简化 2024-09-28 10:40:52 +08:00
57800dab04 Merge remote-tracking branch 'origin/test' into test 2024-09-27 10:38:09 +08:00
19eacd1550 创建订单保存sendType 2024-09-27 10:37:57 +08:00