 SongZhang
|
b4f113e811
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:23:35 +08:00 |
|
SongZhang
|
01d92b3812
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:14:59 +08:00 |
|
SongZhang
|
e16d9dfcb1
|
1.代客下单 创建订单会员为null修复
|
2024-08-23 13:34:03 +08:00 |
|
SongZhang
|
64e89d5ed6
|
1.代客下单 取单sql fix
|
2024-08-23 13:31:10 +08:00 |
|
SongZhang
|
28874a59f1
|
1.代客下单 添加购物车 不查询昨日数据
|
2024-08-23 11:48:02 +08:00 |
 wangw
|
12e7379cbf
|
Merge branch 'ww' into test
|
2024-08-23 11:36:52 +08:00 |
|
wangw
|
a2e16bf05d
|
订单管理 会员商品 名称 变黄
|
2024-08-23 11:34:37 +08:00 |
|
SongZhang
|
f8a9022064
|
1.代客下单 会员支付，台桌状态问题
|
2024-08-23 11:06:26 +08:00 |
|
SongZhang
|
ce54b66205
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-23 10:47:48 +08:00 |
|
SongZhang
|
8381287036
|
1.代客下单 会员支付，负数余额问题
|
2024-08-23 10:47:38 +08:00 |
|
wangw
|
112206d2ec
|
Merge branch 'ww' into test
|
2024-08-23 10:39:47 +08:00 |
|
wangw
|
16f07f2f40
|
赠送商品 为空时
|
2024-08-23 10:39:33 +08:00 |
|
wangw
|
52dce24fb8
|
赠送商品为空
|
2024-08-23 10:32:57 +08:00 |
|
SongZhang
|
614ffc9abf
|
1.代客下单 同步查询小程序购物车商品
|
2024-08-23 10:28:49 +08:00 |
|
SongZhang
|
532dec69e3
|
1.代客下单 同步查询小程序购物车商品
|
2024-08-23 09:41:27 +08:00 |
|
SongZhang
|
9e26fad331
|
1.代客下单 会员支付实现
|
2024-08-23 09:20:51 +08:00 |
 yijiegong
|
c408e8e168
|
Merge branch 'gyj' into test
|
2024-08-22 16:20:51 +08:00 |
|
yijiegong
|
2a6c54ba47
|
桌台统计添加收银台
|
2024-08-22 16:20:20 +08:00 |
|
wangw
|
bffa05f07f
|
Merge branch 'ww' into test
|
2024-08-22 16:04:30 +08:00 |
|
wangw
|
91e2e0caaf
|
活动赠送商品
订单超时 回滚赠送使用数量
|
2024-08-22 16:04:12 +08:00 |
|
SongZhang
|
d981259995
|
1.代客下单 挂单不增加masterId
|
2024-08-21 13:29:30 +08:00 |
|
SongZhang
|
a9e5ad8229
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:36:57 +08:00 |
|
SongZhang
|
edadbb5662
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:02:38 +08:00 |
|
SongZhang
|
7d37e58206
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-21 10:46:16 +08:00 |
|
SongZhang
|
91751b0f32
|
1.代客下单 台桌状态同步更新
|
2024-08-21 10:45:59 +08:00 |
|
wangw
|
7f78921eda
|
Merge branch 'ww' into test
|
2024-08-21 10:16:37 +08:00 |
|
wangw
|
e3e0c93502
|
店铺扩展信息 新增时 key不可重复
|
2024-08-21 10:16:22 +08:00 |
|
wangw
|
df0570860d
|
店铺扩展信息 增加描述字段
|
2024-08-21 09:36:21 +08:00 |
|
SongZhang
|
7d1571628f
|
1.代客下单 选择会员fix
|
2024-08-20 18:15:37 +08:00 |
|
SongZhang
|
4e5c560d95
|
1.代客下单 选择会员fix
|
2024-08-20 18:11:13 +08:00 |
GYJ
|
0d8aa662e4
|
Merge branch 'refs/heads/gyj' into test
|
2024-08-20 17:31:05 +08:00 |
|
GYJ
|
beea5e902c
|
修改查询会员列表 - 从shopUser查询
|
2024-08-20 17:30:24 +08:00 |
|
SongZhang
|
98cf4f2f6d
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 17:05:46 +08:00 |
|
SongZhang
|
376af15266
|
1.代客下单 新增后付款下单
|
2024-08-20 17:05:36 +08:00 |
牛叉闪闪
|
f00ad6a46c
|
添加员工折扣字段
|
2024-08-20 16:13:13 +08:00 |
|
牛叉闪闪
|
972ab851c8
|
修改增加减少用户资金接口
|
2024-08-20 15:30:21 +08:00 |
|
牛叉闪闪
|
aa7c5d3744
|
修改增加减少用户资金接口
|
2024-08-20 15:20:04 +08:00 |
|
wangw
|
b9157ddc6b
|
Merge branch 'ww' into test
|
2024-08-20 14:58:12 +08:00 |
|
wangw
|
1cb0d9c80f
|
会员活动赠送商品
|
2024-08-20 14:57:55 +08:00 |
|
SongZhang
|
830271a838
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 14:47:50 +08:00 |
|
SongZhang
|
b388b3a044
|
1.库存排序
|
2024-08-20 14:47:32 +08:00 |
|
牛叉闪闪
|
049f52499e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 14:46:52 +08:00 |
|
牛叉闪闪
|
d6b8919294
|
修改增加减少用户资金接口
|
2024-08-20 14:46:12 +08:00 |
|
SongZhang
|
fcfe0a2f53
|
1.库存排序
|
2024-08-20 14:39:01 +08:00 |
|
SongZhang
|
a90c441988
|
Merge remote-tracking branch 'origin/test' into zs
|
2024-08-19 17:45:09 +08:00 |
|
SongZhang
|
d6bbe73d58
|
1.代客下单 会员点单 取消点单
|
2024-08-19 17:42:47 +08:00 |
|
牛叉闪闪
|
2567044da8
|
添加是否允许会员自定义金额字段
|
2024-08-19 17:41:25 +08:00 |
|
SongZhang
|
15de68b704
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:24:45 +08:00 |
|
SongZhang
|
2252f4edcb
|
Merge remote-tracking branch 'origin/test' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
|
2024-08-19 16:15:52 +08:00 |
|
SongZhang
|
ea86b42847
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:15:01 +08:00 |