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

541 Commits

Author SHA1 Message Date
SongZhang 7d37e58206 Merge remote-tracking branch 'origin/test' into test 2024-08-21 10:46:16 +08:00
SongZhang 91751b0f32 1.代客下单 台桌状态同步更新 2024-08-21 10:45:59 +08:00
wangw 7f78921eda Merge branch 'ww' into test 2024-08-21 10:16:37 +08:00
wangw e3e0c93502 店铺扩展信息 新增时 key不可重复 2024-08-21 10:16:22 +08:00
wangw df0570860d 店铺扩展信息 增加描述字段 2024-08-21 09:36:21 +08:00
SongZhang 7d1571628f 1.代客下单 选择会员fix 2024-08-20 18:15:37 +08:00
SongZhang 4e5c560d95 1.代客下单 选择会员fix 2024-08-20 18:11:13 +08:00
GYJ 0d8aa662e4 Merge branch 'refs/heads/gyj' into test 2024-08-20 17:31:05 +08:00
GYJ beea5e902c 修改查询会员列表 - 从shopUser查询 2024-08-20 17:30:24 +08:00
SongZhang 98cf4f2f6d Merge remote-tracking branch 'origin/test' into test 2024-08-20 17:05:46 +08:00
SongZhang 376af15266 1.代客下单 新增后付款下单 2024-08-20 17:05:36 +08:00
牛叉闪闪 f00ad6a46c 添加员工折扣字段 2024-08-20 16:13:13 +08:00
牛叉闪闪 972ab851c8 修改增加减少用户资金接口 2024-08-20 15:30:21 +08:00
牛叉闪闪 aa7c5d3744 修改增加减少用户资金接口 2024-08-20 15:20:04 +08:00
wangw b9157ddc6b Merge branch 'ww' into test 2024-08-20 14:58:12 +08:00
wangw 1cb0d9c80f 会员活动赠送商品 2024-08-20 14:57:55 +08:00
SongZhang 830271a838 Merge remote-tracking branch 'origin/test' into test 2024-08-20 14:47:50 +08:00
SongZhang b388b3a044 1.库存排序 2024-08-20 14:47:32 +08:00
牛叉闪闪 049f52499e Merge remote-tracking branch 'origin/hph' into test 2024-08-20 14:46:52 +08:00
牛叉闪闪 d6b8919294 修改增加减少用户资金接口 2024-08-20 14:46:12 +08:00
SongZhang fcfe0a2f53 1.库存排序 2024-08-20 14:39:01 +08:00
SongZhang a90c441988 Merge remote-tracking branch 'origin/test' into zs 2024-08-19 17:45:09 +08:00
SongZhang d6bbe73d58 1.代客下单 会员点单 取消点单 2024-08-19 17:42:47 +08:00
牛叉闪闪 2567044da8 添加是否允许会员自定义金额字段 2024-08-19 17:41:25 +08:00
SongZhang 15de68b704 1.代客下单 会员点单 取消点单 2024-08-19 16:24:45 +08:00
SongZhang 2252f4edcb Merge remote-tracking branch 'origin/test' into zs 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
 2024-08-19 16:15:52 +08:00
