 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 |
|
牛叉闪闪
|
780707e55c
|
修改商品规格加入购物车
|
2024-08-14 09:40:41 +08:00 |
|
牛叉闪闪
|
b5bc0f2e0a
|
修改商品规格加入购物车
|
2024-08-14 09:38:44 +08:00 |
|
SongZhang
|
e640226629
|
1.推送
|
2024-08-13 14:36:16 +08:00 |
|
SongZhang
|
148440cb31
|
1.无法修改库存fix
|
2024-08-13 14:33:12 +08:00 |
|
牛叉闪闪
|
d93bfd24a1
|
添加获取最大折扣接口
|
2024-08-13 14:30:22 +08:00 |
|
SongZhang
|
f7b845201c
|
1.无法修改库存fix
|
2024-08-13 09:06:07 +08:00 |
|
SongZhang
|
a8b9223454
|
Merge remote-tracking branch 'origin/zs2' into dev
|
2024-08-12 15:13:43 +08:00 |
|
SongZhang
|
22eadf7193
|
1.推送增加店铺开关校验
|
2024-08-12 14:35:27 +08:00 |
|
SongZhang
|
923ee6f1cb
|
1.上下架售罄接口
|
2024-08-12 14:25:14 +08:00 |
|
牛叉闪闪
|
6de1857e3c
|
Merge remote-tracking branch 'origin/master'
|
2024-08-09 16:17:54 +08:00 |
|
牛叉闪闪
|
a2028b6dd8
|
修改打印逻辑
|
2024-08-09 16:17:41 +08:00 |
|
SongZhang
|
556d6cabf3
|
1.代客下单相关接口
|
2024-08-09 16:16:27 +08:00 |
|
SongZhang
|
86df7addd6
|
1.代客下单相关接口
|
2024-08-09 16:07:00 +08:00 |
|
SongZhang
|
c300f61def
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-09 15:58:00 +08:00 |
|
SongZhang
|
63f5c54284
|
1.耗材推送数量不准确问题
|
2024-08-09 15:57:52 +08:00 |
|
牛叉闪闪
|
5b14a4f342
|
修改打印逻辑
|
2024-08-09 14:48:58 +08:00 |
 wangw
|
6732e8905d
|
订单状态错误问题
|
2024-08-07 15:01:55 +08:00 |
|
牛叉闪闪
|
736389aa65
|
修改交班数据
|
2024-08-05 16:17:18 +08:00 |
|
牛叉闪闪
|
5ed9c3abef
|
修改交班数据
|
2024-08-05 14:44:05 +08:00 |
|
SongZhang
|
8d600dfbe8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 18:01:16 +08:00 |
|
SongZhang
|
cbc56efa37
|
1.耗材推送数量不准确问题
|
2024-08-03 18:01:06 +08:00 |
|
wangw
|
11a1837361
|
git提交不识别log
|
2024-08-03 16:46:33 +08:00 |
|
SongZhang
|
8f03b7077b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 10:15:04 +08:00 |