@pisell/pisellos 2.2.205 → 2.2.206

package/dist/solution/BookingTicket/types.d.ts

@@ -1,4 +1,4 @@
-import { ProductList, OrderModule } from '../../modules';
+import { ProductList, OrderModule, OpenDataModule } from '../../modules';
 import { BookingContextModule } from '../../modules/BookingContext';
 import { CustomerModule } from '../../modules/Customer';
 import { SalesSummaryModule } from '../../modules/SalesSummary';
@@ -18,6 +18,7 @@ export interface BookingTicketState extends BaseSalesState {
     schedule: ScheduleModule;
     customer: CustomerModule;
     bookingContext: BookingContextModule;
+    openData: OpenDataModule;
 }
 export declare function createBookingTicketModule<T extends keyof BookingTicketState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingTicketState[T] | null;
 export declare enum BookingTicketHooks {

package/dist/solution/BookingTicket/types.js

@@ -1,4 +1,4 @@
-import { ProductList, OrderModule } from "../../modules";
+import { ProductList, OrderModule, OpenDataModule } from "../../modules";
 import { BookingContextModule } from "../../modules/BookingContext";
 import { CustomerModule } from "../../modules/Customer";
 import { SalesSummaryModule } from "../../modules/SalesSummary";
@@ -23,6 +23,8 @@ export function createBookingTicketModule(moduleName, solutionName, name, versio
       return new CustomerModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'bookingContext':
       return new BookingContextModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'openData':
+      return new OpenDataModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       return null;
   }

package/lib/modules/OpenData/index.d.ts

@@ -9,6 +9,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultVersion: string;
     private request;
     private window;
+    private appPlugin;
     private store;
     private cacheId;
     private openCache;

package/lib/modules/OpenData/index.js

@@ -52,6 +52,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
     }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
+    this.appPlugin = core.getPlugin("app");
     if (!this.request)
       throw new Error("OpenDataModule 需要 request 插件支持");
     if (!this.window)
@@ -59,11 +60,12 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
     console.log("[OpenDataModule] 初始化完成");
   }
   async fetchOpenData(params) {
-    var _a, _b, _c, _d;
-    const shopId = (_b = (_a = this.otherParams) == null ? void 0 : _a.getStateData) == null ? void 0 : _b.call(_a, "shop_id");
+    var _a, _b;
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
+    const shopId = getData == null ? void 0 : getData("shop_id");
     if (!shopId)
       throw new Error("[OpenDataModule] 无法获取 shop_id");
-    const tenantId = (_d = (_c = this.otherParams) == null ? void 0 : _c.getStateData) == null ? void 0 : _d.call(_c, "tenant_id");
+    const tenantId = getData == null ? void 0 : getData("tenant_id");
     const headers = {};
     if (tenantId)
       headers["Tenant-Id"] = String(tenantId);
@@ -74,7 +76,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
         target: params.target,
         section_code: params.section_code
       },
