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
张松 14a2b5884b fix: 创建订单会员价计算有误修复 2024-11-06 16:20:35 +08:00
谭凯凯 920219f978 交班bug修复 2024-11-06 16:15:01 +08:00
张松 090e5d320e fix: 创建订单会员价计算有误修复 2024-11-06 15:36:57 +08:00
张松 8d5642c07a fix: 创建订单会员价计算有误修复 2024-11-06 15:35:34 +08:00
张松 5dd35a9572 fix: 创建订单会员价计算有误修复 2024-11-06 15:28:49 +08:00
张松 1f3f3f1e04 fix: 创建订单会员价计算有误修复 2024-11-06 15:19:48 +08:00
张松 4ca85ef425 fix: 创建订单会员价计算有误修复 2024-11-06 15:08:01 +08:00
张松 e0b67cb3cd Merge remote-tracking branch 'origin/test' into test 2024-11-06 13:52:59 +08:00
张松 5118027b9b feat: 增加详情会员价 2024-11-06 13:52:45 +08:00
Tankaikai f2ca18953b Merge remote-tracking branch 'origin/test' into test 2024-11-06 11:26:43 +08:00
谭凯凯 48948eb265 供应商出入库记录 2024-11-06 11:26:37 +08:00
张松 c2f94d0409 feat: 增加详情会员价 2024-11-06 11:14:18 +08:00
张松 b2823c5966 feat: 优惠券返回名称字段 2024-11-06 10:42:32 +08:00
张松 4982d22e5a feat: 优惠券返回名称字段 2024-11-06 10:41:18 +08:00
张松 eee972193c Merge remote-tracking branch 'origin/test' into test 2024-11-06 10:21:40 +08:00
张松 de3b435637 feat: 增加会员价 2024-11-06 10:21:28 +08:00
Tankaikai a37fd2f9ef Merge remote-tracking branch 'origin/test' into test 2024-11-06 10:02:00 +08:00
谭凯凯 cd3624027c 供应商出入库记录 2024-11-06 10:01:54 +08:00
SongZhang b583d01312 fix: 优惠券折扣修改 2024-11-05 17:07:20 +08:00
wangw 648bd55e7a 空指针 2024-11-05 15:57:04 +08:00
谭凯凯 04f844cf93 积分模块相关接口 2024-11-05 15:39:48 +08:00
谭凯凯 763be9bc49 积分模块相关接口 2024-11-05 15:18:17 +08:00
谭凯凯 adb0e978d0 积分模块相关接口 2024-11-05 15:01:53 +08:00
谭凯凯 029213e068 积分模块相关接口 2024-11-05 09:39:15 +08:00
Tankaikai c69cc065a6 Merge remote-tracking branch 'origin/test' into test 2024-11-05 09:31:40 +08:00
谭凯凯 54291604bd 积分模块相关接口 2024-11-05 09:31:32 +08:00
wangw 5d77e0c3d5 多余字段 2024-11-04 17:45:45 +08:00
SongZhang b45709cca1 fix: 会员修改接口修改 2024-11-04 14:33:33 +08:00
SongZhang 5406aedb76 fix: 会员修改接口修改 2024-11-04 14:27:41 +08:00
SongZhang 9b1f802867 fix: 优惠券查询修改 2024-11-04 13:56:19 +08:00
SongZhang 062a0cc2f4 fix: 选择会员修改 2024-11-04 13:37:20 +08:00
SongZhang b401f23ec4 feat: 新增支付积分优惠券支持 2024-11-04 13:26:31 +08:00
SongZhang 7c572d7384 feat: 新增支付积分优惠券支持 2024-11-04 11:12:27 +08:00
wangw 8aad5da104 默认单位 2024-11-04 10:53:42 +08:00
wangw 6f6085343f 默认单位 2024-11-04 10:27:23 +08:00
SongZhang 00e7b35926 Merge remote-tracking branch 'origin/test' into test 2024-11-01 16:54:37 +08:00
SongZhang 086eb3523b 1. 订单表修改 2024-11-01 16:51:51 +08:00
wangw cdeb5e003c 多余注解 2024-11-01 13:46:10 +08:00
wangw 97a8a5472d 多余代码删除 环境配置 2024-11-01 09:40:03 +08:00
Tankaikai c07f374ed7 Merge remote-tracking branch 'origin/test' into test 2024-10-31 15:24:39 +08:00
谭凯凯 2e9c25d8a8 积分模块相关接口 2024-10-31 15:24:33 +08:00
wangw 5eab49b844 盘点出入库判断 2024-10-31 15:10:56 +08:00
Tankaikai 7691a967b4 Merge remote-tracking branch 'origin/test' into test 2024-10-31 14:47:48 +08:00
谭凯凯 362c737c4b 积分模块相关接口 2024-10-31 14:47:43 +08:00
GYJ bfa30e0b72 Merge remote-tracking branch 'origin/test' into test 2024-10-31 14:43:47 +08:00
GYJ 0186055934 Merge branch 'refs/heads/dev' into test 2024-10-31 14:43:34 +08:00
GYJ c6aba2caa9 台桌统计导出数据处理订单筛选bug 2024-10-31 14:42:54 +08:00
SongZhang 1f412710e7 1. 取消会员接口修改 2024-10-31 14:23:07 +08:00
SongZhang 479a286040 1. 取消会员接口修改 2024-10-31 14:18:27 +08:00
SongZhang 80d990de17 1. 取消会员接口修改 2024-10-31 14:17:24 +08:00
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