SongZhang ea86b42847 1.代客下单 会员点单 取消点单 2024-08-19 16:15:01 +08:00
GYJ 53275cd5de 集成model类型修改 2024-08-19 16:09:44 +08:00
SongZhang b5fc56c0aa 1.代客下单 挂单规格返回 2024-08-19 15:43:11 +08:00
SongZhang a74612f5a6 1.代客下单 桌号获取 2024-08-19 14:12:07 +08:00
牛叉闪闪 95e37c2048 添加增加减少会员余额接口 2024-08-19 11:25:01 +08:00
牛叉闪闪 635625842a 添加增加减少会员余额接口 2024-08-19 11:23:59 +08:00
牛叉闪闪 53fd7e24c0 判断修改耗材参数 2024-08-19 11:23:59 +08:00
牛叉闪闪 cf62b77128 添加耗材信息单价字段 2024-08-19 11:23:59 +08:00
牛叉闪闪 58eb528047 添加耗材信息单价字段 2024-08-19 11:23:59 +08:00
SongZhang 4909ebe807 1.代客下单 删除订单接口 2024-08-19 11:23:59 +08:00
牛叉闪闪 fa868cce31 添加耗材信息单价字段 2024-08-19 11:23:59 +08:00
SongZhang 5f2950ab72 1.代客下单挂单修改 2024-08-19 11:23:58 +08:00
SongZhang 8da97add53 1.商品不推送修复 2024-08-19 11:23:58 +08:00
wangw 2250bda5c1 分组时间管控 2024-08-19 11:23:58 +08:00
wangw e3f68dc486 用户管理 排序 2024-08-19 11:23:58 +08:00
wangw ff07ab528e 活动管理 赠送商品 2024-08-19 11:23:58 +08:00
SongZhang 0ec21c31e9 1.代客下单 挂起订单 2024-08-19 11:23:58 +08:00
SongZhang 8d73b216ef 1.代客下单 挂起订单 2024-08-19 11:23:58 +08:00
GYJ 5643faab22 弹窗广告 2024-08-19 11:16:47 +08:00
SongZhang c51e0ec580 Merge remote-tracking branch 'origin/test' into test 2024-08-19 10:12:02 +08:00
SongZhang 96f1dcb768 1.代客下单 删除订单接口 2024-08-19 10:11:51 +08:00
牛叉闪闪 9f6f7c2a78 判断修改耗材参数 2024-08-19 09:45:48 +08:00
GYJ e1499150f9 修改库存开关导致数据缺失的问题 2024-08-18 20:24:26 +08:00
GYJ e6b8414366 Merge branch 'refs/heads/test' into dev 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
 2024-08-18 20:14:25 +08:00
牛叉闪闪 085ae733e2 添加耗材信息单价字段 2024-08-17 18:33:35 +08:00
牛叉闪闪 9b8ec56b96 添加耗材信息单价字段 2024-08-17 18:25:03 +08:00
SongZhang d10a9671a9 Merge remote-tracking branch 'origin/test' into test 2024-08-17 17:37:23 +08:00
SongZhang 7da10ca43e 1.代客下单挂单修改 2024-08-17 17:37:06 +08:00
牛叉闪闪 a21e361b4e Merge remote-tracking branch 'origin/hph' into test 2024-08-17 17:04:08 +08:00
SongZhang e8f9af93e8 1.商品不推送修复 2024-08-17 16:57:51 +08:00
SongZhang fcaba6d511 1.商品不推送修复 2024-08-17 16:52:29 +08:00
SongZhang b13a48d5e5 1.商品不推送修复 2024-08-17 16:49:18 +08:00
牛叉闪闪 3807eb43ce 添加耗材信息单价字段 2024-08-17 15:28:21 +08:00
SongZhang 7eab45ae49 Merge remote-tracking branch 'origin/test' into test 2024-08-17 15:22:38 +08:00
SongZhang 89582d3bc8 1.代客下单 挂起订单 2024-08-17 15:21:45 +08:00
wangw 1de1edb537 分组时间管控 2024-08-17 14:38:00 +08:00
wangw df95c09724 用户管理 排序 2024-08-17 14:15:12 +08:00
wangw a53e9f7ab4 活动管理 赠送商品 2024-08-17 11:49:01 +08:00
GYJ 8e0f237e2e 台桌数据导出修改 2024-08-17 11:29:59 +08:00
SongZhang e938911e4a 1.代客下单 挂起订单 2024-08-17 10:03:11 +08:00
牛叉闪闪 0c5192e86e 添加耗材信息更新时间和创建时间字段 2024-08-16 18:13:51 +08:00
wangw 5732e6974f 商品分组-时段 跨日的展示 次日 2024-08-16 18:00:25 +08:00
wangw adee84544d 数据报表-销量-统计 2024-08-16 14:52:59 +08:00
SongZhang 7c122565fc 1.增加库存记录mq处理 2024-08-16 14:45:50 +08:00
SongZhang b8a60a1549 1.增加库存记录mq处理 2024-08-16 13:38:52 +08:00
SongZhang d32f9705a0 1.代客下单，支付，挂起，下单接口开发 2024-08-16 11:12:25 +08:00
SongZhang 62ca02cdc4 Merge remote-tracking branch 'origin/dev' into zs 2024-08-16 11:11:21 +08:00
SongZhang 4a8bce3c34 1.增加库存预警模板消息id 2024-08-16 11:10:54 +08:00
wangw 199e787d92 Merge branch 'test' into dev 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
 2024-08-16 09:23:43 +08:00
