czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,473 Commits 14 Branches 0 Tags 5 MiB
Commit Graph

1421 Commits

Author SHA1 Message Date
SongZhang f7ca147e49 1. 创建订单退款订单状态会被覆盖修复 
2. 优惠券积分下单相关实现
 2024-10-31 14:10:13 +08:00
GYJ f8797b0e79 Merge branch 'refs/heads/dev' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
 2024-10-31 11:25:14 +08:00
GYJ 5ef762f670 台桌统计导出数据处理tableId为null的问题 2024-10-31 11:20:00 +08:00
SongZhang f6b0055bdb fix: 订单列表获取修改 2024-10-31 11:12:13 +08:00
SongZhang d944a9cc82 fix: 就餐人数选择修改 2024-10-31 10:39:15 +08:00
SongZhang eaa08bd877 Merge remote-tracking branch 'origin/test' into test 2024-10-31 10:29:45 +08:00
SongZhang 921015488e fix: 退菜修改 2024-10-31 10:29:23 +08:00
Tankaikai 758e556975 Merge remote-tracking branch 'origin/test' into test 2024-10-31 10:28:53 +08:00
谭凯凯 8888c13083 积分模块相关接口 2024-10-31 10:28:47 +08:00
SongZhang 34460c0f0d fix: 退菜修改 2024-10-31 10:15:58 +08:00
SongZhang a9ea2cdc82 fix: 退菜修改 2024-10-31 10:01:26 +08:00
SongZhang ce93f7593d fix: 退菜修改 2024-10-31 09:55:16 +08:00
SongZhang ec3d76f73d fix: 退菜修改 2024-10-31 09:34:22 +08:00
GYJ c717d0f2c2 Merge branch 'refs/heads/gyj' into dev 2024-10-31 09:34:11 +08:00
GYJ b17636abbe 台桌统计数据导出修改 2024-10-31 09:33:01 +08:00
SongZhang 05dc070107 fix: 创建订单取餐码增加修复 2024-10-31 09:30:05 +08:00
SongZhang 1017b69a89 fix: 订单详情返回客座费信息 2024-10-30 18:28:41 +08:00
SongZhang b363044282 fix: 退款修改 2024-10-30 18:06:48 +08:00
SongZhang c1145538dc fix: 下单次数修复 2024-10-30 18:01:29 +08:00
SongZhang 31f20090e5 fix: 选择会员保存会员相关信息 2024-10-30 17:59:52 +08:00
SongZhang 6630141a99 fix: 选择会员保存会员相关信息 2024-10-30 17:48:24 +08:00
SongZhang 09872cd71b Merge branch 'refs/heads/dev' into test 2024-10-30 17:25:11 +08:00
SongZhang d21833b4b2 fix: 修改购物车修改 2024-10-30 17:24:39 +08:00
SongZhang f386405aaa fix: 外带下单次数修复 2024-10-30 17:11:39 +08:00
SongZhang a8d59c1308 Merge branch 'refs/heads/dev' into test 2024-10-30 17:06:36 +08:00
SongZhang 07990a0a96 fix: 打包赠送修改 2024-10-30 17:06:13 +08:00
SongZhang b80ad45a1b Merge branch 'refs/heads/dev' into test 2024-10-30 17:01:23 +08:00
SongZhang bae22532d1 Merge remote-tracking branch 'origin/dev' into dev 2024-10-30 16:59:05 +08:00
SongZhang bd08205426 fix: 打包赠送修改 2024-10-30 16:58:45 +08:00
SongZhang b4e5eda9f7 fix: 获取购物车修改 2024-10-30 16:04:15 +08:00
SongZhang 8ef801afa1 fix: 获取购物车修改 2024-10-30 16:00:46 +08:00
SongZhang 93845145f3 fix: 修复无台桌切换就餐模式购物车丢失 2024-10-30 15:51:45 +08:00
wangw b5b1ad8b18 副单位 2024-10-30 15:25:36 +08:00
wangw 40b63bff4d 副单位 2024-10-30 15:24:43 +08:00
wangw dcfb79c87a 耗材库存记录列表 默认值 2024-10-30 15:11:38 +08:00
SongZhang 019bf55598 Merge remote-tracking branch 'origin/test' into test 2024-10-30 15:04:39 +08:00
SongZhang 7c1415663d fix: 修复无台桌切换就餐模式购物车丢失 2024-10-30 15:04:17 +08:00
wangw 5cb7e9bdfb 销售统计 效率优化 2024-10-30 14:52:52 +08:00
SongZhang 5a90bfe202 Merge branch 'refs/heads/dev' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
 2024-10-30 14:40:54 +08:00
