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
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
wangw 01405b33e9 删除商品 2024-10-15 13:24:40 +08:00
wangw 544a251a67 Merge branch 'ww' into test 2024-10-15 10:06:33 +08:00
wangw f8c763ad9d 商品修改库存 记录 2024-10-15 10:06:02 +08:00
wangw fdf551358f 添加商品 规格丢失问题 2024-10-14 16:36:42 +08:00
wangw 192605ae90 添加商品 规格丢失问题 2024-10-14 16:35:09 +08:00
SongZhang 5e8e6661b9 Merge remote-tracking branch 'origin/test' into test 2024-10-14 16:28:53 +08:00
SongZhang 4c19b6c9d3 取餐码获取为null修复 2024-10-14 16:28:37 +08:00
SongZhang 347431f199 取餐码获取为null修复 2024-10-14 16:28:08 +08:00
wangw da9a1dc3b8 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
 2024-10-14 15:30:07 +08:00
wangw 68fac45b7a 销售统计 2024-10-14 15:29:23 +08:00
wangw f87a2747bc Merge branch 'ww' into test 2024-10-14 15:22:18 +08:00
wangw 2d03914963 分类 列表 数据问题 
销售统计
 2024-10-14 15:20:35 +08:00
wangw bf5e5ec7dd Merge branch 'ww' into test 2024-10-14 14:56:57 +08:00
wangw 5468fa56de 分类 列表 数据问题 2024-10-14 14:55:09 +08:00
SongZhang 1cc7188488 赠送商品单独拎出 2024-10-14 13:40:25 +08:00
SongZhang a9d92e98c5 退菜fix 2024-10-14 13:26:56 +08:00
SongZhang f01c6c0e3c Merge remote-tracking branch 'origin/test' into test 2024-10-14 10:30:00 +08:00
SongZhang 5a2c3f4208 客座费获取修改 2024-10-14 10:29:51 +08:00
谭凯凯 e659d1f420 调整打印机配置参数 2024-10-14 10:24:11 +08:00
SongZhang afbfde52bb 打印延迟3s 防止事务未提交 2024-10-14 10:15:41 +08:00
SongZhang 72dca1d7c4 Merge remote-tracking branch 'origin/test' into test 2024-10-14 10:03:24 +08:00
SongZhang c88b838e88 退款修改 2024-10-14 10:03:03 +08:00
wangw 958f1cfc5e Merge branch 'ww' into test 2024-10-14 09:14:15 +08:00
wangw cab483a7b9 耗材记录 2024-10-14 09:13:51 +08:00
wangw fac0e9b046 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
 2024-10-12 18:28:17 +08:00
wangw f120867e35 耗材记录 2024-10-12 18:26:54 +08:00
wangw 527b5f059c 耗材记录 2024-10-12 18:17:04 +08:00
wangw c918f2e5ce 耗材记录 2024-10-12 18:15:46 +08:00
SongZhang 2553a3605d 退款不更改购物车状态 2024-10-12 18:14:29 +08:00
SongZhang d3cac60125 打包费 2024-10-12 17:51:37 +08:00
SongZhang a8ab3706dd 台桌状态修改 2024-10-12 16:39:30 +08:00
SongZhang 10c11aef8f 已下单商品支持退单 2024-10-12 16:27:29 +08:00
SongZhang 18c1367856 购物车获取修改 2024-10-12 16:10:57 +08:00
SongZhang 10b2ae2537 Merge remote-tracking branch 'origin/test' into test 2024-10-12 15:58:08 +08:00
SongZhang 424082ead3 外带结束购物车状态 2024-10-12 15:57:49 +08:00
wangw 7c7976c197 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
 2024-10-12 15:12:07 +08:00
