From 36aa1cd2def263532bcaa85eceb9a2b361edf6cf Mon Sep 17 00:00:00 2001
From: unknown <627433532@qq.com>
Date: Tue, 2 Sep 2025 10:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/agent/api/FetchActor.java         | 19 +++++-----
 .../model/lbs.floor/entity.json               | 38 +++++++++++++++++++
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/zero-extension-commerce-finance/src/main/java/io/zerows/extension/commerce/finance/agent/api/FetchActor.java b/zero-extension-commerce-finance/src/main/java/io/zerows/extension/commerce/finance/agent/api/FetchActor.java
index 7d607c7e..8549ad4e 100644
--- a/zero-extension-commerce-finance/src/main/java/io/zerows/extension/commerce/finance/agent/api/FetchActor.java
+++ b/zero-extension-commerce-finance/src/main/java/io/zerows/extension/commerce/finance/agent/api/FetchActor.java
@@ -1,10 +1,7 @@
 package io.zerows.extension.commerce.finance.agent.api;
 
-import io.zerows.extension.commerce.finance.domain.tables.daos.FBillDao;
-import io.zerows.extension.commerce.finance.domain.tables.daos.FBillItemDao;
-import io.zerows.extension.commerce.finance.domain.tables.daos.FTransDao;
-import io.zerows.extension.commerce.finance.domain.tables.daos.FTransItemDao;
-import io.zerows.extension.commerce.finance.domain.tables.pojos.FBill;
+import io.zerows.extension.commerce.finance.domain.tables.daos.*;
+import io.zerows.extension.commerce.finance.domain.tables.pojos.*;
 import io.zerows.extension.commerce.finance.agent.service.BookStub;
 import io.zerows.extension.commerce.finance.agent.service.FetchStub;
 import io.zerows.extension.commerce.finance.agent.service.end.SettleRStub;
@@ -12,9 +9,6 @@ import io.zerows.extension.commerce.finance.agent.service.end.TransStub;
 import io.vertx.core.Future;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.zerows.extension.commerce.finance.domain.tables.pojos.FSettlement;
-import io.zerows.extension.commerce.finance.domain.tables.pojos.FTrans;
-import io.zerows.extension.commerce.finance.domain.tables.pojos.FTransItem;
 import io.zerows.extension.commerce.finance.eon.Addr;
 import io.zerows.core.annotations.Address;
 import io.zerows.core.annotations.Queue;
@@ -67,7 +61,14 @@ public class FetchActor {
              * 旧版本多查询了一步，但实际这个步骤查询下来没有任何用
              * 根据结算单查询 交易明细 信息
              */
-            .compose(nil -> data.response(false));
+            .compose(nil -> data.response(false))
+            /*
+            * 查询预授权信息
+            */
+            .compose(dataSouse-> Ux.Jooq.on(FPreAuthorizeDao.class).<FPreAuthorize>fetchAsync("orderId",orderId).compose(item->{
+               dataSouse.put("preAuthorize", item.isEmpty() ?new JsonArray(): Ux.toJson(item));
+               return Ux.future(dataSouse);
+            }));
     }
 
 
diff --git a/zero-extension-commerce-lbs/src/main/resources/plugins/zero-extension-commerce-lbs/model/lbs.floor/entity.json b/zero-extension-commerce-lbs/src/main/resources/plugins/zero-extension-commerce-lbs/model/lbs.floor/entity.json
index d5e90d19..65d6caef 100644
--- a/zero-extension-commerce-lbs/src/main/resources/plugins/zero-extension-commerce-lbs/model/lbs.floor/entity.json
+++ b/zero-extension-commerce-lbs/src/main/resources/plugins/zero-extension-commerce-lbs/model/lbs.floor/entity.json
@@ -8,5 +8,43 @@
                 "sigma"
             ]
         ]
+    },
+    "transform": {
+        "fabric": {
+            "source": [
+                {
+                    "source": "ASSIST",
+                    "key": "location.tents",
+                    "component": "io.zerows.extension.commerce.lbs.osgi.spi.TentDict"
+                },
+                {
+                    "source": "ASSIST",
+                    "key": "location.floors",
+                    "component": "io.zerows.extension.commerce.lbs.osgi.spi.FloorDict"
+                },
+                {
+                    "source": "ASSIST",
+                    "key": "room.types",
+                    "component": "com.needee.spi.dict.RoomTypeDict"
+                }
+            ],
+            "epsilon": {
+                "tentId": {
+                    "source": "location.tents",
+                    "in": "name",
+                    "out": "key"
+                },
+                "floorId": {
+                    "source": "location.floors",
+                    "in": "name",
+                    "out": "key"
+                },
+                "roomTypeId": {
+                    "source": "room.types",
+                    "in": "name",
+                    "out": "key"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
-- 
Gitee