牛叉闪闪
|
a7263f85e7
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
|
2024-08-26 15:01:32 +08:00 |
|
牛叉闪闪
|
fdfeb5701a
|
添加员工折扣
|
2024-08-26 14:58:29 +08:00 |
|
|
|
abdefe6932
|
1.代客下单 会员支付，支付修改台桌状态
|
2024-08-23 17:07:43 +08:00 |
|
|
|
f2b32671b8
|
查询台桌携带订单信息 + 订单金额
|
2024-08-22 11:03:53 +08:00 |
|
|
|
8b657fdc8a
|
查询台桌携带订单信息
|
2024-08-22 10:57:19 +08:00 |
|
|
|
0e2c0a9604
|
1.代客下单会员余额支付
|
2024-08-21 17:45:16 +08:00 |
|
|
|
fbea2c6670
|
1.代客下单先付款后付款操作
|
2024-08-21 14:56:08 +08:00 |
|
|
|
b7708d82e1
|
1.代客下单后选择会员修改
|
2024-08-21 10:23:24 +08:00 |
|
|
|
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 |
|
牛叉闪闪
|
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 |
|
|
|
796f43299f
|
1.代客下单相关接口修改
|
2024-08-20 13:23:13 +08:00 |
|
|
|
46133d7d16
|
1.查询商品返回规格上下架信息字段
|
2024-08-19 14:35:55 +08:00 |
|
|
|
61157d730c
|
1.耗材check值错误修复
|
2024-08-17 15:00:46 +08:00 |
|
|
|
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 |
|
|
|
a8b9223454
|
Merge remote-tracking branch 'origin/zs2' into dev
|
2024-08-12 15:13:43 +08:00 |
|
|
|
22eadf7193
|
1.推送增加店铺开关校验
|
2024-08-12 14:35:27 +08:00 |
|
|
|
923ee6f1cb
|
1.上下架售罄接口
|
2024-08-12 14:25:14 +08:00 |
|
|
|
86df7addd6
|
1.代客下单相关接口
|
2024-08-09 16:07:00 +08:00 |
|
牛叉闪闪
|
03b8dff85b
|
添加订单备注
|
2024-07-29 10:51:11 +08:00 |
|
牛叉闪闪
|
1bf12d880c
|
添加打印日志
|
2024-07-25 15:49:44 +08:00 |
|
牛叉闪闪
|
2f35abf17a
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-07-25 10:56:45 +08:00 |
|
牛叉闪闪
|
d3e4c3ef4a
|
修改打印时间
|
2024-07-25 10:56:29 +08:00 |
|
|
|
b00dc349d6
|
1.sku上下架
|
2024-07-24 18:02:58 +08:00 |
|
牛叉闪闪
|
60267f5576
|
添加交班时间
|
2024-07-22 14:11:48 +08:00 |
|
|
|
b27b364848
|
1.线下退单
2.销售同步保存库存记录
|
2024-07-17 16:43:11 +08:00 |
|
牛叉闪闪
|
56d66097c7
|
耗材流水中添加订单信息
|
2024-07-17 11:19:45 +08:00 |
|
韩鹏辉
|
d72af13b2c
|
Merge remote-tracking branch 'origin/hph' into dev
|
2024-07-11 13:51:56 +08:00 |
|
韩鹏辉
|
6e7ee2137b
|
添加现金充值操作密码
|
2024-07-11 13:51:22 +08:00 |
|
|
|
61fe12c087
|
sku 新增逻辑删除字段 和 起售值
|
2024-07-11 10:12:44 +08:00 |
|
韩鹏辉
|
b9fd6aed7a
|
修改耗材
|
2024-07-05 16:37:02 +08:00 |
|
韩鹏辉
|
d772c63ee5
|
添加耗材警告
|
2024-07-05 10:20:09 +08:00 |
|
韩鹏辉
|
f7b44edf0d
|
添加耗材警告
|
2024-07-03 14:51:55 +08:00 |
|
|
|
e31f3c831a
|
库存预警支持多账号订阅
|
2024-07-02 16:13:24 +08:00 |
|
GYJ
|
5a8af7f0bb
|
添加isDistribute注释
|
2024-07-02 10:13:34 +08:00 |
|
韩鹏辉
|
fad761b63c
|
修改耗材库存
|
2024-06-28 09:39:29 +08:00 |
|
韩鹏辉
|
75ec8fc9e5
|
修改耗材库存
|
2024-06-28 09:39:14 +08:00 |
|
韩鹏辉
|
abc5ea04e4
|
Merge branch '1.0.1' into dev
|
2024-06-26 14:28:36 +08:00 |
|
韩鹏辉
|
8fc41c1b07
|
修改库存
|
2024-06-25 09:58:47 +08:00 |
|
韩鹏辉
|
86bdcbe3c5
|
修改库存
|
2024-06-25 09:58:21 +08:00 |
|
GYJ
|
fa2668ed1c
|
添加字段
|
2024-06-24 15:05:26 +08:00 |
|
GYJ
|
c1790a3198
|
memberIn 增加shopId merchantId
|
2024-06-20 15:19:03 +08:00 |
|
|
|
f4d177609c
|
新增接口 分类列表(包括子分类)
|
2024-06-20 13:34:42 +08:00 |
|
|
|
762a902950
|
新增接口 分类列表(包括子分类)
|
2024-06-20 11:57:02 +08:00 |
|
韩鹏辉
|
50fa846cf1
|
修改库存
|
2024-06-19 16:44:11 +08:00 |
|
韩鹏辉
|
a1764e77c6
|
修改库存
|
2024-06-12 10:03:09 +08:00 |
|
|
|
21008fd918
|
会员新建关联
会员支付金额校验
团购卷退款订单号
|
2024-06-04 09:15:42 +08:00 |
|
韩鹏辉
|
9482cf4597
|
修改交班数据
|
2024-05-29 16:00:12 +08:00 |
|
韩鹏辉
|
664e57e145
|
添加会员充值奖励
|
2024-05-29 10:38:36 +08:00 |
|