wangw 1945d3f906 商品共享库存字段 2024-10-12 15:11:00 +08:00
SongZhang cc9cfceed4 退款金额 2024-10-12 14:41:21 +08:00
SongZhang 1c04a44278 外带不校验餐位费 2024-10-12 14:36:35 +08:00
SongZhang 00f15ef7ee Merge remote-tracking branch 'origin/test' into test 2024-10-12 14:33:09 +08:00
SongZhang 6bccfb8036 退款金额展示有误fix 2024-10-12 14:32:58 +08:00
wangw e86a383c8c 未记录商品销售的bug 2024-10-12 14:16:59 +08:00
wangw b0140e7b23 Merge branch 'ww' into test 2024-10-12 14:16:44 +08:00
wangw 70abb276bc 未记录商品销售的bug 2024-10-12 14:16:24 +08:00
SongZhang ece7e3eb0e Merge remote-tracking branch 'origin/test' into test 2024-10-12 10:46:33 +08:00
SongZhang 90505fd354 订单创建失败不打印菜品票 2024-10-12 10:46:19 +08:00
Tankaikai d2ed566348 Merge remote-tracking branch 'origin/test' into test 2024-10-12 10:44:17 +08:00
谭凯凯 0ab7e04fc8 适配打印机新参数 2024-10-12 10:44:10 +08:00
SongZhang 7379b1d85d 退菜同步修改订单金额 2024-10-12 10:20:02 +08:00
SongZhang 608fb72c78 订单添加支付时间 2024-10-12 09:15:30 +08:00
SongZhang e1a5e491e5 订单查询修改 2024-10-11 18:17:49 +08:00
SongZhang adceb75c5c Merge remote-tracking branch 'origin/test' into test 2024-10-11 17:09:34 +08:00
SongZhang d335268a84 先付费模式创建订单之后清空台桌状态 2024-10-11 17:09:04 +08:00
wangw 7c7a42d58d 商品id 2024-10-11 16:56:43 +08:00
wangw a0b1c60896 商品id 2024-10-11 16:56:11 +08:00
SongZhang 6f50e1e134 Merge remote-tracking branch 'origin/test' into test 2024-10-11 16:42:58 +08:00
SongZhang 857502e26e 先付费模式创建订单之后结束购物车状态 2024-10-11 16:42:35 +08:00
wangw 2e374dcda7 Merge branch 'ww' into test 2024-10-11 15:58:43 +08:00
wangw 080c426caa 耗材记录 排序报错 2024-10-11 15:58:21 +08:00
wangw 4f14f8c914 Merge branch 'ww' into test 2024-10-11 15:47:52 +08:00
wangw 5a2a18992a 耗材记录 报错 2024-10-11 15:47:20 +08:00
wangw c8b2c5903a Merge branch 'ww' into test 2024-10-11 15:41:26 +08:00
wangw e8a7ab070b 耗材列表 
绑定耗材
 2024-10-11 15:40:15 +08:00
wangw 9fc2f9e702 商品列表 排序 报损 操作人 2024-10-11 14:47:04 +08:00
SongZhang 4d0bb753c4 Merge remote-tracking branch 'origin/test' into test 2024-10-11 14:46:40 +08:00
SongZhang e74fc42cf7 订单查询接口修改 2024-10-11 14:46:19 +08:00
wangw ee59a73d02 商品列表 排序 报损 操作人 2024-10-11 14:46:13 +08:00
谭凯凯 b7e9f74912 店铺管理-店铺配置：打印机设置相关接口 2024-10-11 14:36:34 +08:00
SongZhang 713ff653ad 库存改为商品级库存 2024-10-11 14:14:10 +08:00
SongZhang cc4d34b6fe 支付根据状态查询 2024-10-11 14:12:27 +08:00
SongZhang fb7c22aacc 退款接口修改 2024-10-11 13:48:31 +08:00
SongZhang c49088def2 下单校验餐位费 2024-10-11 11:45:41 +08:00
SongZhang 3b182796ab orderDetail状态未流转fix 2024-10-11 11:27:01 +08:00
SongZhang 838265d73f Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:54:29 +08:00
SongZhang 4cd6d6742c 退款订单添加退款备注 2024-10-11 10:54:17 +08:00
wangw 3e3f8528f3 通用单位 2024-10-11 10:43:25 +08:00
Tankaikai 350012f368 Merge remote-tracking branch 'origin/test' into test 2024-10-11 10:42:42 +08:00
谭凯凯 12a5466e26 店铺管理-店铺配置：打印机设置相关接口 2024-10-11 10:42:34 +08:00
wangw 4d7e108f83 通用单位 2024-10-11 10:42:23 +08:00
wangw 66f1fb3da8 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
 2024-10-11 09:45:35 +08:00
