Commit Graph
2010 Commits
Author SHA1 Message Date
dzc 667b87fc00 feat:适配聚合支付 2026-10-20 13:40:25 +08:00
dzc c0d503f00e Merge branch 'master' of https://gitea.zianxin.com/zianxin/biz-api-cloud-zax 2026-10-19 13:27:09 +08:00
dzc a00f7aa80d feat:手动推送消息 2026-10-19 13:25:56 +08:00
zjf 0865a8836d 酒店优化回调任务,同一酒店多个回调合并处理 2026-10-19 08:59:28 +08:00
zjf a79f99f7f7 每日菜谱增加新增套餐自动带入单品,自动合计单品价格 2026-10-18 15:16:11 +08:00
zjf 069f2f4b09 修复回调异常问题,增加慧订业务 2026-10-16 17:26:27 +08:00
zjf aa5a699a52 酒店修改 2026-10-16 12:19:17 +08:00
zjf 7d19ec66b6 酒店修改 2026-10-16 11:46:29 +08:00
zjf 34bc262721 下游推送优化,过滤无效房源 2026-10-16 09:56:50 +08:00
zjf 846820b2db 修复酒店回调队列问题 2026-10-15 17:05:50 +08:00
zjf 57f7f0d287 酒店业务增强 2026-10-15 13:15:57 +08:00
zjf ead68c0deb Merge remote-tracking branch 'origin/master' 2026-10-14 20:14:40 +08:00
zjf f784f75eb3 酒店业务增强 2026-10-14 20:14:23 +08:00
dzc 8f303f1c63 fix:每日菜谱排序和消费机排序一致 2026-10-14 16:58:58 +08:00
dzc 66be2c3ad2 feat:别名打印问题 2026-10-14 14:57:07 +08:00
dzc 0ff9fb9342 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-14 13:50:38 +08:00
dzc 3ca15d8f34 feat:优化下单速度 2026-10-14 13:50:35 +08:00
zjf c5eba0423f Merge remote-tracking branch 'origin/master' 2026-10-14 10:17:07 +08:00
zjf cbf28e8d7e 每日订餐问题更新 2026-10-14 10:16:50 +08:00
dzc 0ddf7e5d06 11 2026-10-13 18:45:48 +08:00
dzc ea84c9a468 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-13 17:25:35 +08:00
dzc 9a6a188074 feat:对接读写卡器
feat:优化用户下拉框搜索
feat:优化下单卡顿问题
feat:优化商户列表样式
2026-10-13 17:25:31 +08:00
zjf 4c9bdf073a 酒店数据隔离增强 2026-10-13 17:05:06 +08:00
zjf 7a8210aeb4 酒店 2026-10-13 16:42:01 +08:00
zjf 8ef2f8ccd6 1.酒店 2.商户增加酒店类型,部门接口适配酒店 2026-10-12 19:51:36 +08:00
zjf 074340e5c6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-12 14:17:35 +08:00
zjf b4e83d5604 酒店 2026-10-12 14:17:22 +08:00
dzc e407fe3da6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-12 13:44:26 +08:00
dzc 416bf5d626 feat:钱包流水增加设备类型
fix:退款bug
2026-10-12 13:44:22 +08:00
zjf e3e2726f91 Merge remote-tracking branch 'origin/master' 2026-10-10 18:02:15 +08:00
zjf 3b92659e7a 酒店 2026-10-10 18:02:02 +08:00
dzc cc4484c187 feat:云消费机适配青鸟学校 2026-10-10 12:04:32 +08:00
dzc af3736c924 feat:outbox表app消息推送优化 2026-10-09 17:55:27 +08:00
dzc e2a05a6631 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-09 17:52:23 +08:00
dzc 1df9c07db3 feat:outbox表app消息推送优化 2026-10-09 17:52:19 +08:00
zjf 3ff7b06f58 Merge remote-tracking branch 'origin/master' 2026-10-09 15:39:37 +08:00
zjf e2ae48d0e5 酒店增加本地维护 2026-10-09 15:39:21 +08:00
dzc 9f289b31a3 fix:修改应为消息内容过长app极光不推送的问题 2026-10-09 14:32:19 +08:00
dzc 96abe868ef feat:消息推送查询
fix:消费机库存显示更改
2026-10-09 13:47:26 +08:00
dzc bf5db4bbb9 feat:钱包流水"显示系统" 2026-10-09 13:01:04 +08:00
dzc b4109f55d2 feat:库存bug 2026-10-09 10:56:52 +08:00
zjf 80b4d1e9cc Merge remote-tracking branch 'origin/master' 2026-10-09 09:35:15 +08:00
zjf 12e71449a8 1.安卓机线下库存效验问题 2.酒店调整 2026-10-09 09:35:05 +08:00
dzc b4fa60a895 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-09 09:28:25 +08:00
dzc 65b00be0a4 feat:钱包流水备注 2026-10-09 09:28:21 +08:00
zjf 658b099952 1.每日菜品调整修改 2.酒店调整 2026-10-08 19:09:37 +08:00
zjf 0cb5856d98 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/integration/shangyou/ShangyouCallbackQueueWorker.java
2026-10-08 17:12:26 +08:00
zjf 49ba5cea29 1.每日菜品调整修改 2.酒店调整 2026-10-08 17:11:42 +08:00
dzc 42ac8786ee fix:打包问题 2026-10-08 14:26:58 +08:00
dzc 3a416e2686 11 2026-10-08 13:54:25 +08:00