SongZhang 8bb27ab292 fix: 订单列表接口返回就餐类型字段 2024-10-30 14:18:01 +08:00
SongZhang 3f0329a7c5 fix: 无台桌退菜实现 2024-10-30 14:04:06 +08:00
SongZhang 6ec1e0ef7d Merge remote-tracking branch 'origin/dev' into dev 2024-10-29 17:19:07 +08:00
SongZhang 9d23c4d337 fix: 订单过期结束购物车状态 2024-10-29 17:18:58 +08:00
Tankaikai 3a00b85a02 Merge remote-tracking branch 'origin/dev' into test 2024-10-29 16:06:48 +08:00
谭凯凯 d5b0813c46 会员余额支付缺陷修复 2024-10-29 15:47:09 +08:00
谭凯凯 17cbff4228 会员余额支付缺陷修复 2024-10-29 15:16:34 +08:00
SongZhang d978abc2e1 Merge branch 'refs/heads/dev' into test 2024-10-29 15:11:00 +08:00
SongZhang 04fab9ef26 fix: 修稿储值卡支付保存的用户id和店铺会员id 2024-10-29 15:10:46 +08:00
SongZhang ad8c87d313 fix: 退款金额不准确修复 2024-10-29 15:02:21 +08:00
SongZhang 46be2c0f63 fix: 退款金额不准确修复 2024-10-29 14:54:52 +08:00
SongZhang 0afdccaa9e Merge remote-tracking branch 'origin/test' into test 2024-10-29 14:37:38 +08:00
SongZhang e79e527bfd Merge branch 'refs/heads/dev' into test 2024-10-29 14:37:22 +08:00
yijiegong ecfe7dc128 Merge branch 'gyj' into test 2024-10-29 14:12:24 +08:00
yijiegong edceabad0e Merge branch 'gyj' into dev 2024-10-29 14:11:35 +08:00
yijiegong 9f0bef5f52 TbUserInfoController 恢复 2024-10-29 14:11:17 +08:00
谭凯凯 264da3c5b3 积分模块相关接口 2024-10-29 09:56:41 +08:00
SongZhang 2ba232f149 chore: 正式端三方支付回调地址修改 2024-10-29 09:51:53 +08:00
SongZhang 365bb5cd5e chore: 正式端增加三方支付回调地址配置 2024-10-29 09:39:31 +08:00
SongZhang 35ccf243f1 fix: 储值卡支付不能退款修复 2024-10-29 09:34:34 +08:00
SongZhang fced36d732 fix: 无桌台删除菜品修复 2024-10-29 09:28:30 +08:00
SongZhang 3b9de3bd56 Merge remote-tracking branch 'origin/test' into test 2024-10-29 09:18:37 +08:00
SongZhang 46312d855c Merge branch 'refs/heads/dev' into test 2024-10-29 09:18:16 +08:00
SongZhang bc061518f5 fix: 退菜sql修复 2024-10-29 09:17:48 +08:00
谭凯凯 d54471ec3c 积分模块相关接口 2024-10-29 09:09:28 +08:00
SongZhang 267c24e16a fix: 代客下单折扣为空导致详情金额有误修复 2024-10-28 16:50:07 +08:00
SongZhang 9988723044 fix: 无桌台代客下单修改 2024-10-28 14:19:24 +08:00
SongZhang 7a9d226783 fix: 无台桌购物车为空创建订单报错 2024-10-26 17:54:04 +08:00
谭凯凯 7748367695 Pad点餐后台配置接口 2024-10-26 17:34:48 +08:00
谭凯凯 8ef1894a47 Pad点餐后台配置接口 2024-10-26 17:29:20 +08:00
Tankaikai 0e05d067a0 Merge remote-tracking branch 'origin/dev' into test 2024-10-26 17:27:52 +08:00
wangw 9207ebfd03 Merge branch 'ww' into test 2024-10-26 17:05:07 +08:00
wangw c7187fe1ab 优惠券 领取详情 以及 删除 2024-10-26 17:04:41 +08:00
SongZhang 3b2f2e4bbe fix: 餐位费退菜修复 2024-10-26 16:20:42 +08:00
SongZhang f75aae14a8 fix: 餐位费退菜修复 2024-10-26 16:14:12 +08:00
SongZhang ce94bd7e4e feat: 订单列表返回餐位费信息 2024-10-26 13:51:07 +08:00
SongZhang 763014f65a feat: 订单列表返回餐位费信息 2024-10-26 13:35:04 +08:00
wangw 24387973dc Merge branch 'ww' into test 2024-10-26 11:41:13 +08:00
wangw 25ded0b4f8 优惠券 类型筛选 2024-10-26 11:40:58 +08:00
wangw d805b3d729 Merge branch 'ww' into test 2024-10-26 11:25:03 +08:00
wangw 065772c2c3 优惠券 删除 2024-10-26 11:23:50 +08:00
SongZhang e19535d71e feat: 订单详情返回是否打包赠送字段 2024-10-26 09:55:33 +08:00
SongZhang e9956b5336 fix: 无台桌提示需要餐位费修复 2024-10-25 18:10:45 +08:00
SongZhang 42563c3ce0 fix: 无台桌下单报错修复 2024-10-25 17:36:40 +08:00
SongZhang 0f097f7d86 fix: 无台桌下单报错修复 2024-10-25 17:27:51 +08:00
SongZhang 96ecaa840e feat: 不传递桌码不修改人数 2024-10-25 16:58:57 +08:00
SongZhang 61b80c5a85 feat：台桌列表筛选未绑定的 2024-10-25 15:54:31 +08:00
SongZhang 34b7c23392 fix: 修复台桌购物车数量统计不正确问题 2024-10-25 15:42:42 +08:00
SongZhang 201210202f fix: 修复切换台桌取餐码未更新问题 2024-10-25 15:34:06 +08:00
SongZhang f0632942d5 fix: 修复回调地址 修复切换台桌取餐码未更新问题 2024-10-25 15:02:33 +08:00
SongZhang b49b7ef8af fix: 修复无台桌商品无法删除问题 2024-10-25 11:43:01 +08:00
SongZhang dbf29b5e38 fix: 修复选择台桌购物车未查询出数据问题 2024-10-25 11:39:34 +08:00
wangw 7c3fd4dfe0 Merge branch 'ww' into test 2024-10-25 11:22:23 +08:00
wangw 84a2007b26 优惠券使用 以及 退券 2024-10-25 11:19:25 +08:00
SongZhang 35ad186a9d perf: 台桌接口增加状态查询 选择台桌支持清空原有购物车 2024-10-25 11:02:39 +08:00
SongZhang 56d8195450 perf: 商品接口增加typeEnum 2024-10-25 10:36:43 +08:00
SongZhang 4ba7c7c4e7 Merge remote-tracking branch 'origin/dev' into dev 2024-10-25 10:34:28 +08:00
SongZhang a9f1649749 perf: 更改回调地址 商品接口增加typeEnum 2024-10-25 10:34:17 +08:00
wangw 6b75ca5ff9 商品 价格字段 2024-10-25 10:01:47 +08:00
谭凯凯 edfaaa8c44 完成新增会员接口开发 2024-10-25 10:01:47 +08:00
SongZhang e2a624e653 perf: 台桌列表增加分页 2024-10-25 09:57:08 +08:00
wangw fa85c92d08 Merge branch 'ww' into test 2024-10-24 18:08:27 +08:00
wangw b1e7095357 订单可用优惠券 /shop/storage/find 2024-10-24 18:06:44 +08:00
Tankaikai 25f856f11f Merge remote-tracking branch 'origin/dev' into test 2024-10-24 16:41:46 +08:00
谭凯凯 d2982d3528 完成新增会员接口开发 2024-10-24 16:41:03 +08:00
SongZhang 537b9b408b 新增桌码绑定接口 2024-10-24 16:29:08 +08:00
SongZhang 6c2c12d95d Merge remote-tracking branch 'refs/remotes/origin/dev' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpShopTableService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpShopTableServiceImpl.java
 2024-10-24 15:48:55 +08:00