wangw 846cbef3da 初始化单位，统计 关于客坐费没有规格问题 2024-10-11 09:44:18 +08:00
谭凯凯 8c8b49adb2 店铺管理-店铺配置：打印机设置相关接口 2024-10-11 09:38:41 +08:00
SongZhang 504fec5011 Merge remote-tracking branch 'origin/test' into test 2024-10-10 16:58:01 +08:00
SongZhang 42c1c1da3f 扫码支付回调修改 2024-10-10 16:57:51 +08:00
wangw cee923159c Merge branch 'ww' into test 2024-10-10 16:20:54 +08:00
wangw 70d26b5c78 新增商品 修改商品 价格问题 2024-10-10 16:20:27 +08:00
wangw 58ef3ae818 Merge branch 'ww' into test 2024-10-10 16:04:43 +08:00
wangw 4b28ad0f1c 耗材绑定关系 2024-10-10 16:02:23 +08:00
SongZhang 349ddf38a2 Merge remote-tracking branch 'origin/test' into test 2024-10-10 14:47:10 +08:00
SongZhang 3533a1c90e 订单详情返回餐位费信息 2024-10-10 14:46:53 +08:00
Tankaikai f25141a495 店铺小票打印记录查询 2024-10-09 18:21:38 +08:00
SongZhang fac61ff581 Merge remote-tracking branch 'origin/test' into test 2024-10-09 14:55:08 +08:00
SongZhang fece3c274e 取餐码获取修改 
退款接口完善
 2024-10-09 14:54:56 +08:00
谭凯凯 a0d9a1f591 打印消息队列新增透传参数 2024-10-09 14:48:11 +08:00
SongZhang 37dc169607 支付回调测试 2024-10-09 14:35:00 +08:00
SongZhang 77f193a06b 支付回调测试 2024-10-09 14:34:52 +08:00
SongZhang 4edaecf89c Merge remote-tracking branch 'origin/test' into test 2024-10-09 14:27:29 +08:00
SongZhang 27ffc4fa66 支付回调测试 2024-10-09 14:27:20 +08:00
Tankaikai 27c0c008d1 打印消息队列新增透传参数 2024-10-09 14:21:05 +08:00
SongZhang 680c24d2a2 台桌返回当前订单取餐码 2024-10-09 14:10:38 +08:00
SongZhang 99f372bf46 支付回调测试 2024-10-09 10:30:42 +08:00
SongZhang b6792ccf99 Merge remote-tracking branch 'origin/test' into test 2024-10-09 09:56:42 +08:00
SongZhang 9388c7de3a 支付回调测试 2024-10-09 09:56:32 +08:00
wangw bd21ba9ae8 Merge branch 'ww' into test 2024-10-09 09:35:51 +08:00
wangw 105ccd7e3f 商品列表 统计 sql问题 2024-10-09 09:34:54 +08:00
wangw 9f9355af39 Merge branch 'ww' into test 2024-10-08 18:02:02 +08:00
wangw 772c827118 商品列表 统计 sql问题 2024-10-08 18:01:06 +08:00
wangw 548c3a1940 Merge branch 'ww' into test 2024-10-08 17:49:44 +08:00
wangw d855a7eeac 商品列表 统计 2024-10-08 17:48:42 +08:00
SongZhang eb6e8845a0 Merge remote-tracking branch 'origin/test' into test 2024-10-08 17:15:55 +08:00
SongZhang 10f17d521e 支付回调测试 2024-10-08 17:15:41 +08:00
wangw e9de90557e Merge branch 'ww' into test 2024-10-08 16:28:57 +08:00
wangw 52656b40b9 商品列表 post 请求 2024-10-08 16:27:57 +08:00
wangw b20996355c Merge branch 'ww' into test 2024-10-08 16:16:19 +08:00
wangw 12cc56aada 商品列表v2改为post 
统计处理空值
绑定相同耗材 提示
 2024-10-08 16:14:09 +08:00
wangw 1a9310ef83 库存警戒值 
日志记录
 2024-10-08 15:28:31 +08:00
wangw e4a03e583b 库存警戒值 
日志记录
 2024-10-08 15:27:41 +08:00
SongZhang b9cce3bdf1 挂起订单取消挂起失败fix 2024-10-08 15:20:43 +08:00
SongZhang e7ca92eaaf 排队取号，取号完成无法取号fix 2024-10-08 14:36:45 +08:00
SongZhang 780fce1416 Merge remote-tracking branch 'origin/test' into test 2024-10-08 14:28:12 +08:00
SongZhang 79d15b5c4e 修改全局参数校验异常处理器逻辑 2024-10-08 14:28:02 +08:00
yijiegong 81dce3ea75 Merge branch 'gyj' into test 2024-10-08 13:50:02 +08:00
yijiegong 58a74d1b29 conInfoId 字段名 2024-10-08 13:49:26 +08:00
wangw facfa94973 库存警戒值 2024-10-08 13:43:02 +08:00
wangw 3c2f705bbb Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
 2024-10-08 13:41:18 +08:00
