czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
604 Commits 14 Branches 1 Tag 1.9 MiB
Commit Graph

580 Commits

Author SHA1 Message Date
牛叉闪闪 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
牛叉闪闪 d3e4c3ef4a 修改打印时间 2024-07-25 10:56:29 +08:00
SongZhang 6c885ab5a1 1.库存预警推送更改未公众号推送 2024-07-25 10:40:09 +08:00
SongZhang b00dc349d6 1.sku上下架 2024-07-24 18:02:58 +08:00
wangw 0cf417322b 获取手机号 移除 2024-07-23 09:16:53 +08:00
牛叉闪闪 752fd56c44 添加交班时间 2024-07-22 15:58:46 +08:00
牛叉闪闪 a4a9f43ac6 添加交班时间 2024-07-22 14:50:47 +08:00
牛叉闪闪 2a361fed46 添加交班时间 2024-07-22 14:39:16 +08:00
牛叉闪闪 1ea0eea537 添加交班时间 2024-07-22 14:12:12 +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
wangw 9a5c02a949 获取手机号 2024-07-22 11:39:57 +08:00
牛叉闪闪 cda3245f7b Merge remote-tracking branch 'origin/hph' into dev 2024-07-20 09:23:08 +08:00
牛叉闪闪 1dd5185c68 添加交班时间 2024-07-20 09:22:42 +08:00
牛叉闪闪 65376cd306 Merge remote-tracking branch 'origin/hph' into dev 2024-07-18 17:26:45 +08:00
牛叉闪闪 539129781a 根据订单id获取订单详情 2024-07-18 17:25:23 +08:00
牛叉闪闪 0338d8a1db Merge remote-tracking branch 'origin/hph' into dev 2024-07-18 17:09:55 +08:00
牛叉闪闪 ddecf1341d 根据订单id获取订单详情 2024-07-18 17:09:25 +08:00
SongZhang 2ae1c47322 1.线下退款增加标识 2024-07-18 16:11:13 +08:00
SongZhang cfdb07d8c5 1.退单锁定时间修改 2024-07-18 15:10:27 +08:00
SongZhang ce30ddb019 1.退单锁定时间修改 2024-07-18 15:05:00 +08:00
牛叉闪闪 6bcecc2ef9 添加打印发票功能 2024-07-18 13:40:01 +08:00
SongZhang b27b364848 1.线下退单 
2.销售同步保存库存记录
 2024-07-17 16:43:11 +08:00
