张松
|
cd66a1b268
|
Merge branch 'refs/heads/dev' into test
|
2024-12-17 15:00:19 +08:00 |
|
张松
|
21ae260976
|
Merge branch 'refs/heads/dev-3.0.0' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
|
2024-12-17 15:00:06 +08:00 |
|
张松
|
b88509133c
|
fix: 退款修改
|
2024-12-17 14:58:01 +08:00 |
|
张松
|
c815a7b061
|
fix: 会员支付修改
|
2024-12-17 14:42:18 +08:00 |
|
张松
|
255ce6a491
|
Merge branch 'refs/heads/dev-3.0.0' into dev
|
2024-12-17 14:28:58 +08:00 |
|
张松
|
2c69dcc4d3
|
fix: 退款积分空值判断
|
2024-12-17 14:28:23 +08:00 |
|
张松
|
f243d83de8
|
fix: 退款优惠券为null处理
|
2024-12-17 14:25:58 +08:00 |
|
张松
|
f42ab0d8b9
|
fix: 退款优惠券为null处理
|
2024-12-17 14:24:38 +08:00 |
|
张松
|
0767fe5e0f
|
Merge branch 'refs/heads/dev' into test
|
2024-12-17 13:34:52 +08:00 |
|
张松
|
96247fab7d
|
Merge remote-tracking branch 'origin/dev-3.0.0' into dev
|
2024-12-17 13:34:09 +08:00 |
|
张松
|
6e7fcd6404
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:32:12 +08:00 |
|
谭凯凯
|
30c62c9a71
|
挂账需求，移植到点餐机端
|
2024-12-17 13:31:47 +08:00 |
|
张松
|
ad776d7ff4
|
fix: 商品列表不查询优惠券商品
|
2024-12-17 13:26:51 +08:00 |
|
张松
|
a9903124d5
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:23:17 +08:00 |
|
张松
|
a3d6cc105a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-17 13:22:02 +08:00 |
|
张松
|
2a48cfa63f
|
fix: 无台桌不校验就餐模式
|
2024-12-17 13:21:50 +08:00 |
|
Tankaikai
|
f47038bbe5
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-12-17 10:09:13 +08:00 |
|
张松
|
5f0950f17f
|
fix: 未下单商品不允许转台并台
|
2024-12-17 09:20:13 +08:00 |
|
张松
|
6f89b2eb3d
|
fix: 清空购物车修改
|
2024-12-16 17:13:18 +08:00 |
|
张松
|
b13db23b90
|
fix: 清空购物车修改
|
2024-12-16 17:09:02 +08:00 |
|
张松
|
0a89b6d67c
|
fix: 转桌不打票
|
2024-12-16 16:54:28 +08:00 |
|
张松
|
2231792463
|
fix: 下单次数修复
|
2024-12-16 16:46:12 +08:00 |
|
张松
|
929a694284
|
fix: 购物车角标数量修复
|
2024-12-16 16:43:12 +08:00 |
|
张松
|
cff2c0e38a
|
fix: 购物车角标数量修复
|
2024-12-16 16:41:02 +08:00 |
|
张松
|
4955db3333
|
fix: 商品列表超限不返回数量修复
|
2024-12-16 14:53:44 +08:00 |
|
张松
|
9320f400df
|
fix: 商品列表超限不返回数量修复
|
2024-12-16 14:50:23 +08:00 |
|
张松
|
89e202fa15
|
fix: 商品列表超限不返回数量修复
|
2024-12-16 09:52:32 +08:00 |
|
张松
|
1212fc1cc0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-16 09:33:06 +08:00 |
|
张松
|
9543878cd1
|
fix: 购物车角标数目不准确修复
|
2024-12-16 09:32:55 +08:00 |
|
Tankaikai
|
0c6c96eacb
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-13 13:28:57 +08:00 |
|
谭凯凯
|
b9b6a90dee
|
登录返回店铺授权过期日期
|
2024-12-13 13:28:50 +08:00 |
|
张松
|
331e1ddc00
|
fix: 抓单返回类型修改
|
2024-12-12 14:56:50 +08:00 |
|
张松
|
c17da7d4b3
|
fix: 转单修改
|
2024-12-12 14:37:48 +08:00 |
|
张松
|
0bd6ed40a2
|
fix: callRecord报错修复
|
2024-12-11 14:02:53 +08:00 |
|
张松
|
0756092e4d
|
feat: mybatisplus分页失效修复
|
2024-12-11 11:35:59 +08:00 |
|
张松
|
496df13b1e
|
feat: 创建订单修改台桌信息
|
2024-12-11 11:14:20 +08:00 |
|
张松
|
a9ebf37fc5
|
feat: 转台并台实现
|
2024-12-11 11:10:07 +08:00 |
|
张松
|
72ee726ccb
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-11 10:28:26 +08:00 |
|
张松
|
b1a9894a33
|
feat: 上传接口实现
|
2024-12-11 10:27:47 +08:00 |
|
谭凯凯
|
04f428198a
|
登录返回店铺授权过期日期
|
2024-12-10 16:30:32 +08:00 |
|
谭凯凯
|
f7d89c8dba
|
登录返回店铺授权过期日期
|
2024-12-10 16:20:30 +08:00 |
|
张松
|
eea45c05d8
|
Merge remote-tracking branch 'origin/test' into test-3.0.1
|
2024-12-10 11:08:25 +08:00 |
|
张松
|
84971187ca
|
feat: 排队叫号接口实现
|
2024-12-10 11:07:22 +08:00 |
|
Tankaikai
|
34539e50cf
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-12-09 10:11:03 +08:00 |
|
谭凯凯
|
999a9f6af7
|
小票打印bug修复
|
2024-12-09 10:10:13 +08:00 |
|
张松
|
1fc1c36c84
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-12-07 09:18:03 +08:00 |
|
张松
|
c1cbdba2e3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-06 18:30:31 +08:00 |
|
张松
|
edfd6e593d
|
feat: 查询店铺不根据state查询
|
2024-12-06 18:29:35 +08:00 |
|
Tankaikai
|
c7dd5598cf
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-06 18:21:13 +08:00 |
|
谭凯凯
|
a9f69aacc2
|
小票打印bug修复
|
2024-12-06 18:21:06 +08:00 |
|