wangw ca3b16c677 库存警戒值 2024-10-08 13:34:05 +08:00
wangw 8c69aa7474 Merge branch 'ww' into test 2024-10-08 13:25:18 +08:00
wangw 869d14f158 商品编辑 修改状态日志记录 
快捷修改接口 日志记录 商品Id
库存警戒值
/api/summary/productSaleDate 商品销售 时间顺序
 2024-10-08 13:24:03 +08:00
SongZhang f703a40903 退款接口实现 2024-10-08 10:55:08 +08:00
SongZhang fbb2be3755 退款接口实现 2024-10-08 10:51:24 +08:00
SongZhang f3539d1899 退款接口实现 2024-10-08 10:39:31 +08:00
SongZhang ba9482c4f6 Merge remote-tracking branch 'origin/test' into test 2024-10-08 09:27:03 +08:00
SongZhang 21a8fd517e 微信扫码支付报错fix 2024-10-08 09:26:44 +08:00
wangw e838459a1b Merge branch 'ww' into test 2024-09-29 17:52:45 +08:00
wangw f16f23ab84 商品 餐位费 不计 2024-09-29 17:52:19 +08:00
SongZhang 79e99e78a5 修改购物车修改 2024-09-29 11:40:31 +08:00
SongZhang 4ae309b5c5 Merge remote-tracking branch 'origin/test' into test 2024-09-29 11:35:35 +08:00
SongZhang 655383fd02 退款接口 2024-09-29 11:35:22 +08:00
wangw 07c9cb349d Merge branch 'ww' into test 2024-09-29 10:59:30 +08:00
wangw e28cb5d1f5 营业板块 翻台率 2024-09-29 10:57:27 +08:00
SongZhang c5d68ffffc 修改会员点单信息 2024-09-29 10:51:10 +08:00
SongZhang 1fa1921735 修改会员点单信息 2024-09-29 10:42:32 +08:00
SongZhang 4c56736535 Merge remote-tracking branch 'origin/test' into test 2024-09-29 10:40:52 +08:00
SongZhang 185b50a84e 修改会员点单信息 2024-09-29 10:40:42 +08:00
wangw 45907f107d Merge branch 'ww' into test 2024-09-29 10:30:23 +08:00
wangw bfb9f82659 营业板块 2024-09-29 10:29:55 +08:00
wangw 66c28248b7 Merge branch 'ww' into test 2024-09-29 10:04:28 +08:00
wangw 08f01e04ea 销售趋势柱状图 左下 2024-09-29 10:01:54 +08:00
SongZhang 29d09abd5f 退款相关实现 
台桌列表获取报错fix
 2024-09-29 09:55:37 +08:00
SongZhang c2ff66d937 Merge remote-tracking branch 'origin/test' into test 2024-09-29 09:55:31 +08:00
SongZhang 2186cd5a04 退款相关实现 
台桌列表获取报错fix
 2024-09-29 09:55:20 +08:00
