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 7d607c7eeb207f28d22e07250d80f1a66b582d56..8549ad4ea3f90aa9283f882f1acf0a659826e9c8 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).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 d5e90d190e4cbd986ab392e8f223228ab40ff46b..65d6caef06c1b3d68ec620df27f628eff9987a9e 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