yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,525 Commits 2 Branches 0 Tags
master
Commit Graph

91 Commits

Author SHA1 Message Date
liguoyang
e720cefaf7 feat: nameEn显示 2026-06-09 16:03:51 +08:00
liguoyang
a572d3258a fix 营业点查询和负数处理 2025-10-14 14:39:58 +08:00
liguoyang
a4c45f3ba8 fix 优化查询 2025-10-14 14:29:37 +08:00
liguoyang
62e3fbe37b feat: 功能优化和增加餐饮分析 2025-10-14 12:32:02 +08:00
liguoyang
6ba81c6481 feat 增加厂区消费查询 2025-09-22 16:16:54 +08:00
liguoyang
5de794d644 fix 类型修改 2025-04-22 15:28:54 +08:00
liguoyang
fc4abae3b2 fix 优化导出处理 2025-04-22 14:21:03 +08:00
liguoyang
3a67e0b030 feat 营业点消费明细导出 2025-04-21 11:23:36 +08:00
liguoyang
d5aeb80af9 fix 增加消费类型导出 2025-04-21 10:34:18 +08:00
liguoyang
b68a6c471f feat 导出 2025-04-18 16:06:16 +08:00
liguoyang
f214468d48 remove 不需要的统计 2025-01-08 16:45:18 +08:00
liguoyang
31f406d6d3 Merge branch 'feat-wallet' into development 2024-11-14 15:44:01 +08:00
liguoyang
ee8784195f fix 用户消费明细状态处理 2024-11-13 15:41:15 +08:00
liguoyang
1a0ba28249 fix 多钱包调整 2024-11-08 16:36:10 +08:00
liguoyang
4cb7d419de fix 处理已知问题 2024-08-26 16:11:32 +08:00
liguoyang
9e46c26ddf fix 处理已知问题 2024-08-16 21:57:39 +08:00
liguoyang
173ede9222 fix 统计,消费明细 2024-08-16 21:57:39 +08:00
liguoyang
ee86311697 feat 就餐分析,餐次使用金额和人数 2024-08-16 21:48:28 +08:00
liguoyang
2bdf883ad9 feat 餐次就餐分析 2024-08-16 21:48:28 +08:00
liguoyang
fc6bd54caa fix 返回统计金额 2024-08-01 18:22:18 +08:00
liguoyang
a981baa296 fix 补充过程log 2024-07-20 13:43:07 +08:00
liguoyang
ce682409d4 fix 移除无用代码 2024-07-16 11:54:39 +08:00
liguoyang
34c0882f1d fix 增加image记录,移除balance负数处理 2024-06-25 15:41:39 +08:00
liguoyang
a052e77e53 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
00fd009ce0 feat 根据工号获取海宁消费记录 2024-06-10 21:46:49 +08:00
liguoyang
47e92be51f feat 内部余额写入 2024-06-10 19:13:43 +08:00
liguoyang
d11d6f5904 fix 临时移除 2024-05-31 20:23:18 +08:00
liguoyang
5c30638274 fix 优化datetime格式 2024-05-30 20:44:41 +08:00
liguoyang
75bd31d4a5 feat 外包人员,框架升级 2024-05-30 19:37:27 +08:00
liguoyang
c3b69fbf24 fix 数据问题 2024-05-24 12:07:30 +08:00
liguoyang
cc273a4693 fix 离线显示,优化enable获取设备,优化设备查询营业日期 2024-04-23 11:35:35 +08:00
liguoyang
99ca6696c7 fix 消费统计 2024-04-20 15:30:27 +08:00
liguoyang
91d823c9e1 fix 查询优化 2024-04-10 15:01:08 +08:00
liguoyang
f88f67934e fix 查询优化 2024-04-10 14:38:34 +08:00
liguoyang
a528d92012 fix 餐饮消费控制和设备统计优化 2024-04-09 15:58:12 +08:00
liguoyang
99e2e3cc10 fix 作废明细增加权限控制 2024-04-08 19:12:53 +08:00
liguoyang
9ca748a432 fix 查询优化 2024-04-08 18:25:18 +08:00
liguoyang
3d136b13bf fix 消费明细分页调整 2024-04-08 18:09:46 +08:00
liguoyang
d71f080cd3 fix 增加显示菜品名称 2024-03-26 11:27:27 +08:00
liguoyang
363deb8445 fix 汇总数量 2024-03-25 10:24:17 +08:00
liguoyang
af9c5a5749 fix 优化查询 2024-03-25 10:16:32 +08:00
liguoyang
cfb0f263ae fix 订餐分页查询优化 2024-03-24 19:50:39 +08:00
liguoyang
f42900a962 fix merge error 2024-03-23 00:57:47 +08:00
liguoyang
cb5e06b6ed Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-23 00:52:30 +08:00
liguoyang
374bad21c4 fix 餐补查询代码调整 2024-03-23 00:40:19 +08:00
cheche
fc73435e6c fix 餐补查询及日志删除 2024-03-23 00:36:52 +08:00
liguoyang
3ea432943f Squashed commit of the following: 
commit afdd9e6f14
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:48:05 2024 +0800

    fix 价格默认获取菜单中的设置