wangw 7271e77b05 数据报表-销量-统计 
商品 规格 返回
 2024-08-15 18:23:46 +08:00
GYJ a183d2bfec 修改销量和台桌导出 -- 合并 2024-08-15 17:33:03 +08:00
GYJ fa566a7057 Merge branch 'refs/heads/gyj' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
 2024-08-15 17:31:07 +08:00
GYJ 3d9e4ee511 修改销量和台桌导出 2024-08-15 17:25:36 +08:00
GYJ f808912006 Merge branch 'refs/heads/test' into gyj 2024-08-15 13:50:16 +08:00
牛叉闪闪 5fe0e2a83b Merge remote-tracking branch 'origin/dev' into dev 2024-08-14 15:08:48 +08:00
牛叉闪闪 9d8bb72a7e 添加耗材库存检测开关 2024-08-14 15:08:28 +08:00
SongZhang a0930151a8 1.推送修改 2024-08-14 15:05:16 +08:00
SongZhang 441ecf38f1 1.代客下单相关接口 2024-08-14 15:04:53 +08:00
SongZhang 9bfa67d71b Merge remote-tracking branch 'origin/dev' into zs 2024-08-14 11:31:31 +08:00
牛叉闪闪 9ec06de8cd 添加耗材库存检测开关 2024-08-14 11:29:15 +08:00
wangw cd6d6f2e07 Merge branch 'ww' into test 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
 2024-08-14 11:17:16 +08:00
SongZhang 27f7d07f27 Merge remote-tracking branch 'origin/dev' into zs 2024-08-14 11:01:18 +08:00
牛叉闪闪 b08ff62d86 修改耗材信息 2024-08-14 10:59:27 +08:00
SongZhang 7715b758f1 Merge remote-tracking branch 'origin/dev' into zs 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
 2024-08-14 10:28:04 +08:00
牛叉闪闪 6e03ad4997 添加订单数量和充值金额字段 2024-08-14 10:19:47 +08:00
wangw c35df24d2d 分组增加可售时段 2024-08-14 09:43:25 +08:00
牛叉闪闪 eb32bedc25 修改会员充值奖励功能 2024-08-13 14:50:27 +08:00
SongZhang a7de11423f 1.数据报表导出cpu拉高问题修复 
2.代客下单相关接口
 2024-08-13 14:39:32 +08:00
SongZhang e53037232f 1.数据报表导出cpu拉高问题修复 2024-08-13 10:59:27 +08:00
SongZhang fd5b79d6ec 1.代客下单规格修改接口 2024-08-13 09:48:03 +08:00
SongZhang 7f1c028fed 1.代课下单支持赠送 2024-08-13 09:02:44 +08:00
SongZhang 66ae922dc4 Merge remote-tracking branch 'origin/zs' into test 2024-08-12 15:33:21 +08:00
SongZhang 0e9996bcf0 1.通知中心相关接口 
2.代客下单
 2024-08-12 14:55:21 +08:00
wangw d862eb43be 获取商家 会员二维码 2024-08-12 14:18:31 +08:00