Commit Graph

79 Commits

Author SHA1 Message Date
牛叉闪闪
7d713a0a50 修改 2024-09-06 17:38:19 +08:00
6acd14da8a 1 2024-09-04 14:20:56 +08:00
f3ad47f0f3 1.代客下单 加入购物车同步保存小程序缓存 2024-09-03 10:39:39 +08:00
牛叉闪闪
a5046976c5 Merge remote-tracking branch 'origin/hph' into test 2024-09-02 10:56:28 +08:00
牛叉闪闪
637a0cf315 修改 2024-09-02 10:55:37 +08:00
4101c5235b 1.获取桌码通过tableId获取 2024-08-31 16:45:08 +08:00
牛叉闪闪
e0b62b66d4 修改 2024-08-30 14:40:43 +08:00
187a757575 密码校验修改 2024-08-30 11:16:36 +08:00
bf18452189 查询店铺操作密码设置 2024-08-30 10:34:45 +08:00
牛叉闪闪
adb1c28bb8 修改 2024-08-29 16:51:15 +08:00
0bdbd07555 1.修改会员余额支付备注 2024-08-29 13:45:26 +08:00
牛叉闪闪
7b0e91e4b4 添加会员充值退款 2024-08-29 09:44:45 +08:00
ae3d77e8c3 PC 版本管理 2024-08-28 16:20:04 +08:00
牛叉闪闪
6e5216192d 修改支付逻辑 2024-08-27 10:48:37 +08:00
f585a4f46a 1.代客下单 2024-08-27 09:11:55 +08:00
牛叉闪闪
ed5bb107d0 添加员工折扣 2024-08-26 15:42:21 +08:00
牛叉闪闪
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
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
1a968775ff 商品列表角标 2024-08-22 09:56:19 +08:00
0e2c0a9604 1.代客下单会员余额支付 2024-08-21 17:45:16 +08:00
b7708d82e1 1.代客下单后选择会员修改 2024-08-21 10:23:24 +08:00
2b7ca62abf 1.增加台桌状态 2024-08-21 09:21:07 +08:00
da9f1ab68f 1.增加台桌状态 2024-08-21 09:12:52 +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
牛叉闪闪
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
796f43299f 1.代客下单相关接口修改 2024-08-20 13:23:13 +08:00
46133d7d16 1.查询商品返回规格上下架信息字段 2024-08-19 14:35:55 +08:00
b0243a9ddd 1.推送校验状态 2024-08-14 14:58:50 +08:00
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
牛叉闪闪
b5bc0f2e0a 修改商品规格加入购物车 2024-08-14 09:38:44 +08:00
牛叉闪闪
d93bfd24a1 添加获取最大折扣接口 2024-08-13 14:30:22 +08:00
a8b9223454 Merge remote-tracking branch 'origin/zs2' into dev 2024-08-12 15:13:43 +08:00
923ee6f1cb 1.上下架售罄接口 2024-08-12 14:25:14 +08:00
86df7addd6 1.代客下单相关接口 2024-08-09 16:07:00 +08:00
牛叉闪闪
95afd96ec2 添加员工 2024-07-26 11:23:31 +08:00
0cf417322b 获取手机号 移除 2024-07-23 09:16:53 +08:00
牛叉闪闪
6445724a64 Merge remote-tracking branch 'origin/dev' into dev 2024-07-22 14:12:01 +08:00
牛叉闪闪
60267f5576 添加交班时间 2024-07-22 14:11:48 +08:00
9a5c02a949 获取手机号 2024-07-22 11:39:57 +08:00
牛叉闪闪
1dd5185c68 添加交班时间 2024-07-20 09:22:42 +08:00
牛叉闪闪
ddecf1341d 根据订单id获取订单详情 2024-07-18 17:09:25 +08:00
ce30ddb019 1.退单锁定时间修改 2024-07-18 15:05:00 +08:00
牛叉闪闪
6bcecc2ef9 添加打印发票功能 2024-07-18 13:40:01 +08:00