Tankaikai 3c5c0f7f47 Merge branch 'tkk' into test 2024-09-29 09:42:03 +08:00
谭凯凯 ae1a748ef2 移除alipayAppId、alipayAppToken 2024-09-29 09:41:31 +08:00
wangw 4e14710e3d Merge branch 'ww' into test 2024-09-29 09:30:39 +08:00
wangw d1d42e8fdf 数据统计 销售趋势 2024-09-29 09:29:01 +08:00
SongZhang ffe39b3113 Merge remote-tracking branch 'origin/test' into test 2024-09-28 16:14:46 +08:00
SongZhang 84acdd0161 选择人数添加锁 2024-09-28 16:14:30 +08:00
wangw e36fb3f55e Merge branch 'ww' into test 2024-09-28 14:56:09 +08:00
wangw 29277ec4eb 报损 返回信息 2024-09-28 14:55:49 +08:00
wangw 7fbabbfeec Merge branch 'ww' into test 2024-09-28 14:43:08 +08:00
wangw dfcd29c738 商品报损 状态码 2024-09-28 14:42:44 +08:00
wangw a8f7d019c9 Merge branch 'ww' into test 2024-09-28 14:13:55 +08:00
wangw 58b25c7e0f 商品报损 2024-09-28 14:13:39 +08:00
wangw d785bd7fa8 Merge branch 'ww' into test 2024-09-28 11:21:29 +08:00
SongZhang a4ce1f0299 票据打印简化 2024-09-28 11:00:13 +08:00
wangw 6973d62dd6 保存库存 报错问题 2024-09-28 10:51:35 +08:00
SongZhang c763257ea0 票据打印简化 2024-09-28 10:45:42 +08:00
SongZhang 083f7fedcb 票据打印简化 2024-09-28 10:40:12 +08:00
SongZhang b1835e370d 删除购物车修改 2024-09-28 09:54:26 +08:00
SongZhang 76264b379a 创建订单修改 2024-09-28 09:45:07 +08:00
SongZhang 70291911a6 加入购物车修改 2024-09-28 09:41:17 +08:00
SongZhang 492fa159b9 加入购物车修改 2024-09-28 09:31:30 +08:00
SongZhang 2eaa98a4bc 加入购物车修改 2024-09-28 09:20:13 +08:00
SongZhang b50e76c04e 加入购物车修改 2024-09-28 09:15:30 +08:00
SongZhang 96f81b1b69 Merge remote-tracking branch 'origin/test' into test 2024-09-27 18:00:42 +08:00
SongZhang f7663fa62c 就餐模式切换修改 2024-09-27 18:00:20 +08:00
Tankaikai c24207bce4 Merge branch 'tkk' into test 2024-09-27 17:53:45 +08:00
谭凯凯 1add18e7dd 店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项 2024-09-27 17:52:55 +08:00
SongZhang 808e0a43bd Merge remote-tracking branch 'origin/test' into test 2024-09-27 17:42:26 +08:00
SongZhang 723cf01696 获取key报错fix 2024-09-27 17:42:05 +08:00
Tankaikai b1f2d56fa4 Merge remote-tracking branch 'origin/test' into test 2024-09-27 17:33:45 +08:00
Tankaikai 1980c8e88d Merge branch 'tkk' into test 2024-09-27 17:33:15 +08:00
SongZhang 5376962c34 创建订单fix 2024-09-27 17:33:08 +08:00
谭凯凯 cb4fa67e48 店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项 2024-09-27 17:32:30 +08:00
SongZhang e9e3d8ac80 用餐人数修改 2024-09-27 17:27:04 +08:00
SongZhang 5d665893f2 列表不查询挂单商品 2024-09-27 16:45:44 +08:00
SongZhang ce001560cb 手动清台模式不清空台桌状态 2024-09-27 16:32:49 +08:00
SongZhang 3121ab5adb 查询购物车限制时间 2024-09-27 16:22:09 +08:00
SongZhang 7bd4d05381 Merge remote-tracking branch 'origin/test' into test 2024-09-27 16:08:38 +08:00
SongZhang 8f41aa713c 台桌不返回订单id fix 2024-09-27 16:08:29 +08:00
wangw 51f60c002c Merge branch 'ww' into test 2024-09-27 16:01:55 +08:00
wangw 95c83b23d5 店铺付款二维码 2024-09-27 16:01:18 +08:00
Tankaikai 408209950b Merge branch 'tkk' into test 2024-09-27 15:56:17 +08:00
谭凯凯 50a2773b5a 增加系统参数配置相关接口，增加店铺订单支付链接获取接口 2024-09-27 15:55:49 +08:00
Tankaikai fe9b27bbff Merge branch 'tkk' into test 2024-09-27 15:46:49 +08:00
谭凯凯 f739b3b1a6 增加系统参数配置相关接口，增加店铺订单支付链接获取接口 2024-09-27 15:46:22 +08:00
Tankaikai 70af101daf Merge branch 'tkk' into test 2024-09-27 15:41:19 +08:00
谭凯凯 bf735b1a31 增加系统参数配置相关接口，增加店铺订单支付链接获取接口 2024-09-27 15:39:30 +08:00
wangw 7ae3992afc Merge branch 'ww' into test 2024-09-27 15:23:58 +08:00
wangw 1208a38018 商品列表 售罄/下架 2024-09-27 15:22:56 +08:00