-      { pisell2: true, headers }
+      { pisell2: true, isPisell2: true, prefix: false, headers }
     );
     if ((response == null ? void 0 : response.status) === false) {
       throw new Error((response == null ? void 0 : response.message) || "获取 OpenData 配置失败");

package/lib/modules/Order/index.d.ts

@@ -149,6 +149,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private updateTempOrderPaymentStatus;
     private shouldKeepPaymentStatusAfterAmountRecalc;
     private resolveWalletPassUseValue;
+    private adjustVoucherFundRecord;
     private capVoucherPaymentsByRemainingAmount;
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
@@ -300,6 +301,14 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
+    buildCurrentSubmitPayloadForLocalPrint(params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+    }): import("./types").OrderSubmitPayload;
+    applyLocalPrintOrderNumbers(order?: Record<string, any> | null): Promise<OrderTempOrder>;
     /**
      * 提交当前 Sales tempOrder。
      *

package/lib/modules/Order/index.js

@@ -826,6 +826,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return payment.wallet_pass_use_value;
     return amount.div(price).times(points).toDecimalPlaces(2).toFixed(2);
   }
+  adjustVoucherFundRecord(params) {
+    var _a;
+    const fundRecord = params.voucher.fund_record && typeof params.voucher.fund_record === "object" && !Array.isArray(params.voucher.fund_record) ? { ...params.voucher.fund_record } : null;
+    if (!fundRecord || fundRecord.using_before_value === void 0 || fundRecord.using_before_value === null) {
+      return fundRecord || void 0;
+    }
+    const code = String(params.voucher.code || "").toUpperCase();
+    const isPointCard = code === "POINTCARD" || String(((_a = params.voucher.fund_record) == null ? void 0 : _a.tag) || "").toLowerCase() === "point_card";
+    const usingValue = isPointCard ? new import_decimal.default(params.walletPassUseValue || 0) : params.amount;
+    fundRecord.using_after_value = new import_decimal.default(fundRecord.using_before_value || 0).minus(usingValue).toDecimalPlaces(2).toFixed(2);
+    return fundRecord;
+  }
   capVoucherPaymentsByRemainingAmount(params) {
     const targetAmount = this.getPaymentTargetAmount();
     const nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
@@ -844,14 +856,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         continue;
       const cappedAmount = import_decimal.default.min(voucherAmount, remainingAmount);
       const amountText = cappedAmount.toDecimalPlaces(2).toFixed(2);
+      const walletPassUseValue = this.resolveWalletPassUseValue(
+        voucher,
+        cappedAmount
+      );
       cappedVouchers.push({
         ...voucher,
         amount: amountText,
         origin_amount: amountText,
-        wallet_pass_use_value: this.resolveWalletPassUseValue(
+        wallet_pass_use_value: walletPassUseValue,
+        fund_record: this.adjustVoucherFundRecord({
           voucher,
-          cappedAmount
-        )
+          amount: cappedAmount,
+          walletPassUseValue
+        })
       });
       remainingAmount = remainingAmount.minus(cappedAmount);
     }
@@ -2509,6 +2527,44 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder;
   }
   // ─── TempOrder: 提交 ───
+  buildCurrentSubmitPayloadForLocalPrint(params) {
+    var _a, _b, _c;
+    const tempOrder = this.ensureTempOrder();
+    this.persistTempOrder();
+    const payload = (0, import_utils.buildSubmitPayload)({
+      tempOrder,
+      cacheId: (params == null ? void 0 : params.cacheId) ?? this.cacheId,
+      platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
+      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      channel: params == null ? void 0 : params.channel,
+      type: params == null ? void 0 : params.type,
+      enhance: (nextPayload) => ({
+        ...nextPayload,
+        order_number: tempOrder.order_number ?? nextPayload.order_number ?? null,
+        shop_order_number: tempOrder.shop_order_number ?? nextPayload.shop_order_number ?? null,
+        shop_full_order_number: tempOrder.shop_full_order_number ?? nextPayload.shop_full_order_number ?? null,
+        small_ticket_data_flag: 1
+      })
+    });
+    payload.created_at = void 0;
+    return payload;
+  }
+  async applyLocalPrintOrderNumbers(order) {
+    const tempOrder = this.ensureTempOrder();
+    if (!order || typeof order !== "object")
+      return tempOrder;
+    const shopOrderNumber = order.shop_order_number;
+    const shopFullOrderNumber = order.shop_full_order_number;
+    if (shopOrderNumber !== void 0 && shopOrderNumber !== null && shopOrderNumber !== "") {
+      tempOrder.shop_order_number = String(shopOrderNumber);
+    }
+    if (shopFullOrderNumber !== void 0 && shopFullOrderNumber !== null && shopFullOrderNumber !== "") {
+      tempOrder.shop_full_order_number = String(shopFullOrderNumber);
+    }
+    this.persistTempOrder();
+    await this.saveDraft();
+    return tempOrder;
+  }
   /**
    * 提交当前 Sales tempOrder。
    *

package/lib/modules/Order/types.d.ts

@@ -456,6 +456,7 @@ export interface OrderPaymentData {
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
     wallet_pass_use_value?: string | number | null;
+    fund_record?: Record<string, any>;
     metadata: OrderPaymentMetadata;
     rounding_amount?: string;
     service_charge?: {
@@ -477,6 +478,7 @@ export interface LoadSalesDetailParams {
     externalSaleNumber?: string;
     external_sale_number?: string;
     forceRemote?: boolean;
+    merge?: boolean;
 }
 export interface SalesOrderLookupParams {
     lookup: number | string;
@@ -597,6 +599,14 @@ export interface OrderModuleAPI {
     getOrderSnapshot: () => OrderSnapshot | null;
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
+    buildCurrentSubmitPayloadForLocalPrint: (params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+    }) => OrderSubmitPayload;
+    applyLocalPrintOrderNumbers: (order?: Record<string, any> | null) => Promise<OrderTempOrder>;
     getTempOrderNote: () => string;
     updateTempOrderNote: {
         (note: string): string;

package/lib/modules/Order/utils.js

@@ -748,9 +748,9 @@ function buildSubmitPayload(params) {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || "Select a customer",
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
+    order_number: tempOrder.order_number ?? null,
+    shop_order_number: tempOrder.shop_order_number ?? null,
+    shop_full_order_number: tempOrder.shop_full_order_number ?? null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: submitType,
@@ -825,6 +825,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     ...item.payment_time !== void 0 ? { payment_time: item.payment_time } : {},
     ...item.wallet_pass_usage_unit !== void 0 ? { wallet_pass_usage_unit: item.wallet_pass_usage_unit } : {},
     ...item.wallet_pass_use_value !== void 0 ? { wallet_pass_use_value: item.wallet_pass_use_value } : {},
+    ...item.fund_record && typeof item.fund_record === "object" && !Array.isArray(item.fund_record) ? { fund_record: { ...item.fund_record } } : {},
     metadata,
     ...item.rounding_amount !== void 0 ? { rounding_amount: String(item.rounding_amount) } : {},
     ...item.service_charge !== void 0 ? { service_charge: item.service_charge } : {},

package/lib/server/index.d.ts

@@ -37,6 +37,8 @@ declare class Server {
     private bookingRemoteCache;
     private readonly BOOKING_REMOTE_CACHE_TTL_MS;
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
+    private salesSearchSubscribers;
+    private deviceTaskActionsRegistered;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -89,6 +91,8 @@ declare class Server {
         config: ModuleRegistryConfig;
         shouldPreload: boolean;
     }[]>;
+    private registerDeviceTaskActions;
+    private handleSyncSalesTask;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
      */