SongZhang 4ec0f04cc5 台桌列表未绑定台桌状态为unbind 2024-10-24 15:47:24 +08:00
wangw 473a8eaca5 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/resources/mapper/TbActivateMapper.xml
 2024-10-24 15:29:05 +08:00
wangw 824985a6ad 多余内容删除 
活动重写
优惠券重写
店铺新增字段
 2024-10-24 15:28:15 +08:00
SongZhang d15b17729c 新增台桌状态接口 2024-10-24 15:20:14 +08:00
SongZhang 743f59d4a3 开启库存校验库存数量 2024-10-24 14:12:40 +08:00
SongZhang 62a931145b 无桌台添加购物车修改 2024-10-24 13:25:54 +08:00
SongZhang 01efaac3ab 增加无桌台就餐 2024-10-24 11:43:46 +08:00
SongZhang 94e6794255 客座费选择接口修改 2024-10-24 11:43:46 +08:00
SongZhang b356b3594d 创建订单修改餐位费校验 2024-10-24 11:43:44 +08:00
SongZhang 6f7459604c 创建订单修改餐位费校验 2024-10-24 11:43:42 +08:00
SongZhang eaace1d576 创建订单修改餐位费校验 2024-10-24 11:43:41 +08:00
SongZhang db0e01ecf7 增加无桌台就餐 2024-10-24 11:42:37 +08:00
SongZhang bc90c47f2c 客座费选择接口修改 2024-10-24 09:43:05 +08:00
SongZhang d2eae1734e 创建订单修改餐位费校验 2024-10-24 09:33:42 +08:00
SongZhang 4cdc0b5738 创建订单修改餐位费校验 2024-10-24 09:31:35 +08:00
SongZhang b2f01ed453 创建订单修改餐位费校验 2024-10-24 09:24:58 +08:00
SongZhang d99771f8e7 无台桌模式选择台桌接口修改 2024-10-24 09:07:48 +08:00
SongZhang 24a80cb24a 取餐码获取修改 2024-10-24 09:07:45 +08:00
SongZhang 84d967ca6b 退款校验退款金额 2024-10-24 09:07:43 +08:00
SongZhang bc7d2430ba 修改订单详情餐位费返回结构 2024-10-24 09:07:43 +08:00
SongZhang daccee5d04 修改订单详情餐位费返回结构 2024-10-24 09:07:42 +08:00
SongZhang d53762e777 多次退款累加退款金额 2024-10-24 09:07:41 +08:00
SongZhang 47735d6f4b 订单支持多次退款 2024-10-24 09:07:39 +08:00
SongZhang c2e481cd15 霸王餐查询修改接口 2024-10-24 09:07:38 +08:00
SongZhang b0898330c9 赠送商品打包费不免除 2024-10-24 09:07:37 +08:00
SongZhang 8053c84331 退菜修改 2024-10-24 09:07:36 +08:00
SongZhang c17326ffbe 无台桌模式选择台桌接口修改 2024-10-23 17:32:45 +08:00
SongZhang a77c829287 Merge remote-tracking branch 'origin/test' into test 2024-10-23 16:49:59 +08:00
SongZhang e663ebc8b9 取餐码获取修改 2024-10-23 16:49:47 +08:00
Tankaikai 8e5504da6c Merge remote-tracking branch 'origin/test' into test 2024-10-23 16:34:43 +08:00
谭凯凯 bc587c196d Pad点餐后台配置接口 2024-10-23 16:34:32 +08:00
SongZhang 46ec8d47ff Merge remote-tracking branch 'origin/test' into test 2024-10-23 15:07:03 +08:00
SongZhang 2efd81be50 退款校验退款金额 2024-10-23 15:06:51 +08:00
Tankaikai d9859647b4 Merge remote-tracking branch 'origin/test' into test 2024-10-23 14:52:18 +08:00
谭凯凯 42fcd08d00 Pad点餐后台配置接口 2024-10-23 14:51:21 +08:00
wangw 0c7d9a7c7e 销量统计 时间筛选 2024-10-23 13:47:14 +08:00
SongZhang 82f7bd890e 修改订单详情餐位费返回结构 2024-10-23 11:12:31 +08:00
SongZhang 4d61647e0d 修改订单详情餐位费返回结构 2024-10-23 11:11:40 +08:00
SongZhang f074f45f86 多次退款累加退款金额 2024-10-23 10:52:55 +08:00
SongZhang 5ce67b4014 订单支持多次退款 2024-10-23 10:22:40 +08:00
SongZhang 8fe78a48fd 霸王餐查询修改接口 2024-10-22 17:21:30 +08:00
wangw 94b4954c37 店铺配置 
店铺装修
 2024-10-22 15:36:10 +08:00