牛叉闪闪 56d66097c7 耗材流水中添加订单信息 2024-07-17 11:19:45 +08:00
牛叉闪闪 35057b4ee7 Merge branch 'dev' into hph 2024-07-17 11:11:11 +08:00
SongZhang 48b609a407 查询订单无名称赋默认值 2024-07-16 15:09:32 +08:00
SongZhang 34e3cb9cb0 查询订单增加时间参数 2024-07-16 14:20:06 +08:00
牛叉闪闪 2cc2a5941a Merge remote-tracking branch 'origin/dev' into hph 2024-07-15 15:28:00 +08:00
牛叉闪闪 c67d7f20a2 修改耗材提醒 2024-07-15 15:27:31 +08:00
牛叉闪闪 d042b14c6a 修改耗材消耗 2024-07-15 11:05:22 +08:00
牛叉闪闪 e8418e3baf 添加耗材规格id 2024-07-13 17:37:40 +08:00
牛叉闪闪 2a0cd395d7 Merge remote-tracking branch 'origin/master' into hph 2024-07-13 15:10:15 +08:00
牛叉闪闪 0a0d009b2c 添加会员充值密码 2024-07-13 15:09:38 +08:00
牛叉闪闪 944b1102e5 只允许一个登录 2024-07-12 17:29:01 +08:00
牛叉闪闪 67228079c2 只允许一个登录 2024-07-12 15:01:37 +08:00
GYJ 5963f18425 Merge branch 'refs/heads/dev' 2024-07-12 14:32:42 +08:00
GYJ 2a28151139 退款暂不校验密码 2024-07-12 10:23:01 +08:00
韩鹏辉 01db36ac04 只允许一个登录 2024-07-12 09:38:51 +08:00
韩鹏辉 25b2fde2bb 只允许一个登录 2024-07-12 09:10:55 +08:00
韩鹏辉 81158431c8 退款操作密码 2024-07-11 14:23:59 +08:00
韩鹏辉 63ae10c971 退款操作密码 2024-07-11 14:23:24 +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
SongZhang ef73fe192a 下单增加起售校验 2024-07-11 13:48:12 +08:00
SongZhang 4691b12fb3 下单增加起售校验 2024-07-11 11:45:18 +08:00
SongZhang 2818f8afff Merge remote-tracking branch 'origin/hph' into dev 2024-07-11 11:33:39 +08:00
wangw 61fe12c087 sku 新增逻辑删除字段 和 起售值 2024-07-11 10:12:44 +08:00
韩鹏辉 007a7a47a7 修改耗材提醒 2024-07-10 09:09:06 +08:00
韩鹏辉 707f846af0 修改耗材提醒 2024-07-09 16:44:56 +08:00
韩鹏辉 c353e03dbf 修改耗材提醒 2024-07-09 15:53:14 +08:00
韩鹏辉 65fe019b9e 修改会员退款逻辑 2024-07-09 14:06:41 +08:00
GYJ 6b230eaa1b 小票打印二维码 2024-07-06 20:21:48 +08:00
GYJ 7daa596d31 Merge branch 'refs/heads/hph' into dev 2024-07-06 20:20:33 +08:00
SongZhang 8f5ee47c19 创建订单发送库存预警 2024-07-06 16:40:49 +08:00
韩鹏辉 08197e7a20 修改会员退单金额错误 2024-07-06 16:31:01 +08:00
韩鹏辉 7efa1f3f3b 修改会员退单金额错误 2024-07-06 16:29:40 +08:00
韩鹏辉 ee20f1244b 修改会员退单金额错误 2024-07-06 14:35:13 +08:00
韩鹏辉 1287f103df 去除小票打印二维码 2024-07-06 10:18:13 +08:00
SongZhang 7e911d37b8 Merge remote-tracking branch 'origin/hph' into dev 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
 2024-07-05 17:44:38 +08:00
SongZhang b3a17aa9d7 清空购物车返还耗材 2024-07-05 17:15:52 +08:00
韩鹏辉 b9fd6aed7a 修改耗材 2024-07-05 16:37:02 +08:00
韩鹏辉 c8ebe7fcfb 修改耗材 2024-07-05 16:00:27 +08:00
SongZhang 314df236f1 清空购物车返还库存 2024-07-05 14:34:32 +08:00
韩鹏辉 33a9b969d0 Merge remote-tracking branch 'origin/dev' into hph 2024-07-05 14:31:18 +08:00
SongZhang f572c3de88 清空购物车返还库存 2024-07-05 14:30:44 +08:00
SongZhang 6ef9a10639 Merge remote-tracking branch 'origin/hph' into dev 2024-07-05 14:22:42 +08:00
韩鹏辉 4d526525a5 添加耗材警告 2024-07-05 14:22:21 +08:00
SongZhang cae6555d87 清空购物车返还库存 2024-07-05 14:19:55 +08:00
SongZhang 109b047a88 清空购物车返还库存 2024-07-05 14:11:58 +08:00
SongZhang e0359be0dc 下单扣取库存 2024-07-05 11:35:11 +08:00
韩鹏辉 d772c63ee5 添加耗材警告 2024-07-05 10:20:09 +08:00
wangw 2b086ef923 日志输出为 cashier-client.log 
10MB 进行一次存储
 2024-07-05 09:58:52 +08:00