commit a3cfc472c8
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:40:04 2024 +0800

    fix 时间范围逻辑

commit 83f8906f12
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:32:55 2024 +0800

    fix 时间范围逻辑

commit 35660b1d0c
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:29:36 2024 +0800

    fix 数据范围罗逻辑修改

commit 7407955bc5
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:14:06 2024 +0800

    fix 分类树增加营业点参数

commit ed5196d1a1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:02:52 2024 +0800

    feat 用户创建

commit d25909a235
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:51:20 2024 +0800

    fix 菜单明细调整

commit 8915f9ff0f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:42:08 2024 +0800

    fix 判断提前

commit 45aa52aa2a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:34:22 2024 +0800

    fix 逻辑取反

commit 89904fead1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:23:20 2024 +0800

    fix 菜单时效范围

commit 573911f907
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 19:13:33 2024 +0800

    fix 订单聚合返回状态

commit 93c38be18a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 18:40:12 2024 +0800

    fix 订单查询

commit e256d18d36
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 18:14:33 2024 +0800

    fix 订单取消接口,分页权限控制

commit 1218aec811
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:32:45 2024 +0800

    fix 营业点权限控制优化

commit 226c61ee41
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:09:42 2024 +0800

    fix tenantId赋值

commit 28d2c1d8d4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:05:37 2024 +0800

    fix ignoretenant

commit 5ae6dd97b4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:53:40 2024 +0800

    fix ignoretenant

commit 4c866eaf3f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:40:24 2024 +0800

    feat 获取所有地址

commit 2ca8f2db49
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:22:47 2024 +0800

    fix 优化查询

commit 212a1fa073
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:01:49 2024 +0800

    fix 临时数据模拟

commit 0eb76e878c
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 15:48:59 2024 +0800

    fix 处理删除缺少判断

commit c582fb40c0
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 15:40:22 2024 +0800

    fix 查询优化

commit 6d3a19b283
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:48:45 2024 +0800

    fix 错误值修改

commit c39f77008d
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:31:50 2024 +0800

    fix 营业点控制(admin),unit返回

commit a5dcab1d07
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:16:23 2024 +0800

    fix 营业点分页控制

commit 02084be82b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:01:14 2024 +0800

    fix 分类控制菜品获取

commit 96c5c5feba
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 10:39:58 2024 +0800

    fix DI

commit 367ede2eeb
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 10:35:24 2024 +0800

    fix 订餐返回当前信息,增加数量入参和响应

commit 0e1f6cb4a0
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 16:40:10 2024 +0800

    fix 餐补查询代码调整

commit 21fc2f78d3
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 15:52:46 2024 +0800

    fix 支付批量操作

commit 878b44a146
Merge: a90d4e6 bf5c937
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 15:27:39 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit a90d4e66a7
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 15:27:37 2024 +0800

    fix 餐补查询及日志删除

commit bf5c937037
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 15:12:30 2024 +0800

    fix 补充营业点分配权限接口

commit 07672f1d32
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 13:56:33 2024 +0800

    fix 优化changeDb

commit 7090ee4a33
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 13:41:25 2024 +0800

    fix 敏感信息混淆

commit 4366b68831
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 12:42:48 2024 +0800

    fix 代码优化

commit 03b73515b5
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 10:59:08 2024 +0800

    fix tree返回营业点

commit 1ce60bedc2
Merge: aba4fa7 2d83930
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 09:55:17 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit aba4fa7ee9
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 09:55:13 2024 +0800

    fix 删除日志优化

commit 2d8393068f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 20:53:16 2024 +0800

    feat 订单聚合接口

commit 0cde1d3d92
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 20:03:06 2024 +0800

    fix 表名称调整

commit f003e30169
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 19:51:56 2024 +0800

    fix 订餐null异常处理

commit f427338715
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 18:43:19 2024 +0800

    feat 获取菜品

commit 3a65d95701
Merge: 9a7091b 7432fae
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 18:36:16 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit 9a7091b4e0
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 18:36:14 2024 +0800

    fix 删除日志try

commit 7432fae103
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 18:02:31 2024 +0800

    fix 配送点增加

commit ecd162c7af
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 17:51:15 2024 +0800

    fix 预定就餐送货地点

commit 1c7a054ed4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 15:53:22 2024 +0800

    feat 获取所有营业点接口

commit 84398a566e
Merge: 217d9f7 84b4025
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 15:26:42 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit 217d9f7770
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 15:26:40 2024 +0800

    feat  配送点管理

commit 84b402538e
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 14:59:21 2024 +0800

    fix 菜单分页响应调整,增加详情接口

commit 098d7c7e9d
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 14:26:24 2024 +0800

    fix 代码优化
 2024-03-21 22:04:52 +08:00
liguoyang
573911f907 fix 订单聚合返回状态 2024-03-21 19:13:33 +08:00
liguoyang
e256d18d36 fix 订单取消接口,分页权限控制 2024-03-21 18:14:33 +08:00
liguoyang
212a1fa073 fix 临时数据模拟 2024-03-21 16:01:49 +08:00