Commit Graph

1258 Commits

Author SHA1 Message Date
9fc2f9e702 商品列表 排序 报损 操作人 2024-10-11 14:47:04 +08:00
4d0bb753c4 Merge remote-tracking branch 'origin/test' into test 2024-10-11 14:46:40 +08:00
e74fc42cf7 订单查询接口修改 2024-10-11 14:46:19 +08:00
ee59a73d02 商品列表 排序 报损 操作人 2024-10-11 14:46:13 +08:00
谭凯凯
b7e9f74912 店铺管理-店铺配置:打印机设置相关接口 2024-10-11 14:36:34 +08:00
713ff653ad 库存改为商品级库存 2024-10-11 14:14:10 +08:00
cc4d34b6fe 支付根据状态查询 2024-10-11 14:12:27 +08:00
fb7c22aacc 退款接口修改 2024-10-11 13:48:31 +08:00
c49088def2 下单校验餐位费 2024-10-11 11:45:41 +08:00
3b182796ab orderDetail状态未流转fix 2024-10-11 11:27:01 +08:00
838265d73f Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:54:29 +08:00
4cd6d6742c 退款订单添加退款备注 2024-10-11 10:54:17 +08:00
3e3f8528f3 通用单位 2024-10-11 10:43:25 +08:00
Tankaikai
350012f368 Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:42:42 +08:00
谭凯凯
12a5466e26 店铺管理-店铺配置:打印机设置相关接口 2024-10-11 10:42:34 +08:00
4d7e108f83 通用单位 2024-10-11 10:42:23 +08:00
66f1fb3da8 Merge branch 'ww' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
2024-10-11 09:45:35 +08:00
846cbef3da 初始化单位,统计 关于客坐费没有规格问题 2024-10-11 09:44:18 +08:00
谭凯凯
8c8b49adb2 店铺管理-店铺配置:打印机设置相关接口 2024-10-11 09:38:41 +08:00
504fec5011 Merge remote-tracking branch 'origin/test' into test 2024-10-10 16:58:01 +08:00
42c1c1da3f 扫码支付回调修改 2024-10-10 16:57:51 +08:00
cee923159c Merge branch 'ww' into test 2024-10-10 16:20:54 +08:00
70d26b5c78 新增商品 修改商品 价格问题 2024-10-10 16:20:27 +08:00
58ef3ae818 Merge branch 'ww' into test 2024-10-10 16:04:43 +08:00
4b28ad0f1c 耗材绑定关系 2024-10-10 16:02:23 +08:00
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