Commit Graph

983 Commits

Author SHA1 Message Date
349ddf38a2 Merge remote-tracking branch 'origin/test' into test 2024-10-10 14:47:10 +08:00
3533a1c90e 订单详情返回餐位费信息 2024-10-10 14:46:53 +08:00
Tankaikai
f25141a495 店铺小票打印记录查询 2024-10-09 18:21:38 +08:00
fac61ff581 Merge remote-tracking branch 'origin/test' into test 2024-10-09 14:55:08 +08:00
fece3c274e 取餐码获取修改
退款接口完善
2024-10-09 14:54:56 +08:00
谭凯凯
a0d9a1f591 打印消息队列新增透传参数 2024-10-09 14:48:11 +08:00
37dc169607 支付回调测试 2024-10-09 14:35:00 +08:00
77f193a06b 支付回调测试 2024-10-09 14:34:52 +08:00
4edaecf89c Merge remote-tracking branch 'origin/test' into test 2024-10-09 14:27:29 +08:00
27ffc4fa66 支付回调测试 2024-10-09 14:27:20 +08:00
Tankaikai
27c0c008d1 打印消息队列新增透传参数 2024-10-09 14:21:05 +08:00
680c24d2a2 台桌返回当前订单取餐码 2024-10-09 14:10:38 +08:00
99f372bf46 支付回调测试 2024-10-09 10:30:42 +08:00
b6792ccf99 Merge remote-tracking branch 'origin/test' into test 2024-10-09 09:56:42 +08:00
9388c7de3a 支付回调测试 2024-10-09 09:56:32 +08:00
bd21ba9ae8 Merge branch 'ww' into test 2024-10-09 09:35:51 +08:00
105ccd7e3f 商品列表 统计 sql问题 2024-10-09 09:34:54 +08:00
9f9355af39 Merge branch 'ww' into test 2024-10-08 18:02:02 +08:00
772c827118 商品列表 统计 sql问题 2024-10-08 18:01:06 +08:00
548c3a1940 Merge branch 'ww' into test 2024-10-08 17:49:44 +08:00
d855a7eeac 商品列表 统计 2024-10-08 17:48:42 +08:00
eb6e8845a0 Merge remote-tracking branch 'origin/test' into test 2024-10-08 17:15:55 +08:00
10f17d521e 支付回调测试 2024-10-08 17:15:41 +08:00
e9de90557e Merge branch 'ww' into test 2024-10-08 16:28:57 +08:00
52656b40b9 商品列表 post 请求 2024-10-08 16:27:57 +08:00
b20996355c Merge branch 'ww' into test 2024-10-08 16:16:19 +08:00
12cc56aada 商品列表v2改为post
统计处理空值
绑定相同耗材 提示
2024-10-08 16:14:09 +08:00
1a9310ef83 库存警戒值
日志记录
2024-10-08 15:28:31 +08:00
e4a03e583b 库存警戒值
日志记录
2024-10-08 15:27:41 +08:00
b9cce3bdf1 挂起订单取消挂起失败fix 2024-10-08 15:20:43 +08:00
e7ca92eaaf 排队取号,取号完成无法取号fix 2024-10-08 14:36:45 +08:00
780fce1416 Merge remote-tracking branch 'origin/test' into test 2024-10-08 14:28:12 +08:00
79d15b5c4e 修改全局参数校验异常处理器逻辑 2024-10-08 14:28:02 +08:00
81dce3ea75 Merge branch 'gyj' into test 2024-10-08 13:50:02 +08:00
58a74d1b29 conInfoId 字段名 2024-10-08 13:49:26 +08:00
facfa94973 库存警戒值 2024-10-08 13:43:02 +08:00
3c2f705bbb Merge branch 'ww' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
2024-10-08 13:41:18 +08:00
ca3b16c677 库存警戒值 2024-10-08 13:34:05 +08:00
8c69aa7474 Merge branch 'ww' into test 2024-10-08 13:25:18 +08:00
869d14f158 商品编辑 修改状态日志记录
快捷修改接口 日志记录 商品Id
库存警戒值
/api/summary/productSaleDate 商品销售 时间顺序
2024-10-08 13:24:03 +08:00
f703a40903 退款接口实现 2024-10-08 10:55:08 +08:00
fbb2be3755 退款接口实现 2024-10-08 10:51:24 +08:00
f3539d1899 退款接口实现 2024-10-08 10:39:31 +08:00
ba9482c4f6 Merge remote-tracking branch 'origin/test' into test 2024-10-08 09:27:03 +08:00
21a8fd517e 微信扫码支付报错fix 2024-10-08 09:26:44 +08:00
e838459a1b Merge branch 'ww' into test 2024-09-29 17:52:45 +08:00
f16f23ab84 商品 餐位费 不计 2024-09-29 17:52:19 +08:00
79e99e78a5 修改购物车修改 2024-09-29 11:40:31 +08:00
4ae309b5c5 Merge remote-tracking branch 'origin/test' into test 2024-09-29 11:35:35 +08:00
655383fd02 退款接口 2024-09-29 11:35:22 +08:00