zianxin/biz-api-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,888 Commits 1 Branch 0 Tags
c6f3a7e1fc43e98bf2134cdb6be5bc94b7050fc9
Commit Graph
1888 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zjf c6f3a7e1fc Merge remote-tracking branch 'origin/master' 2026-09-14 18:35:52 +08:00
zjf 2edbdcce79 每日导入导出修改优化，增加根据订单自动计算剩余库存 2026-09-14 18:35:41 +08:00
dzc 3b9ad6580a feat:大量导入用户创建钱包死锁问题 
feat:自动核销
feat：订单页面修改、订单地图
 2026-09-14 18:34:16 +08:00
dzc 20fe371975 feat:机器下单打印发票 2026-09-14 12:05:44 +08:00
dzc 13ef4c1f8e feat:人脸审批页面展示用户信息，用户身份 2026-09-14 11:40:58 +08:00
dzc 198352ef21 feat:线上订单自动核销 2026-09-14 11:09:32 +08:00
dzc 3641eaff7f Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-14 09:59:13 +08:00
dzc b0b5c89c0f feat:消费机库存扣减扣每日菜谱的线下库存 2026-09-14 09:59:10 +08:00
zjf 364d378708 冲突 2026-09-13 18:16:37 +08:00
zjf 92cabb5796 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
 2026-09-13 18:11:04 +08:00
zjf 816ea8ecf3 退款问题 2026-09-13 18:07:17 +08:00
dzc 493e7ef804 111 2026-09-13 17:53:54 +08:00
dzc 4e1c65acfa feat:库存退款 2026-09-13 17:22:38 +08:00
zjf 7fb7feea3f 修复权限问题 2026-09-11 18:42:16 +08:00
zjf 26fe9834cb 修复每日导入解析问题 2026-09-11 16:47:10 +08:00
zjf 430fd5e9f9 每日库存 2026-09-11 16:17:08 +08:00
zjf ba4a564c85 Merge remote-tracking branch 'origin/master' 2026-09-11 15:45:36 +08:00
zjf c6d7e4cad0 每日库存 2026-09-11 15:45:02 +08:00
dzc 06c488a8d7 111 2026-09-10 20:19:23 +08:00
zjf 2087dd7933 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-10 15:29:49 +08:00
zjf ed0b320b94 每日库存 2026-09-10 15:29:41 +08:00
zjf 26d3ec48a6 每日库存 2026-09-10 15:29:19 +08:00
zjf 68d78d4b82 敏实适配 2026-09-10 11:10:42 +08:00
dzc 4e7daed364 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-08 18:28:34 +08:00
dzc 1d7470704e feat:统计商品名重复的问题 2026-09-08 18:28:30 +08:00
zjf 0ac2115a60 Merge remote-tracking branch 'origin/master' 2026-09-08 16:23:54 +08:00
zjf 0bde83e9c2 1.部门邀请 2.app版本增加ssh上传，3.注册页面国际化适配 2026-09-08 16:23:34 +08:00
dzc a1dfc6a991 feat:提供用户修改钱包流水的"创建时间"和"部门" 2026-09-07 16:12:59 +08:00
dzc 5460d1471d fix:字体加粗 2026-09-07 15:17:51 +08:00
dzc 906a970b08 11 2026-09-07 14:05:08 +08:00
dzc 07b863cd89 feat:打印订单合并模式 2026-09-07 12:07:28 +08:00
dzc 1bf4ad3dd8 feat:机器上可以查询全部订单 2026-09-07 10:34:38 +08:00
dzc ec39c72f7e feat:订单打印购物车查询 2026-09-07 10:19:52 +08:00
dzc a7c505e9fc fix:核销bug修改 2026-09-04 18:57:10 +08:00
dzc a9a5a2f8d0 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-04 17:33:26 +08:00
dzc 6818c5fa5a feat:核销打印兑换券 2026-09-04 17:33:22 +08:00
zjf 73b874382b Merge remote-tracking branch 'origin/master' 2026-09-04 16:40:08 +08:00
zjf 098713f075 每日菜谱导入没有id按新增 2026-09-04 16:39:54 +08:00
dzc 991685ca48 feat:打印机器修改 2026-09-04 16:23:49 +08:00
dzc 9147aafec8 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-04 15:14:54 +08:00
dzc 8514af0d9f feat:修改设备列表、详情 
feat:修改订单详情
feat:修改售后订单查询条件
feat:增加打印机设备及功能
 2026-09-04 15:14:51 +08:00
zjf da07e0f454 每日菜谱导入前增加预览效果 2026-09-04 13:46:24 +08:00
zjf 1271a2d743 关闭查询每日菜品列表日志 2026-09-02 19:56:20 +08:00
zjf fc8afe4de7 国际化 2026-09-02 15:25:04 +08:00
zjf 789ccca90e Merge remote-tracking branch 'origin/master' 2026-09-02 15:16:46 +08:00
zjf 348f83bfa5 国际化 2026-09-02 15:14:13 +08:00
dzc 2a9457e7a7 fix:设备查询菜品频繁问题 
fix:退看流水对账问题
 2026-09-02 12:52:32 +08:00
dzc a3c89be742 fix：部门交易记录查询慢的问题 2026-09-01 19:47:00 +08:00
dzc 0c19eff578 fix：修改部门统计的流水金额和退款金额不准确的问题 2026-09-01 19:15:22 +08:00
dzc 779bad9314 fix:修复充值/扣款申请中开启申请没有查询到数据的bug 2026-09-01 17:40:02 +08:00