SongZhang 351b53b432 赠送商品打包费不免除 2024-10-22 14:39:36 +08:00
SongZhang c7f68b363e Merge remote-tracking branch 'origin/test' into test 2024-10-22 09:32:08 +08:00
SongZhang d1c0708526 退菜修改 2024-10-22 09:31:58 +08:00
谭凯凯 ddc95cf170 发送订阅消息增加token 2024-10-21 15:42:11 +08:00
谭凯凯 6b4397dec5 发送订阅消息增加token 2024-10-21 15:38:24 +08:00
谭凯凯 0d79a23ad7 发送订阅消息增加token 2024-10-21 15:09:20 +08:00
Tankaikai 843408b81e Merge remote-tracking branch 'origin/test' into test 2024-10-21 13:57:03 +08:00
谭凯凯 c5da6f1ca1 发送订阅消息增加token 2024-10-21 13:56:57 +08:00
SongZhang 844156341c Merge remote-tracking branch 'origin/test' into test 2024-10-21 13:49:49 +08:00
SongZhang 56cf10750d 打印报错 fix 2024-10-21 13:49:27 +08:00
谭凯凯 af1d4faa03 发送订阅消息增加token 2024-10-21 11:06:11 +08:00
谭凯凯 7425f0a4d5 延迟发送订阅消息 2024-10-21 10:42:08 +08:00
wangw 8aa6b1e56b Merge branch 'ww' into test 2024-10-21 10:16:13 +08:00
wangw 3dc3605097 耗材 虚拟列 不做修改 2024-10-21 10:15:36 +08:00
wangw 888821c0e1 Merge branch 'ww' into test 2024-10-21 09:49:16 +08:00
wangw 4ced0336e4 耗材 虚拟列 不做修改 2024-10-21 09:48:56 +08:00
SongZhang b12f6ae823 不能取消赠送fix 2024-10-18 17:27:06 +08:00
SongZhang fcaf1f230b 订单列表支持订单号和商品名模糊查询 2024-10-18 17:18:39 +08:00
wangw b589faefab Merge branch 'ww' into test 2024-10-18 16:36:43 +08:00
wangw 29292c54ed 耗材列表 排序 2024-10-18 16:36:06 +08:00
SongZhang 87de3f891e Merge remote-tracking branch 'origin/test' into test 2024-10-18 15:57:39 +08:00
SongZhang e5224d6bc6 退菜后订单金额不对修复 2024-10-18 15:57:29 +08:00
wangw 45cf1afa48 Merge branch 'ww' into test 2024-10-18 15:29:28 +08:00
wangw 8b49d17982 员工账号校验 
耗材出入库 备注
 2024-10-18 15:29:00 +08:00
