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

1126 Commits

Author SHA1 Message Date
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