 SongZhang
|
5d74f104b2
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:45:11 +08:00 |
|
SongZhang
|
1cff6fffcc
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:38:26 +08:00 |
|
SongZhang
|
3794cd5540
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:36:42 +08:00 |
|
SongZhang
|
02be5222b5
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 13:33:25 +08:00 |
|
SongZhang
|
8f4e56f889
|
1.代客下单 台桌最新订单号查询问题fix
|
2024-08-26 11:28:00 +08:00 |
|
SongZhang
|
abdefe6932
|
1.代客下单 会员支付，支付修改台桌状态
|
2024-08-23 17:07:43 +08:00 |
|
SongZhang
|
baf91df968
|
1.代客下单 无法下单fix
|
2024-08-23 13:47:07 +08:00 |
牛叉闪闪
|
86ae5f962b
|
添加员工折扣
|
2024-08-22 15:11:27 +08:00 |
|
牛叉闪闪
|
b5daf8aef1
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
|
2024-08-22 15:09:46 +08:00 |
 yijiegong
|
f2b32671b8
|
查询台桌携带订单信息 + 订单金额
|
2024-08-22 11:03:53 +08:00 |
|
yijiegong
|
8b657fdc8a
|
查询台桌携带订单信息
|
2024-08-22 10:57:19 +08:00 |
|
yijiegong
|
1e66c99606
|
购物车加入bug fix
|
2024-08-22 10:37:15 +08:00 |
|
yijiegong
|
1a968775ff
|
商品列表角标
|
2024-08-22 09:56:19 +08:00 |
|
yijiegong
|
2ae71952de
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-22 09:38:56 +08:00 |
|
yijiegong
|
24586d3b13
|
修改查询购物车信息出错
|
2024-08-22 09:38:42 +08:00 |
|
SongZhang
|
0e2c0a9604
|
1.代客下单会员余额支付
|
2024-08-21 17:45:16 +08:00 |
|
SongZhang
|
da54cc30b7
|
1.打票增加代客下单重复校验
|
2024-08-21 17:00:08 +08:00 |
|
SongZhang
|
6f3dcca911
|
1.打票增加代客下单重复校验
|
2024-08-21 16:47:44 +08:00 |
|
SongZhang
|
fbea2c6670
|
1.代客下单先付款后付款操作
|
2024-08-21 14:56:08 +08:00 |
|
SongZhang
|
b7708d82e1
|
1.代客下单后选择会员修改
|
2024-08-21 10:23:24 +08:00 |
|
SongZhang
|
e04c3ee084
|
1.增加台桌会员id
|
2024-08-21 09:49:24 +08:00 |
|
SongZhang
|
2b7ca62abf
|
1.增加台桌状态
|
2024-08-21 09:21:07 +08:00 |
|
SongZhang
|
da9f1ab68f
|
1.增加台桌状态
|
2024-08-21 09:12:52 +08:00 |
|
SongZhang
|
eb424d8eb4
|
Merge remote-tracking branch 'origin/test' into dkxd2
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-08-21 09:11:59 +08:00 |
|
SongZhang
|
a12a1d2e1f
|
1.增加台桌状态
|
2024-08-21 09:09:44 +08:00 |
|
牛叉闪闪
|
d0cb517e23
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 17:26:43 +08:00 |
|
牛叉闪闪
|
fd45264b0d
|
添加员工折扣
|
2024-08-20 17:26:20 +08:00 |
|
牛叉闪闪
|
af3ea12121
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 17:18:26 +08:00 |
|
牛叉闪闪
|
653254f9f3
|
添加员工折扣
|
2024-08-20 17:17:55 +08:00 |
|
SongZhang
|
d8027c92b2
|
1.增加mybatisplus依赖
|
2024-08-20 17:03:51 +08:00 |
|
SongZhang
|
8d9deb43a3
|
Merge remote-tracking branch 'origin/hph' into zs
|
2024-08-20 14:30:24 +08:00 |
|
牛叉闪闪
|
6b436da4d3
|
加入购物车取消耗材控制
|
2024-08-20 14:06:06 +08:00 |
|
SongZhang
|
796f43299f
|
1.代客下单相关接口修改
|
2024-08-20 13:23:13 +08:00 |
|
SongZhang
|
46133d7d16
|
1.查询商品返回规格上下架信息字段
|
2024-08-19 14:35:55 +08:00 |
|
SongZhang
|
61157d730c
|
1.耗材check值错误修复
|
2024-08-17 15:00:46 +08:00 |
|
牛叉闪闪
|
563541d929
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-08-16 15:39:01 +08:00 |
|
牛叉闪闪
|
8f7ea02d06
|
加入购物车添加耗材控制
|
2024-08-16 15:38:47 +08:00 |
|
SongZhang
|
cee4643925
|
1.修改库存增加库存记录
|
2024-08-16 14:46:30 +08:00 |
|
牛叉闪闪
|
4d462a1d3e
|
加入购物车添加耗材控制
|
2024-08-16 14:16:15 +08:00 |
|
牛叉闪闪
|
397c1b4df3
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-08-16 14:15:51 +08:00 |
|
SongZhang
|
38b03b556c
|
1.推送校验耗材是否开启check
|
2024-08-16 13:51:06 +08:00 |
|
牛叉闪闪
|
178f3c0831
|
加入购物车添加耗材控制
|
2024-08-14 16:01:11 +08:00 |
|
SongZhang
|
df75a74822
|
1.推送
|
2024-08-14 15:48:39 +08:00 |
|
SongZhang
|
dad47eb0c8
|
1.商品查询库存不准确问题
|
2024-08-14 15:41:49 +08:00 |
|
SongZhang
|
b0243a9ddd
|
1.推送校验状态
|
2024-08-14 14:58:50 +08:00 |
|
SongZhang
|
5a0112132d
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-08-14 14:11:53 +08:00 |
|
牛叉闪闪
|
4a0a548565
|
加入购物车添加耗材控制
|
2024-08-14 11:35:39 +08:00 |
|
牛叉闪闪
|
6c6a447a5e
|
加入购物车添加耗材控制
|
2024-08-14 11:16:28 +08:00 |
|
SongZhang
|
146cb0f00b
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
|
2024-08-14 09:44:53 +08:00 |
|
牛叉闪闪
|
dc6df17a3f
|
修改商品规格加入购物车
|
2024-08-14 09:43:56 +08:00 |