Commit Graph

643 Commits

Author SHA1 Message Date
54acf2a0f5 打包赠送允许不传递值 2024-10-16 15:11:53 +08:00
483af5462d 购物车获取修改 2024-10-16 14:27:27 +08:00
0417d122fb 退单接口修改 2024-10-16 14:14:43 +08:00
74a4514c3c 退单接口修改 购物车查询逻辑修改 2024-10-16 14:13:11 +08:00
03e0793e59 Merge branch 'ww' into test 2024-10-15 17:43:59 +08:00
ffc2568b98 报损数量问题 2024-10-15 17:43:40 +08:00
ef7f4ebb8e Merge remote-tracking branch 'origin/test' into test 2024-10-15 14:07:12 +08:00
1a8a15193e 修改接口支持打包赠送 2024-10-15 14:07:01 +08:00
1ed5338032 Merge branch 'ww' into test 2024-10-15 13:25:09 +08:00
01405b33e9 删除商品 2024-10-15 13:24:40 +08:00
544a251a67 Merge branch 'ww' into test 2024-10-15 10:06:33 +08:00
f8c763ad9d 商品修改库存 记录 2024-10-15 10:06:02 +08:00
fdf551358f 添加商品 规格丢失问题 2024-10-14 16:36:42 +08:00
192605ae90 添加商品 规格丢失问题 2024-10-14 16:35:09 +08:00
5e8e6661b9 Merge remote-tracking branch 'origin/test' into test 2024-10-14 16:28:53 +08:00
4c19b6c9d3 取餐码获取为null修复 2024-10-14 16:28:37 +08:00
347431f199 取餐码获取为null修复 2024-10-14 16:28:08 +08:00
da9a1dc3b8 Merge branch 'ww' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
2024-10-14 15:30:07 +08:00
68fac45b7a 销售统计 2024-10-14 15:29:23 +08:00
f87a2747bc Merge branch 'ww' into test 2024-10-14 15:22:18 +08:00
2d03914963 分类 列表 数据问题
销售统计
2024-10-14 15:20:35 +08:00
bf5e5ec7dd Merge branch 'ww' into test 2024-10-14 14:56:57 +08:00
5468fa56de 分类 列表 数据问题 2024-10-14 14:55:09 +08:00
1cc7188488 赠送商品单独拎出 2024-10-14 13:40:25 +08:00
a9d92e98c5 退菜fix 2024-10-14 13:26:56 +08:00
5a2c3f4208 客座费获取修改 2024-10-14 10:29:51 +08:00
c88b838e88 退款修改 2024-10-14 10:03:03 +08:00
2553a3605d 退款不更改购物车状态 2024-10-12 18:14:29 +08:00
d3cac60125 打包费 2024-10-12 17:51:37 +08:00
a8ab3706dd 台桌状态修改 2024-10-12 16:39:30 +08:00
10c11aef8f 已下单商品支持退单 2024-10-12 16:27:29 +08:00
18c1367856 购物车获取修改 2024-10-12 16:10:57 +08:00
10b2ae2537 Merge remote-tracking branch 'origin/test' into test 2024-10-12 15:58:08 +08:00
424082ead3 外带结束购物车状态 2024-10-12 15:57:49 +08:00
7c7976c197 Merge branch 'ww' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
2024-10-12 15:12:07 +08:00
1945d3f906 商品共享库存字段 2024-10-12 15:11:00 +08:00
cc9cfceed4 退款金额 2024-10-12 14:41:21 +08:00
1c04a44278 外带不校验餐位费 2024-10-12 14:36:35 +08:00
6bccfb8036 退款金额展示有误fix 2024-10-12 14:32:58 +08:00
70abb276bc 未记录商品销售的bug 2024-10-12 14:16:24 +08:00
ece7e3eb0e Merge remote-tracking branch 'origin/test' into test 2024-10-12 10:46:33 +08:00
90505fd354 订单创建失败不打印菜品票 2024-10-12 10:46:19 +08:00
Tankaikai
d2ed566348 Merge remote-tracking branch 'origin/test' into test 2024-10-12 10:44:17 +08:00
谭凯凯
0ab7e04fc8 适配打印机新参数 2024-10-12 10:44:10 +08:00
7379b1d85d 退菜同步修改订单金额 2024-10-12 10:20:02 +08:00
608fb72c78 订单添加支付时间 2024-10-12 09:15:30 +08:00
e1a5e491e5 订单查询修改 2024-10-11 18:17:49 +08:00
d335268a84 先付费模式创建订单之后清空台桌状态 2024-10-11 17:09:04 +08:00
6f50e1e134 Merge remote-tracking branch 'origin/test' into test 2024-10-11 16:42:58 +08:00
857502e26e 先付费模式创建订单之后结束购物车状态 2024-10-11 16:42:35 +08:00