 SongZhang
|
efe907d9af
|
fix: 购物车状态统一
|
2024-10-31 09:42:28 +08:00 |
|
SongZhang
|
0b93b474ec
|
fix: 外带模式下单次数修复
|
2024-10-30 15:22:27 +08:00 |
|
SongZhang
|
5d3ba8e014
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 11:17:34 +08:00 |
|
SongZhang
|
79c1d9ecc4
|
fix: 1.购物车返回金额修改 2.支付完成购物车状态未更新修复
|
2024-10-30 11:17:08 +08:00 |
|
SongZhang
|
b3264ad1b3
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 10:40:17 +08:00 |
|
SongZhang
|
15a4537bfd
|
feat: 1.餐位费允许增减数量 2.选择人数根据店铺配置决定是否操作
|
2024-10-30 10:39:11 +08:00 |
|
SongZhang
|
d2e1174646
|
订单状态统一
|
2024-10-29 17:21:50 +08:00 |
|
SongZhang
|
fe7e8d4ed9
|
fix: 创建订单修改
|
2024-10-29 16:28:34 +08:00 |
|
SongZhang
|
a531fa2445
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 16:22:08 +08:00 |
|
SongZhang
|
a3c364030d
|
fix: 台桌关联订单查询修改
|
2024-10-29 16:21:59 +08:00 |
Tankaikai
|
fd87a1f2e3
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 16:05:54 +08:00 |
|
Tankaikai
|
a2354d7d08
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 16:05:26 +08:00 |
|
谭凯凯
|
bd3687329e
|
小票打印bug修复
|
2024-10-29 16:05:17 +08:00 |
|
SongZhang
|
89be4ba654
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 16:00:00 +08:00 |
|
SongZhang
|
0863764b5e
|
feat: 购物车全为退款订单清空购物车
|
2024-10-29 15:59:50 +08:00 |
|
Tankaikai
|
c438c7f250
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 14:29:06 +08:00 |
|
谭凯凯
|
4f2e4e7f2e
|
修复收银机充值异常缺陷
|
2024-10-29 14:24:55 +08:00 |
|
谭凯凯
|
7765758c9b
|
收银机支付异常添加错误日志
|
2024-10-29 14:08:05 +08:00 |
|
谭凯凯
|
93e43a2cf7
|
小票打印bug修复
|
2024-10-29 13:38:58 +08:00 |
|
Tankaikai
|
a5fd421147
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 13:22:08 +08:00 |
|
谭凯凯
|
345ec77279
|
小票打印bug修复
|
2024-10-29 11:48:02 +08:00 |
|
SongZhang
|
7c3c77bc4b
|
fix: 台桌模式创建订单报错修复
|
2024-10-29 11:35:11 +08:00 |
|
Tankaikai
|
16e57907ba
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-26 10:50:43 +08:00 |
|
谭凯凯
|
745e7c9b93
|
小票打印bug修复
|
2024-10-26 10:38:03 +08:00 |
|
Tankaikai
|
8896f1760b
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-25 18:07:37 +08:00 |
|
谭凯凯
|
482db587d8
|
小票打印bug修复
|
2024-10-25 18:07:06 +08:00 |
 wangw
|
cbdbe16cd0
|
多余内容删除
充值会员优惠券赠送
店铺信息增加字段
|
2024-10-24 16:53:37 +08:00 |
|
SongZhang
|
0831cb5ace
|
外带不结束购物车状态
|
2024-10-23 09:11:23 +08:00 |
|
SongZhang
|
20416c7774
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
|
2024-10-22 15:26:31 +08:00 |
|
SongZhang
|
f5cef10c40
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-22 15:25:04 +08:00 |
|
SongZhang
|
e66aea31af
|
回调配置修改
|
2024-10-22 15:24:56 +08:00 |
|
谭凯凯
|
3998c31eed
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-21 18:05:35 +08:00 |
|
谭凯凯
|
8ce38563d4
|
消费订阅消息验证
|
2024-10-21 15:52:41 +08:00 |
|
谭凯凯
|
3cbb0a4316
|
消费订阅消息验证
|
2024-10-21 10:52:06 +08:00 |
|
谭凯凯
|
44c4da7ca4
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-18 13:45:29 +08:00 |
|
谭凯凯
|
82aba51c36
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-18 13:32:18 +08:00 |
|
谭凯凯
|
66763774ab
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-17 13:52:47 +08:00 |
|
谭凯凯
|
2072495c55
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-17 13:48:27 +08:00 |
|
谭凯凯
|
dcdcbe3b61
|
排队取号小票未打印BUG修复
|
2024-10-17 11:31:12 +08:00 |
|
SongZhang
|
fc7877fcd6
|
登录接口返回是否是员工
|
2024-10-17 09:55:04 +08:00 |
|
SongZhang
|
4b2a64ea72
|
登录接口返回是否是员工
|
2024-10-17 09:46:35 +08:00 |
|
SongZhang
|
e8f0147ada
|
订单查询返回单价
|
2024-10-16 18:19:54 +08:00 |
|
SongZhang
|
e2db8e0a3f
|
订单查询返回单价
|
2024-10-16 18:15:53 +08:00 |
|
SongZhang
|
fdc3c1c729
|
打印改为事务提交后
|
2024-10-16 18:01:48 +08:00 |
|
SongZhang
|
e371816998
|
支付事务手动提交测试
|
2024-10-16 17:48:23 +08:00 |
|
SongZhang
|
d091184bf8
|
支付事务手动提交测试
|
2024-10-16 17:41:37 +08:00 |
|
SongZhang
|
7bf25948d6
|
支付事务手动提交测试
|
2024-10-16 17:37:55 +08:00 |
|
SongZhang
|
5d7eb46e8a
|
支付事务手动提交测试
|
2024-10-16 17:32:57 +08:00 |
|
SongZhang
|
eae849e1e1
|
支付事务手动提交测试
|
2024-10-16 17:30:46 +08:00 |
|
SongZhang
|
dd43db3341
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-16 17:29:59 +08:00 |