 yijiegong
|
d78a7a7ac6
|
添加最后登录时间 1
|
2024-08-26 11:41:35 +08:00 |
|
yijiegong
|
6ba0544243
|
添加最后登录时间
|
2024-08-26 11:38:24 +08:00 |
|
yijiegong
|
bbcd6edf20
|
添加最后登录时间
|
2024-08-26 11:33:11 +08:00 |
牛叉闪闪
|
f0476f05e0
|
添加退款、会员退款、会员充值控制
|
2024-08-26 10:53:48 +08:00 |
 SongZhang
|
48aab9eeac
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:21:21 +08:00 |
|
SongZhang
|
078a986e6b
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:17:38 +08:00 |
|
SongZhang
|
d272efa45f
|
1.代客下单 只查询当天挂起订单
|
2024-08-26 09:21:50 +08:00 |
|
SongZhang
|
29ccf35e5f
|
1.代客下单 存单返回备注内容
|
2024-08-23 17:48:36 +08:00 |
|
SongZhang
|
f9931b50ea
|
1.代客下单 存单保存备注
|
2024-08-23 17:26:54 +08:00 |
|
SongZhang
|
f6e473b8bb
|
1.代客下单 取单不操作购物车状态
|
2024-08-23 15:34:13 +08:00 |
|
SongZhang
|
98bc995b71
|
1.代客下单 挂单列表数量不准确fix
|
2024-08-23 14:57:51 +08:00 |
|
SongZhang
|
96791306f2
|
1.代客下单 挂单之后masterId未增加修复
|
2024-08-23 14:51:47 +08:00 |
|
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 |
|
GYJ
|
53275cd5de
|
集成model类型修改
|
2024-08-19 16:09:44 +08:00 |
|
SongZhang
|
b5fc56c0aa
|
1.代客下单 挂单规格返回
|
2024-08-19 15:43:11 +08:00 |
|
SongZhang
|
a74612f5a6
|
1.代客下单 桌号获取
|
2024-08-19 14:12:07 +08:00 |
|
牛叉闪闪
|
95e37c2048
|
添加增加减少会员余额接口
|
2024-08-19 11:25:01 +08:00 |
|
牛叉闪闪
|
635625842a
|
添加增加减少会员余额接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
53fd7e24c0
|
判断修改耗材参数
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
cf62b77128
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
58eb528047
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
SongZhang
|
4909ebe807
|
1.代客下单 删除订单接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
fa868cce31
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
SongZhang
|
5f2950ab72
|
1.代客下单挂单修改
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
8da97add53
|
1.商品不推送修复
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
2250bda5c1
|
分组时间管控
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
e3f68dc486
|
用户管理 排序
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
ff07ab528e
|
活动管理 赠送商品
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
0ec21c31e9
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
8d73b216ef
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
GYJ
|
5643faab22
|
弹窗广告
|
2024-08-19 11:16:47 +08:00 |
|
SongZhang
|
c51e0ec580
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-19 10:12:02 +08:00 |
|
SongZhang
|
96f1dcb768
|
1.代客下单 删除订单接口
|
2024-08-19 10:11:51 +08:00 |
|
牛叉闪闪
|
9f6f7c2a78
|
判断修改耗材参数
|
2024-08-19 09:45:48 +08:00 |
|
GYJ
|
e1499150f9
|
修改库存开关导致数据缺失的问题
|
2024-08-18 20:24:26 +08:00 |
|
GYJ
|
e6b8414366
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
|
2024-08-18 20:14:25 +08:00 |
|
牛叉闪闪
|
085ae733e2
|
添加耗材信息单价字段
|
2024-08-17 18:33:35 +08:00 |
|
牛叉闪闪
|
9b8ec56b96
|
添加耗材信息单价字段
|
2024-08-17 18:25:03 +08:00 |
|
SongZhang
|
d10a9671a9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 17:37:23 +08:00 |
|
SongZhang
|
7da10ca43e
|
1.代客下单挂单修改
|
2024-08-17 17:37:06 +08:00 |
|
牛叉闪闪
|
a21e361b4e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-17 17:04:08 +08:00 |
|
SongZhang
|
e8f9af93e8
|
1.商品不推送修复
|
2024-08-17 16:57:51 +08:00 |
|
SongZhang
|
fcaba6d511
|
1.商品不推送修复
|
2024-08-17 16:52:29 +08:00 |
|
SongZhang
|
b13a48d5e5
|
1.商品不推送修复
|
2024-08-17 16:49:18 +08:00 |
|
牛叉闪闪
|
3807eb43ce
|
添加耗材信息单价字段
|
2024-08-17 15:28:21 +08:00 |
|
SongZhang
|
7eab45ae49
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 15:22:38 +08:00 |
|
SongZhang
|
89582d3bc8
|
1.代客下单 挂起订单
|
2024-08-17 15:21:45 +08:00 |
|
wangw
|
1de1edb537
|
分组时间管控
|
2024-08-17 14:38:00 +08:00 |
|
wangw
|
df95c09724
|
用户管理 排序
|
2024-08-17 14:15:12 +08:00 |
|
wangw
|
a53e9f7ab4
|
活动管理 赠送商品
|
2024-08-17 11:49:01 +08:00 |
|
GYJ
|
8e0f237e2e
|
台桌数据导出修改
|
2024-08-17 11:29:59 +08:00 |