SongZhang 47e176b45a 下单扣取库存 2024-07-04 17:00:33 +08:00
SongZhang b02f92c54f 下单扣取库存 2024-07-04 09:33:44 +08:00
GYJ 8dfd31c58c 退单 库存记录 sku 没有productId的问题 2024-07-03 17:35:11 +08:00
GYJ e54a236dab 库存记录单位不正确 2024-07-03 15:48:30 +08:00
韩鹏辉 781a4baa81 添加耗材警告 2024-07-03 14:52:25 +08:00
韩鹏辉 f7b44edf0d 添加耗材警告 2024-07-03 14:51:55 +08:00
SongZhang 8da3d036b1 下单扣取库存 2024-07-03 10:57:40 +08:00
SongZhang e31f3c831a 库存预警支持多账号订阅 2024-07-02 16:13:24 +08:00
GYJ d35a5f2cc0 退单增加库存记录 2024-07-02 11:15:55 +08:00
GYJ 5a8af7f0bb 添加isDistribute注释 2024-07-02 10:13:34 +08:00
GYJ 286b9af051 mapper参数写错 2024-06-29 09:30:28 +08:00
韩鹏辉 8f4afed929 Merge remote-tracking branch 'origin/dev' into dev 2024-06-28 18:00:00 +08:00
韩鹏辉 4e27eb87b5 修改耗材库存 2024-06-28 17:59:41 +08:00
GYJ 5a61e994a1 下单根据是否共享库存判断商品和sku库存 2024-06-28 14:57:46 +08:00
SongZhang d82387e9d1 新增下单库存预警消息推送 2024-06-28 14:15:42 +08:00
韩鹏辉 fad761b63c 修改耗材库存 2024-06-28 09:39:29 +08:00
韩鹏辉 75ec8fc9e5 修改耗材库存 2024-06-28 09:39:14 +08:00
wangw e91636a188 分页配置统一 2024-06-27 14:21:46 +08:00
韩鹏辉 d8305159bd 根据token 获取店铺信息 2024-06-26 16:49:41 +08:00
wangw b96c4dcef2 冲突 2024-06-26 14:32:49 +08:00
wangw aa51ff123b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mapper/TbOrderInfoMapper.xml
 2024-06-26 14:30:08 +08:00
wangw 7b90da01d6 Merge branch 'master' into dev 2024-06-26 14:29:01 +08:00
韩鹏辉 abc5ea04e4 Merge branch '1.0.1' into dev 2024-06-26 14:28:36 +08:00
韩鹏辉 18925ac98f 修改打印 2024-06-26 14:28:04 +08:00
韩鹏辉 22c0032f78 Merge remote-tracking branch 'origin/master' 2024-06-26 11:12:40 +08:00
韩鹏辉 3668252207 修改打印 2024-06-26 11:12:28 +08:00
wangw 92fb9c48a0 解决页数超限 仍返回数据问题 2024-06-26 11:09:05 +08:00
韩鹏辉 7f986324e0 修改打印 2024-06-26 09:24:46 +08:00
GYJ bd0054ffa8 Merge branch 'refs/heads/stock-share' into dev 2024-06-26 09:18:57 +08:00
GYJ 2310a0164b 回滚库存 2024-06-25 15:31:50 +08:00
韩鹏辉 82935827f5 修改打印 2024-06-25 15:08:46 +08:00
韩鹏辉 4f6cd81505 修改打印 2024-06-25 14:54:07 +08:00
韩鹏辉 8fc41c1b07 修改库存 2024-06-25 09:58:47 +08:00
韩鹏辉 86bdcbe3c5 修改库存 2024-06-25 09:58:21 +08:00
GYJ b66a89b143 退款回滚库存 2024-06-24 18:00:25 +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
wangw f4d177609c 新增接口 分类列表(包括子分类) 2024-06-20 13:34:42 +08:00
wangw 762a902950 新增接口 分类列表(包括子分类) 2024-06-20 11:57:02 +08:00
韩鹏辉 08625bd03e 修改库存 2024-06-19 18:07:13 +08:00
GYJ a6adc81366 退款回滚库存 2024-06-19 17:36:45 +08:00
韩鹏辉 d46d4ca6df 修改库存 2024-06-19 17:27:38 +08:00
韩鹏辉 5b97722699 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
#	src/main/resources/generator-mapper/generatorConfig.xml
 2024-06-19 16:46:27 +08:00
