Commit Graph

648 Commits

Author SHA1 Message Date
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
谭凯凯 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
谭凯凯 745e7c9b93 小票打印bug修复 2024-10-26 10:38:03 +08:00
谭凯凯 482db587d8 小票打印bug修复 2024-10-25 18:07:06 +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
SongZhang ebf1f97fda 支付事务手动提交测试 2024-10-16 17:29:29 +08:00
谭凯凯 ddc33c20ad 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 16:59:18 +08:00
谭凯凯 2d2632b376 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 16:43:57 +08:00
谭凯凯 875eb8fb02 打印样式修改 2024-10-16 16:32:52 +08:00
谭凯凯 811fff8644 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 16:25:59 +08:00
谭凯凯 2fb0664446 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 16:08:13 +08:00
谭凯凯 d43d72aa1e 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 15:58:27 +08:00
谭凯凯 252961c441 店铺管理-店铺配置:打印机设置相关接口 2024-10-16 15:47:51 +08:00
谭凯凯 ba8bbfcbb7 打印样式修改 2024-10-16 15:42:15 +08:00
谭凯凯 834141678e 调整打印机配置,修改打印机参数 2024-10-16 15:05:42 +08:00
Tankaikai 235b686afd 打印样式修改 2024-10-15 16:48:59 +08:00
Tankaikai ef95c312e5 打印样式修改 2024-10-15 16:43:24 +08:00
Tankaikai 12e67e3956 打印样式修改 2024-10-15 16:34:37 +08:00
Tankaikai e5da3ebb30 打印样式修改 2024-10-15 16:31:18 +08:00
谭凯凯 cb1d05a042 打印样式修改 2024-10-15 10:56:22 +08:00