wangw 9129a114df Merge branch 'ww' into test 2024-10-18 13:31:41 +08:00
wangw 31e21e4705 耗材 多余内容删除 2024-10-18 13:31:17 +08:00
wangw 0dcc46d00d Merge branch 'ww' into test 2024-10-17 10:42:45 +08:00
wangw 312c9cc1be 耗材列表 关联 商品 2024-10-17 10:42:12 +08:00
wangw 973796f491 Merge branch 'ww' into test 2024-10-17 10:17:32 +08:00
wangw 0f7502df06 耗材列表 2024-10-17 10:17:06 +08:00
wangw dc9859b31d Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
 2024-10-17 09:57:59 +08:00
wangw 30f21e1dd3 排序 2024-10-17 09:56:38 +08:00
SongZhang e2a127c0d0 Merge remote-tracking branch 'origin/test' into test 2024-10-17 09:13:18 +08:00
SongZhang 519bedfc7c detail价格计算折扣 2024-10-17 09:12:58 +08:00
wangw d79f737665 耗材列表 2024-10-16 17:56:04 +08:00
wangw e04281d8b9 耗材列表 2024-10-16 17:54:16 +08:00
SongZhang eff2d6d630 购物车修改接口 fix 2024-10-16 15:22:32 +08:00
SongZhang 54acf2a0f5 打包赠送允许不传递值 2024-10-16 15:11:53 +08:00
SongZhang 483af5462d 购物车获取修改 2024-10-16 14:27:27 +08:00
SongZhang 0417d122fb 退单接口修改 2024-10-16 14:14:43 +08:00
SongZhang 74a4514c3c 退单接口修改 购物车查询逻辑修改 2024-10-16 14:13:11 +08:00
wangw 8931ce98fa Merge branch 'ww' into test 2024-10-15 18:05:24 +08:00
wangw cd4008d824 报损 备注问题 2024-10-15 17:59:58 +08:00
wangw 03e0793e59 Merge branch 'ww' into test 2024-10-15 17:43:59 +08:00
wangw ffc2568b98 报损数量问题 2024-10-15 17:43:40 +08:00
wangw 7de19ffb1f Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
 2024-10-15 15:51:45 +08:00
wangw c105c8d0ff 实体类 2024-10-15 15:51:05 +08:00
wangw 9e8d74845a Merge branch 'ww' into test 2024-10-15 14:33:11 +08:00
wangw a6a8c330ae 耗材 判断记录 2024-10-15 14:32:30 +08:00
SongZhang ef7f4ebb8e Merge remote-tracking branch 'origin/test' into test 2024-10-15 14:07:12 +08:00
SongZhang 1a8a15193e 修改接口支持打包赠送 2024-10-15 14:07:01 +08:00
wangw 1ed5338032 Merge branch 'ww' into test 2024-10-15 13:25:09 +08:00