@@ -200,6 +204,84 @@ declare class Server {
      * 取消订单列表查询订阅（HTTP 路由入口）
      */
     private handleUnsubscribeOrderQuery;
+    /**
+     * 处理 sales 单模块搜索：请求透传后端，仅在 OS 层维护已返回订单号集合。
+     *
+     * @example
+     * await this.handleSalesSearchModule({ url: '/shop/es/search/sales', method: 'post', data: { keyword: 'A' } })
+     */
+    private handleSalesSearchModule;
+    /**
+     * 处理 sales 聚合搜索：请求透传后端，仅订阅 sales 分组的已返回订单号。
+     *
+     * @example
+     * await this.handleSalesSearchAggregate({ url: '/shop/es/search', method: 'post', data: { modules: [] } })
+     */
+    private handleSalesSearchAggregate;
+    /**
+     * 取消 sales 搜索订阅。
+     *
+     * @example
+     * await this.handleUnsubscribeSalesSearch({ data: { subscriberId: 'global-search-order' } } as any)
+     */
+    private handleUnsubscribeSalesSearch;
+    /**
+     * 执行 sales 搜索并登记可见订单号。
+     * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
+     *
+     * @example
+     * const result = await this.handleSalesSearchRequest('single', '/shop/es/search/sales', { keyword: '1001' }, {})
+     */
+    private handleSalesSearchRequest;
+    /**
+     * 透传调用后端 sales 搜索接口。
+     *
+     * @example
+     * const res = await this.fetchSalesSearchFromAPI('/shop/es/search/sales', { keyword: '1001' })
+     */
+    private fetchSalesSearchFromAPI;
+    /**
+     * 构建搜索订阅签名；页码变化不重置，可继续累计 visibleOrderIds。
+     *
+     * @example
+     * const signature = this.buildSalesSearchSignature('single', { keyword: 'A', page: 2 })
+     */
+    private buildSalesSearchSignature;
+    /**
+     * 移除页码参数，保留 page size、keyword、filters、sort 等查询语义参数。
+     *
+     * @example
+     * this.stripSalesSearchPageParams({ page: 2, per_page: 20, keyword: 'A' })
+     */
+    private stripSalesSearchPageParams;
+    /**
+     * 提取响应 data，兼容 OS 包装结构与后端直接响应结构。
+     *
+     * @example
+     * const data = this.extractSalesSearchResponseData(result)
+     */
+    private extractSalesSearchResponseData;
+    /**
+     * 从搜索响应中提取 sales 命中的订单号。
+     *
+     * @example
+     * const ids = this.extractSalesSearchOrderIds('single', result)
+     */
+    private extractSalesSearchOrderIds;
+    /**
+     * 查找聚合搜索响应中的 sales 分组。
+     *
+     * @example
+     * const group = this.findSalesSearchAggregateGroup({ results: [{ module: 'sales' }] })
+     */
+    private findSalesSearchAggregateGroup;
+    /**
+     * 从订单或搜索命中项中取订单号。
+     *
+     * @example
+     * const id = this.getSalesSearchOrderId({ order_id: 1001 })
+     */
+    private getSalesSearchOrderId;
     /**
      * 从查询值中提取 YYYY-MM-DD 日期串。
      *
@@ -292,9 +374,33 @@ declare class Server {
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
     private handleOrderCheckout;
+    private getDeviceTaskPlugin;
+    private getIdGeneratorPlugin;
+    private getAppData;
+    private getSmallTicketShopInfo;
+    private taskOk;
+    private taskFail;
+    private taskTimeout;
+    private resolveCheckoutTaskDeviceId;
+    private buildCheckoutTaskIdempotencyKey;
+    private ensureCheckoutOrderNumbers;
+    private dispatchCheckoutSyncTask;
+    private dispatchPrintOtherReceiptTask;
+    private buildPrintOtherReceiptIdempotencyKey;
+    private getPrintOrderIdentity;
+    private dispatchLocalReceiptPrint;
+    private handleLocalPrintOrder;
     private handleOrderCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    private shouldBuildSmallTicketData;
+    private shouldPrintSyncedOrder;
+    private hasPaymentStatus;
+    private isSalesOrderFullyPaid;
+    private sumPaidOrderPayments;
+    private toAmountNumber;
+    private buildSmallTicketProductMap;
+    private withLocalSmallTicketData;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -327,6 +433,7 @@ declare class Server {
     private buildOrderSalesDetailBackendPath;
     private extractOrderDataFromCheckoutResponse;
     private normalizeCheckoutResponse;
+    private isCheckoutResponseRejected;
     private extractBackendErrorResponse;
     private isExplicitBackendErrorResponse;
     /**
@@ -383,6 +490,35 @@ declare class Server {
      * 订单数据变更后，遍历订阅者重新计算并通过 callback 推送
      */
     private recomputeAndNotifyOrderQuery;
+    /**
+     * 订单变更后通知 sales 搜索订阅者。
+     * 仅回传当前查询已返回订单号集合中的变更订单。
+     *
+     * @example
+     * this.notifySalesSearchSubscribers({ list: [], changedOrders: [order], source: 'pubsub.bodyUpsert' })
+     */
+    private notifySalesSearchSubscribers;
+    /**
+     * 从订单变更事件中提取明确 delta。
+     *
+     * @example
+     * const list = this.extractChangedOrdersFromPayload(payload)
+     */
+    private extractChangedOrdersFromPayload;
+    /**
+     * 构建与当前搜索接口一致的 delta 响应。
+     *
+     * @example
+     * const response = this.buildSalesSearchDeltaResponse(subscriber, [order])
+     */
+    private buildSalesSearchDeltaResponse;
+    /**
+     * 构建聚合搜索接口的 sales 分组 delta 响应。
+     *
+     * @example
+     * const response = this.buildAggregateSalesSearchDeltaResponse(subscriber, [order])
+     */
+    private buildAggregateSalesSearchDeltaResponse;
     /**
      * 预约数据变更后，遍历订阅者重新计算并通过 callback 推送
      */