韩鹏辉 50fa846cf1 修改库存 2024-06-19 16:44:11 +08:00
韩鹏辉 90a8fd4a54 添加类型 2024-06-14 15:28:13 +08:00
韩鹏辉 e5f5317f4e 修改库存 2024-06-12 11:57:55 +08:00
韩鹏辉 e109b31ff2 修改库存 2024-06-12 10:14:05 +08:00
韩鹏辉 c50172f5ca 修改库存 2024-06-12 10:12:58 +08:00
韩鹏辉 a1764e77c6 修改库存 2024-06-12 10:03:09 +08:00
韩鹏辉 7e8a86db6f Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client 2024-06-04 16:03:50 +08:00
韩鹏辉 ee3efaff6a 修改会员添加报错 2024-06-04 16:03:39 +08:00
wangw 21008fd918 会员新建关联 
会员支付金额校验
团购卷退款订单号
 2024-06-04 09:15:42 +08:00
韩鹏辉 70b29bd3ff 修改会员添加报错 2024-05-31 15:16:24 +08:00
韩鹏辉 689db4cf1b 修改交班数据 2024-05-30 16:51:49 +08:00
韩鹏辉 92df7d1ba6 修改交班数据 2024-05-30 11:21:05 +08:00
韩鹏辉 29293fd093 修改交班数据 2024-05-30 09:17:43 +08:00
韩鹏辉 9482cf4597 修改交班数据 2024-05-29 16:00:12 +08:00
韩鹏辉 664e57e145 添加会员充值奖励 2024-05-29 10:38:36 +08:00
wangw 640036afc5 退款回调 2024-05-24 15:58:28 +08:00
wangw 3e6cb81b46 购物车 多规格商品返回规格信息 
团购卷列表
团购卷退款
员工登录管理
 2024-05-24 15:56:41 +08:00
韩鹏辉 c5e337bef3 修改支付 2024-05-20 17:44:19 +08:00
韩鹏辉 cd913643a5 添加快捷支付 2024-05-20 09:59:15 +08:00
韩鹏辉 9b441ba636 添加新版收银系统支付 2024-05-17 10:52:22 +08:00
韩鹏辉 e64bce5e93 添加新版收银系统支付 2024-05-17 10:51:30 +08:00
wangguocheng 09e9b172ee 商品查询修改 2024-05-17 10:48:36 +08:00
wangguocheng 168d9c8a43 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/resources/generator-mapper/generatorConfig.xml
 2024-05-17 10:31:29 +08:00
wangguocheng 1c6ccb7d10 商品查询修改 2024-05-17 10:28:43 +08:00
韩鹏辉 bdce57ca44 添加新版收银系统支付 2024-05-16 14:21:55 +08:00
韩鹏辉 7b259ba55f 添加退单打印 2024-04-17 13:49:14 +08:00
韩鹏辉 9f8fbe4850 修改支付通道问题 2024-04-16 11:19:17 +08:00
韩鹏辉 c0f3b445cb 修改打印数据 2024-04-15 15:33:18 +08:00
19991905653 a2432316ea 交班打印逻辑修改 2024-04-12 10:27:51 +08:00
19991905653 c3c169d2b5 交班修改业务逻辑 ，跨天统计 2024-04-11 15:21:52 +08:00
19991905653 49ed813f63 客户端增加扣减库存 2024-04-09 17:24:44 +08:00
韩鹏辉 bc4c3e6975 修改飞蛾小票打印 2024-04-08 12:00:23 +08:00
wangw 55c0b270a0 打印机 contentType固定local 2024-04-07 11:21:34 +08:00
wangw 78fc29fb0f 入参注释 2024-04-07 09:00:44 +08:00
19991905653 4ac4efae96 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client 2024-04-03 17:36:37 +08:00
19991905653 a925ae6538 更新全选打包 2024-04-03 17:36:31 +08:00
19991905653 e18d620000 更新全选打包 2024-04-03 17:34:04 +08:00
韩鹏辉 6ec91caa9a 添加结算打印小票 2024-04-03 17:34:03 +08:00
19991905653 d98de3cfee 更新全选打包 2024-04-03 17:32:49 +08:00
wangw 39a5096151 PC打印机根据打印机类型 获取列表 2024-04-03 15:48:52 +08:00
19991905653 baedf85e77 更新全选打包 2024-04-03 15:39:24 +08:00