 dzc
|
ccab8a9de6
|
11
|
2026-09-22 09:35:17 +08:00 |
|
|
dzc
|
5c47704e09
|
fix:命令行打印调试
|
2026-09-21 10:01:00 +08:00 |
|
|
dzc
|
ddf2af76a5
|
feat:取消系统自带软键盘设计，改为系统自用键盘组件-初步
feat:将打印分为图片打印和命令式打印-初步
|
2026-09-20 18:24:46 +08:00 |
|
|
dzc
|
b1b67b4dc7
|
feat:卡片打印机器初步对接
|
2026-09-20 15:18:06 +08:00 |
|
|
dzc
|
035ae7fbd7
|
feat:咖啡机
|
2026-09-18 14:38:29 +08:00 |
|
|
dzc
|
8aa2cfa104
|
feat:app流水通知显示备注
feat:咖啡机初步
|
2026-09-18 12:53:17 +08:00 |
|
|
dzc
|
c3e6efe5bc
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-09-17 18:30:21 +08:00 |
|
|
dzc
|
10404de331
|
feat:以通道的方式展示摄像头
|
2026-09-17 18:30:11 +08:00 |
|
 zjf
|
fff9b6e40f
|
Merge remote-tracking branch 'origin/master'
|
2026-09-17 14:34:44 +08:00 |
|
|
zjf
|
53a43420be
|
钉钉
|
2026-09-17 14:34:25 +08:00 |
|
|
dzc
|
b44fe6f659
|
fix:app订单列表监护人查询不到被监护人的线下订单的bug
|
2026-09-17 10:26:48 +08:00 |
|
|
dzc
|
f23bba238b
|
feat:预约统计查询慢的问题
|
2026-09-16 15:37:42 +08:00 |
|
|
dzc
|
94215c4129
|
feat：订单查询权限问题
|
2026-09-15 18:23:19 +08:00 |
|
|
dzc
|
7d9c29e247
|
feat:购买商品统计
|
2026-09-15 17:42:30 +08:00 |
|
|
dzc
|
bc2c7e2b06
|
feat:导入excel返回错误最多1000条
|
2026-09-15 15:16:54 +08:00 |
|
|
dzc
|
aa8e823741
|
feat:充值大量数据导入
|
2026-09-15 15:00:20 +08:00 |
|
|
dzc
|
51a1d1a38a
|
feat:优化退回到审核前
|
2026-09-15 14:00:16 +08:00 |
|
|
dzc
|
5473250c3c
|
feat：导入用户卡的问题
feat：人工审核不退库存的问题
|
2026-09-15 13:32:05 +08:00 |
|
|
dzc
|
6d43d262b9
|
fix:每日菜谱退款恢复库存放开全部边界条件,销量GREATEST钳0,不再被统计口径阻断
|
2026-09-14 23:16:47 +08:00 |
|
|
dzc
|
6470e222d1
|
fix：库存更新失败，请重试
|
2026-09-14 22:56:22 +08:00 |
|
|
dzc
|
4ad183d55e
|
chore:重触发构建,上条提交说明过长
|
2026-09-14 22:44:27 +08:00 |
|
|
dzc
|
53c1ac7cb2
|
fix:解决退款报错[400 Bad Request] during [POST] to [http://pjcloud-canteen-biz/canteenSpu/inner/updateSkuStockIdempotent] [RemoteCanteenSpuService#updateSkuStockIdempotent(CanteenSpuUpdateStockReqDTO)]: [{"code":1,"msg":"库存已变化，请重新操作","data":null,"ok":false}]
|
2026-09-14 22:39:36 +08:00 |
|
|
zjf
|
0308701998
|
Merge remote-tracking branch 'origin/master'
|
2026-09-14 22:18:49 +08:00 |
|
|
zjf
|
4714c9a263
|
去除菜谱重导删除情况导致的查不到spu的情况导致影响退款
|
2026-09-14 22:18:36 +08:00 |
|
|
dzc
|
9eea0ab3c5
|
123123123
|
2026-09-14 22:07:48 +08:00 |
|
|
zjf
|
20e36d6d86
|
Merge remote-tracking branch 'origin/master'
|
2026-09-14 20:31:33 +08:00 |
|
|
zjf
|
e7a7683b42
|
每日导入导出修改优化
|
2026-09-14 20:31:19 +08:00 |
|
|
dzc
|
620fa5228c
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-09-14 18:42:28 +08:00 |
|
|
dzc
|
e658b0ef8d
|
feat:自动核销
|
2026-09-14 18:42:24 +08:00 |
|
|
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 |
|