Commit Graph

690 Commits

Author SHA1 Message Date
张松 e5c74051c7 feat: 1.单品改价 2.免厨打 2024-11-25 14:08:34 +08:00
张松 4c209ac27b feat: dev增加预发布地址 2024-11-25 11:09:26 +08:00
张松 9b1352360d feat: 1.临时菜接口 2.购物车数量字段修改为decimal类型 2024-11-25 10:56:22 +08:00
张松 be8c796254 fix: 订单详情增加是否会员价字段标识 2024-11-18 13:56:44 +08:00
wangw 2fffee3c55 活动赠送券 来源字段 2024-11-13 18:08:26 +08:00
张松 7a8ae2b5bc fix: 订单保存先付费后付费 2024-11-13 13:24:03 +08:00
张松 25f86bf5fe feat: 订单保存amount金额 2024-11-13 10:26:02 +08:00
张松 cdfd5a625f Merge remote-tracking branch 'origin/test' into test 2024-11-12 18:18:06 +08:00
张松 8b66dba411 feat: 空订单删除 2024-11-12 18:17:46 +08:00
wangw 6834a313cc 优惠券 字段修改为浮点数 2024-11-12 10:44:45 +08:00
谭凯凯 9304543b96 储值送积分活动 2024-11-09 09:55:16 +08:00
wangw 8bf63d821d 充值活动 满足金额 2024-11-08 17:25:26 +08:00
张松 0d8052d620 feat: 会员价根据店铺设置返回 2024-11-07 16:10:57 +08:00
张松 af1f990c73 fix: 外带不校验餐位费 2024-11-07 11:21:03 +08:00
张松 d448e25fc8 fix: 只选择餐位费不允许创建订单 2024-11-07 11:11:56 +08:00
张松 873aa9fc89 fix: 只选择餐位费不允许创建订单 2024-11-07 11:08:21 +08:00
张松 68a8f6d3c5 fix: 只选择餐位费不允许创建订单 2024-11-07 11:07:53 +08:00
张松 6fd8a4f7d0 fix: 只选择餐位费不允许创建订单 2024-11-07 11:02:35 +08:00
张松 7b333543a7 feat: 空订单直接删除 2024-11-07 10:48:54 +08:00
张松 9d43ce2fc1 feat: 空订单直接删除 2024-11-07 10:44:41 +08:00
张松 896667018a feat: 1. 添加商品会员价 2.空订单直接删除 2024-11-07 10:25:52 +08:00
谭凯凯 635ebb138f 交班BUG修复 2024-11-06 16:14:26 +08:00
Tankaikai 81941984b6 Merge remote-tracking branch 'origin/dev' into test 2024-11-04 13:59:35 +08:00
谭凯凯 79601b6877 解决飞蛾打印机切刀bug 2024-11-04 13:58:57 +08:00
SongZhang f0ebdd9b55 fix: 放开打票语音提示 2024-11-01 15:59:14 +08:00
SongZhang d783ac93d0 fix: 数据库没有tickLogo字段修复 2024-11-01 10:35:03 +08:00
wangw c04d8faabd 店铺信息 增加小票logo返回 2024-11-01 10:02:31 +08:00
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