Commit Graph

535 Commits

Author SHA1 Message Date
牛叉闪闪 adb1c28bb8 修改 2024-08-29 16:51:15 +08:00
SongZhang e504c26978 1.代客下单 会员余额支付明细不匹配修复 2024-08-29 16:47:55 +08:00
牛叉闪闪 40b8198c7e 修改 2024-08-29 16:37:14 +08:00
SongZhang 8c18cb1347 1.代客下单 已出餐商品支持操作 2024-08-29 16:23:13 +08:00
牛叉闪闪 860211489e Merge remote-tracking branch 'origin/test' into test 2024-08-29 16:13:02 +08:00
牛叉闪闪 36c3c2e04b 修改 2024-08-29 16:12:46 +08:00
SongZhang 8b56b21021 Merge remote-tracking branch 'origin/test' into test 2024-08-29 16:09:11 +08:00
SongZhang dd26e7873b 1.代客下单 已出餐商品支持操作 2024-08-29 16:09:02 +08:00
牛叉闪闪 864793949b 修改 2024-08-29 16:04:30 +08:00
SongZhang ac82a2e447 1.代客下单 已出餐商品不支持操作 2024-08-29 16:00:12 +08:00
SongZhang 0facce27aa Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:55:06 +08:00
SongZhang ee5cb7d4ba 1.代客下单 已出餐商品不支持操作 2024-08-29 15:54:26 +08:00
牛叉闪闪 d76558cce2 修改 2024-08-29 15:54:11 +08:00
牛叉闪闪 92c4f1ca3a Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:52:30 +08:00
牛叉闪闪 35b9132eda 修改 2024-08-29 15:52:13 +08:00
SongZhang 12b87312fd Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:49:39 +08:00
SongZhang c9b3cea5cd 1.代客下单 已出餐商品不支持操作 2024-08-29 15:49:28 +08:00
牛叉闪闪 08a9a26f2d 修改 2024-08-29 15:43:12 +08:00
牛叉闪闪 2f6a3d9c16 Merge remote-tracking branch 'origin/test' into test 2024-08-29 15:10:45 +08:00
牛叉闪闪 88526e0dd9 修改 2024-08-29 15:10:31 +08:00
SongZhang cf4116e4b9 Merge remote-tracking branch 'origin/test' into test 2024-08-29 14:52:11 +08:00
SongZhang bfca837e78 1.代客下单 查询购物车校验状态 2024-08-29 14:52:01 +08:00
牛叉闪闪 ad0c743ae4 Merge remote-tracking branch 'origin/test' into test 2024-08-29 14:46:31 +08:00
牛叉闪闪 445551f0d5 修改 2024-08-29 14:45:45 +08:00
SongZhang c1df28b929 1.代客下单 台桌状态同时校验detail和购物车数据 2024-08-29 14:29:15 +08:00
SongZhang 1dba8819b9 Merge remote-tracking branch 'origin/test' into test 2024-08-29 14:25:03 +08:00
SongZhang 3829685b58 1.代客下单 台桌状态同时校验detail和购物车数据 2024-08-29 14:24:54 +08:00
牛叉闪闪 3a185c4d59 Merge remote-tracking branch 'origin/hph' into test 2024-08-29 14:07:40 +08:00
牛叉闪闪 525c56f30c 修改 2024-08-29 14:04:04 +08:00
SongZhang 0bdbd07555 1.修改会员余额支付备注 2024-08-29 13:45:26 +08:00
牛叉闪闪 4ea005d132 修改打印小票 2024-08-29 10:30:11 +08:00
牛叉闪闪 6e5866e46e 修改打印小票 2024-08-29 10:24:15 +08:00
牛叉闪闪 3a7468af91 修改打印小票 2024-08-29 10:16:21 +08:00
牛叉闪闪 b18ab44412 修改打印小票 2024-08-29 10:14:20 +08:00
牛叉闪闪 1192f454aa Merge remote-tracking branch 'origin/test' into test 2024-08-29 09:58:57 +08:00
牛叉闪闪 d94d89fe78 修改打印小票 2024-08-29 09:56:43 +08:00
SongZhang 95965f8a3c 1.打印折扣值为空报错修复 2024-08-29 09:46:02 +08:00
牛叉闪闪 7b0e91e4b4 添加会员充值退款 2024-08-29 09:44:45 +08:00
牛叉闪闪 f01391014a 添加会员变动与通知 2024-08-28 17:18:41 +08:00
牛叉闪闪 e49e72e088 Merge remote-tracking branch 'origin/hph' into test 2024-08-28 16:51:44 +08:00
牛叉闪闪 9a70e49663 添加会员变动与通知 2024-08-28 16:51:00 +08:00
wangw ae3d77e8c3 PC 版本管理 2024-08-28 16:20:04 +08:00
wangw 15c09f9666 退单 扣除销量 2024-08-28 16:19:52 +08:00
牛叉闪闪 c82b340d30 添加会员变动与通知 2024-08-28 11:27:14 +08:00
牛叉闪闪 acf7e71769 添加会员变动与通知 2024-08-28 09:57:23 +08:00
SongZhang 6dcd8368a0 1.代客下单 结算单打印 2024-08-27 14:53:34 +08:00
SongZhang fbe7b72e4b 1.代客下单 结算单打印 2024-08-27 11:41:52 +08:00
SongZhang 9942bc6de6 Merge remote-tracking branch 'origin/test' into dkxd2 2024-08-27 10:59:37 +08:00
SongZhang 838351f279 1.代客下单 结算单打印 2024-08-27 10:57:45 +08:00
SongZhang d8bac55fb0 1.代客下单 结算单打印 2024-08-27 10:57:29 +08:00
牛叉闪闪 6e5216192d 修改支付逻辑 2024-08-27 10:48:37 +08:00
SongZhang 35e039a530 1.代客下单 已下单商品不支持删除 2024-08-27 10:36:05 +08:00
牛叉闪闪 2461e5d808 修改支付逻辑 2024-08-27 09:45:03 +08:00
SongZhang 6705689d34 Merge remote-tracking branch 'origin/test' into dkxd2 2024-08-27 09:12:11 +08:00
SongZhang f585a4f46a 1.代客下单 2024-08-27 09:11:55 +08:00
牛叉闪闪 253e2f9c0b 修改支付逻辑 2024-08-27 09:11:14 +08:00
牛叉闪闪 a1d0fa1a7f 修改支付逻辑 2024-08-26 18:27:12 +08:00
牛叉闪闪 bc5bdf1421 修改支付逻辑 2024-08-26 18:22:52 +08:00
牛叉闪闪 cf2dfc295c 修改支付逻辑 2024-08-26 18:02:06 +08:00
牛叉闪闪 ddf9af76b5 修改支付逻辑 2024-08-26 17:31:27 +08:00
牛叉闪闪 0f74c30e58 修改支付逻辑 2024-08-26 17:00:38 +08:00
牛叉闪闪 651f2c1427 修改支付逻辑 2024-08-26 16:25:00 +08:00
牛叉闪闪 d3b3fe2492 修改支付逻辑 2024-08-26 15:49:19 +08:00
牛叉闪闪 ed5bb107d0 添加员工折扣 2024-08-26 15:42:21 +08:00
wangw 42e6b3a689 充值报错问题 2024-08-26 15:27:55 +08:00
SongZhang 6f93900c2a 1.代客下单 打印菜品小票,以及结算小票 2024-08-26 15:14:57 +08:00
牛叉闪闪 b0f62d3dad 添加员工折扣 2024-08-26 15:03:35 +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
SongZhang 6a6ce8ef1c 1.代客下单 打印菜品小票 2024-08-26 14:23:56 +08:00
SongZhang 5e6c6284ed 1.代客下单 打印菜品小票 2024-08-26 13:57:41 +08:00
SongZhang 5d74f104b2 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:45:11 +08:00
SongZhang 1cff6fffcc 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:38:26 +08:00
SongZhang 3794cd5540 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:36:42 +08:00
SongZhang 02be5222b5 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 13:33:25 +08:00
SongZhang 8f4e56f889 1.代客下单 台桌最新订单号查询问题fix 2024-08-26 11:28:00 +08:00
SongZhang abdefe6932 1.代客下单 会员支付,支付修改台桌状态 2024-08-23 17:07:43 +08:00
SongZhang 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
yijiegong f2b32671b8 查询台桌携带订单信息 + 订单金额 2024-08-22 11:03:53 +08:00
yijiegong 8b657fdc8a 查询台桌携带订单信息 2024-08-22 10:57:19 +08:00
yijiegong 1e66c99606 购物车加入bug fix 2024-08-22 10:37:15 +08:00
yijiegong 1a968775ff 商品列表角标 2024-08-22 09:56:19 +08:00
yijiegong 2ae71952de Merge remote-tracking branch 'origin/test' into test 2024-08-22 09:38:56 +08:00
yijiegong 24586d3b13 修改查询购物车信息出错 2024-08-22 09:38:42 +08:00
SongZhang 0e2c0a9604 1.代客下单会员余额支付 2024-08-21 17:45:16 +08:00
SongZhang da54cc30b7 1.打票增加代客下单重复校验 2024-08-21 17:00:08 +08:00
SongZhang 6f3dcca911 1.打票增加代客下单重复校验 2024-08-21 16:47:44 +08:00
SongZhang fbea2c6670 1.代客下单先付款后付款操作 2024-08-21 14:56:08 +08:00
SongZhang b7708d82e1 1.代客下单后选择会员修改 2024-08-21 10:23:24 +08:00
SongZhang e04c3ee084 1.增加台桌会员id 2024-08-21 09:49:24 +08:00
SongZhang 2b7ca62abf 1.增加台桌状态 2024-08-21 09:21:07 +08:00
SongZhang da9f1ab68f 1.增加台桌状态 2024-08-21 09:12:52 +08:00
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 cbc56efa37 1.耗材推送数量不准确问题 2024-08-03 18:01:06 +08:00
SongZhang 8f03b7077b Merge remote-tracking branch 'origin/dev' into dev 2024-08-03 10:15:04 +08:00
SongZhang b658557d83 1.关闭库存不推送库存预警 2024-08-03 10:14:37 +08:00
牛叉闪闪 b70a88203d 修改退单sku 2024-08-02 15:57:43 +08:00
牛叉闪闪 6359f9b466 修改退单sku 2024-08-02 15:48:56 +08:00
牛叉闪闪 7da9604c55 修改交班信息存储 2024-08-02 15:03:05 +08:00
牛叉闪闪 c1530e0506 修改交班信息存储 2024-08-02 15:01:54 +08:00
牛叉闪闪 a4ea3fe8bb Merge remote-tracking branch 'origin/hph' into dev 2024-08-02 11:10:55 +08:00
牛叉闪闪 e7692107a6 修改交班报错 2024-08-02 11:10:29 +08:00
wangw cc5fea21e8 员工登录 重复账号问题 2024-08-02 09:26:52 +08:00
SongZhang 6c528e3ac6 Merge remote-tracking branch 'origin/dev' into dev 2024-08-01 11:22:21 +08:00
SongZhang 38d8c4c817 1.耗材推送时间 2024-08-01 11:22:06 +08:00
wangw e617e08923 订单备注 2024-08-01 11:15:50 +08:00
wangw f3f0e39459 订单备注 2024-08-01 10:52:55 +08:00
SongZhang 8a31f093fe Merge remote-tracking branch 'origin/dev' into dev 2024-07-31 14:27:40 +08:00
SongZhang 2c40d6ec6b 1.耗材预警错误判断修复 2024-07-31 14:27:29 +08:00
牛叉闪闪 8a51ed732e 修改交班 2024-07-31 14:13:30 +08:00
牛叉闪闪 8a0589e384 Merge remote-tracking branch 'origin/dev' into hph 2024-07-31 14:01:00 +08:00
牛叉闪闪 b93cb6c779 修改交班 2024-07-31 14:00:28 +08:00
SongZhang 8f213254e3 Merge remote-tracking branch 'origin/dev' into dev 2024-07-31 13:59:16 +08:00
牛叉闪闪 ed516fbcf7 修改退款反还耗材功能 2024-07-30 18:36:59 +08:00
牛叉闪闪 00ea7079d7 Merge remote-tracking branch 'origin/hph' into dev 2024-07-30 09:37:10 +08:00
牛叉闪闪 bd50d13b9a 修改交班数据中的交班时间 2024-07-30 09:36:35 +08:00
牛叉闪闪 cf316508de 添加订单备注 2024-07-29 16:00:50 +08:00
牛叉闪闪 728e87f90b 添加订单备注 2024-07-29 16:00:06 +08:00
牛叉闪闪 365067887b Merge remote-tracking branch 'origin/hph' into dev 2024-07-29 10:51:33 +08:00
牛叉闪闪 03b8dff85b 添加订单备注 2024-07-29 10:51:11 +08:00
SongZhang 8170850e2e Merge remote-tracking branch 'origin/dev' into dev 2024-07-26 17:10:12 +08:00
SongZhang dbbc5ad98a 1.耗材预警调整 2024-07-26 17:09:56 +08:00
牛叉闪闪 7ca618b403 Merge remote-tracking branch 'origin/hph' into dev 2024-07-26 16:55:34 +08:00
牛叉闪闪 2caf668e24 修改职员名称 2024-07-26 16:55:00 +08:00
wangw d2cc4fcac6 员工账号 状态校验 2024-07-26 14:49:26 +08:00
SongZhang 1ac75009c8 Merge remote-tracking branch 'origin/dev' into dev 2024-07-26 14:18:37 +08:00
SongZhang 363786872f 1.sku下架 2024-07-26 14:17:54 +08:00
牛叉闪闪 0eae7dd467 打印员工名称 2024-07-26 13:58:27 +08:00
牛叉闪闪 a4dbc5a26d Merge remote-tracking branch 'origin/hph' into dev 2024-07-26 13:46:51 +08:00
牛叉闪闪 129c98e044 还原小票打印代码 2024-07-26 13:46:24 +08:00
牛叉闪闪 aba36ba322 Merge remote-tracking branch 'origin/dev' into dev 2024-07-26 11:25:26 +08:00
牛叉闪闪 3c7326b547 Merge remote-tracking branch 'origin/hph' into dev 2024-07-26 11:25:10 +08:00
牛叉闪闪 3ef28aa8c4 添加员工 2024-07-26 11:24:34 +08:00
牛叉闪闪 95afd96ec2 添加员工 2024-07-26 11:23:31 +08:00
SongZhang e0cb2184b2 1.库存多次扣取问题修复 2024-07-26 11:20:13 +08:00
SongZhang 0897d3305d Merge remote-tracking branch 'origin/dev' into dev 2024-07-26 10:10:39 +08:00
SongZhang 2b71560995 1.耗材推送预警值改为等于
2. 耗材数量为消耗完毕数量
2024-07-26 10:10:29 +08:00
牛叉闪闪 9904f30baf 添加打印日志 2024-07-25 17:11:33 +08:00
SongZhang 839a7fe3a6 1.模板消息负值不推送问题修复 2024-07-25 17:02:14 +08:00
牛叉闪闪 14f9f36ef5 Merge remote-tracking branch 'origin/hph' into dev 2024-07-25 16:52:32 +08:00
牛叉闪闪 c6f392f701 添加打印日志 2024-07-25 16:52:11 +08:00
牛叉闪闪 9101c788c2 添加打印日志 2024-07-25 16:36:08 +08:00
SongZhang f66829f69a 1.库存返还问题修复 2024-07-25 16:12:08 +08:00
牛叉闪闪 1bf12d880c 添加打印日志 2024-07-25 15:49:44 +08:00
SongZhang e91ae3bd8d Merge remote-tracking branch 'origin/dev' into dev 2024-07-25 15:01:41 +08:00
SongZhang d7223fe70b 1.修改预警通知标题 2024-07-25 15:01:29 +08:00
牛叉闪闪 2aa2afbd2b Merge remote-tracking branch 'origin/hph' into dev 2024-07-25 14:57:37 +08:00
牛叉闪闪 3ed266d676 添加打印日志 2024-07-25 14:57:04 +08:00
SongZhang 94fcc2ae09 1.耗材预警推送修复 2024-07-25 14:47:21 +08:00
SongZhang b864c24f2f 1.耗材预警推送 2024-07-25 14:19:23 +08:00
SongZhang 5cb005ccd0 1.库存预警报错停止推送修复 2024-07-25 11:27:35 +08:00
牛叉闪闪 37e9745ca7 添加打印日志 2024-07-25 11:26:19 +08:00
牛叉闪闪 2f35abf17a Merge remote-tracking branch 'origin/dev' into hph 2024-07-25 10:56:45 +08:00