 SongZhang
|
69a8e4b4c8
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 10:12:55 +08:00 |
|
SongZhang
|
078cd4a001
|
购物车列表展示已经退款的商品
|
2024-10-10 10:12:43 +08:00 |
Tankaikai
|
c153597347
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 10:05:11 +08:00 |
|
谭凯凯
|
9dc0e46c76
|
新增无Token查询订单简要信息接口
|
2024-10-10 10:05:03 +08:00 |
|
SongZhang
|
f0fe3fa75b
|
餐位费选择修改
|
2024-10-10 09:57:28 +08:00 |
|
SongZhang
|
d5af516891
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:43:37 +08:00 |
|
SongZhang
|
b654321366
|
餐位费选择修改
|
2024-10-10 09:43:28 +08:00 |
|
Tankaikai
|
f1bb7d39b4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:36:38 +08:00 |
|
谭凯凯
|
bd94b97017
|
店铺小票打印记录需求
|
2024-10-10 09:36:32 +08:00 |
|
SongZhang
|
59c7fc4c9d
|
创建订单修改
|
2024-10-10 09:35:18 +08:00 |
|
SongZhang
|
a1365b0e5f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-10 09:34:23 +08:00 |
|
SongZhang
|
fbd8f306e7
|
创建订单修改
|
2024-10-10 09:34:13 +08:00 |
|
谭凯凯
|
b3b0040a36
|
店铺小票打印记录需求
|
2024-10-10 09:32:41 +08:00 |
|
SongZhang
|
e583f4ccb0
|
创建订单修改
|
2024-10-10 09:19:00 +08:00 |
|
SongZhang
|
d48cc850f5
|
创建订单修改
|
2024-10-10 09:15:00 +08:00 |
|
SongZhang
|
2a9e26e524
|
创建订单修改
|
2024-10-10 09:10:27 +08:00 |
|
Tankaikai
|
5fdd361789
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-09 18:25:28 +08:00 |
|
谭凯凯
|
2b0ca2b5b8
|
店铺小票打印记录需求
|
2024-10-09 18:25:17 +08:00 |
|
SongZhang
|
5c5ffd10da
|
手动清台设置
|
2024-10-09 13:40:58 +08:00 |
|
SongZhang
|
f96c47ecac
|
创建订单携带就餐人数
|
2024-10-09 13:29:13 +08:00 |
|
SongZhang
|
4615e0fae1
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 14:20:17 +08:00 |
|
SongZhang
|
4d5937821a
|
购物车商品数量不正确fix
|
2024-10-08 14:20:06 +08:00 |
 wangw
|
f72b7c3fa0
|
商品库存警戒线
|
2024-10-08 11:46:57 +08:00 |
|
wangw
|
43e832826b
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:45:54 +08:00 |
|
wangw
|
88b189b1c4
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:43:56 +08:00 |
|
wangw
|
d4cc9deed0
|
商品库存警戒线
|
2024-10-08 11:36:46 +08:00 |
|
SongZhang
|
44fc9927b4
|
退菜接口，sku mapper结构修改
|
2024-10-08 11:27:42 +08:00 |
|
SongZhang
|
6f0ff52897
|
选择人数添加锁
|
2024-09-28 16:26:05 +08:00 |
|
SongZhang
|
0f919e5a5d
|
pc不校验自取模式
|
2024-09-28 16:04:03 +08:00 |
|
SongZhang
|
99f029d503
|
打印简化
|
2024-09-28 15:21:48 +08:00 |
|
SongZhang
|
f0ab136220
|
打印简化
|
2024-09-28 11:43:56 +08:00 |
|
SongZhang
|
c439ac091e
|
打印简化
|
2024-09-28 10:53:19 +08:00 |
|
SongZhang
|
b1f88d9932
|
打印简化
|
2024-09-28 10:49:25 +08:00 |
|
SongZhang
|
ea21e97e29
|
打印简化
|
2024-09-28 10:40:52 +08:00 |
|
SongZhang
|
57800dab04
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 10:38:09 +08:00 |
|
SongZhang
|
19eacd1550
|
创建订单保存sendType
|
2024-09-27 10:37:57 +08:00 |
|
wangw
|
fda4c29e85
|
Merge branch 'ww' into test
|
2024-09-26 17:04:04 +08:00 |
|
wangw
|
657596f619
|
库存记录 增加操作人
|
2024-09-26 17:03:42 +08:00 |
|
wangw
|
628ef133ff
|
Merge branch 'ww' into test
|
2024-09-25 16:49:28 +08:00 |
|
wangw
|
4bbc2408bf
|
新增会员时 填充加入会员时间
|
2024-09-25 16:49:03 +08:00 |
|
Tankaikai
|
9970799cf7
|
Merge branch 'tkk' into test
|
2024-09-25 11:18:36 +08:00 |
|
谭凯凯
|
caaa3196b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 11:17:51 +08:00 |
|
SongZhang
|
501970a89b
|
修改sql日志打印
|
2024-09-24 18:06:21 +08:00 |
|
SongZhang
|
f8ea5f568a
|
叫号提示打印修改
|
2024-09-24 09:57:01 +08:00 |
|
SongZhang
|
a27f64dafa
|
增加异常反打实现，避免异常堆栈信息过长
|
2024-09-24 09:56:27 +08:00 |
|
SongZhang
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
SongZhang
|
7adf50ab99
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 15:52:09 +08:00 |
|
SongZhang
|
753f3d9d8b
|
调整mapper扫描方式，增加请求信息打印
|
2024-09-20 15:51:59 +08:00 |
 yijiegong
|
43220a03ea
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:34:12 +08:00 |
|
yijiegong
|
851bbfc01e
|
Merge branch 'gyj' into test
|
2024-09-19 15:33:53 +08:00 |