@pisell/pisellos 0.10.8 → 0.10.9

package/lib/modules/Payment/walletpass.js

@@ -52,6 +52,25 @@ function normalizeWalletAssetCode(code) {
 function getWalletAssetCodeKeys(asset) {
   return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
 }
+function withWalletAssetRecalculationBaseAmount(asset) {
+  const existingBaseAmount = Number(
+    asset == null ? void 0 : asset._wallet_asset_recalculation_base_amount
+  );
+  if (Number.isFinite(existingBaseAmount) && existingBaseAmount >= 0) {
+    return asset;
+  }
+  if (!["product_voucher", "gift_card"].includes(asset == null ? void 0 : asset.tag)) {
+    return asset;
+  }
+  const balanceParValue = Number(asset == null ? void 0 : asset.balance_par_value);
+  if (!Number.isFinite(balanceParValue) || balanceParValue < 0) {
+    return asset;
+  }
+  return {
+    ...asset,
+    _wallet_asset_recalculation_base_amount: balanceParValue
+  };
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -90,6 +109,16 @@ function mergeWalletAssets(...groups) {
   });
   return merged;
 }
+function orderWalletAssetsByIds(assets, orderedIds) {
+  const assetByKey = new Map(
+    assets.map((asset) => [getWalletAssetKey(asset), asset])
+  );
+  const orderedKeys = new Set(orderedIds.map((id) => String(id)));
+  return [
+    ...orderedIds.map((id) => assetByKey.get(String(id))).filter((asset) => asset !== void 0),
+    ...assets.filter((asset) => !orderedKeys.has(getWalletAssetKey(asset)))
+  ];
+}
 function createInitialWalletAssetsState() {
   return {
     status: "idle",
@@ -222,6 +251,42 @@ var WalletPassPaymentImpl = class {
       error: null
     });
   }
+  /**
+   * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+   * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+   */
+  formatSearchedWalletPaymentAssets(assets) {
+    var _a, _b, _c, _d;
+    if (!assets.length)
+      return assets;
+    const assetsWithRecalculationBase = assets.map(
+      withWalletAssetRecalculationBaseAmount
+    );
+    const evaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+    if (!(evaluator == null ? void 0 : evaluator.searchVoucherFormat))
+      return assetsWithRecalculationBase;
+    const hasCalculationProducts = this.walletAssetsCalculationContext.products.length > 0;
+    const products = hasCalculationProducts ? this.walletAssetsCalculationContext.products : ((_c = this.walletParams) == null ? void 0 : _c.products) || [];
+    const orderTotalAmount = Number(
+      hasCalculationProducts ? this.walletAssetsCalculationContext.orderTotalAmount : ((_d = this.walletParams) == null ? void 0 : _d.order_wait_pay_amount) || 0
+    );
+    try {
+      const formattedAssets = evaluator.searchVoucherFormat({
+        orderTotalAmount,
+        products,
+        vouchers: assetsWithRecalculationBase
+      });
+      return formattedAssets;
+    } catch (error) {
+      this.paymentModule.logWarning(
+        "[WalletPass] 搜索资产策略格式化失败，保留接口结果",
+        {
+          error: error instanceof Error ? error.message : String(error)
+        }
+      );
+      return assetsWithRecalculationBase;
+    }
+  }
   /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
   getSearchedWalletAssetCodes() {
     const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
@@ -245,11 +310,23 @@ var WalletPassPaymentImpl = class {
     );
     if (searchedCodeKeys.size === 0)
       return cachedAssets;
+    const cachedAssetByCode = /* @__PURE__ */ new Map();
+    cachedAssets.forEach((item) => {
+      getWalletAssetCodeKeys(item).forEach((code) => {
+        cachedAssetByCode.set(code, item);
+      });
+    });
     const refreshedAssets = refreshedCandidates.filter(
       (item) => isWalletPaymentAsset(item) && searchedCodeKeys.has(
         String((item == null ? void 0 : item.code) || "").trim().toUpperCase()
       )
-    );
+    ).map((item) => {
+      const cachedAsset = getWalletAssetCodeKeys(item).map((code) => cachedAssetByCode.get(code)).find(Boolean);
+      return withWalletAssetRecalculationBaseAmount({
+        ...cachedAsset,
+        ...item
+      });
+    });
     if (refreshedAssets.length > 0) {
       const replacedCodes = new Set(
         refreshedAssets.map(
@@ -321,6 +398,10 @@ var WalletPassPaymentImpl = class {
       payment_order_id
     };
     this.walletParams = walletParams;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: Number(walletParams.order_wait_pay_amount || 0),
+      products: Array.isArray(walletParams.products) ? walletParams.products : []
+    };
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
       holder_id: walletParams.holder_id,
@@ -472,7 +553,6 @@ var WalletPassPaymentImpl = class {
         vouchers: allList
       });
       const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
       this.walletRecommendList = recommended;
       this.walletInitData = {
         transformList,
@@ -535,8 +615,12 @@ var WalletPassPaymentImpl = class {
     const customerWalletPassList = Array.isArray(
       responseData == null ? void 0 : responseData.customer_wallet_pass_list
     ) ? responseData.customer_wallet_pass_list : [];
-    const allList = mergeWalletAssets(
+    const orderedRecalculateList = orderWalletAssetsByIds(
       recalculateList,
+      selectedIds
+    );
+    const allList = mergeWalletAssets(
+      orderedRecalculateList,
       customerWalletPassList
     );
     const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
@@ -552,7 +636,7 @@ var WalletPassPaymentImpl = class {
       )
     };
     const returnedSelectedKeys = new Set(
-      recalculateList.filter(isWalletAssetAvailable).map((item) => getWalletAssetKey(item))
+      allList.map((item) => getWalletAssetKey(item))
     );
     const authoritativeSelectedIds = selectedIds.filter(
       (id) => returnedSelectedKeys.has(String(id))
@@ -830,6 +914,17 @@ var WalletPassPaymentImpl = class {
       const assetId = getWalletAssetId(asset);
       return assetId !== void 0 && assetId !== null && selectionSources[String(assetId)] === "scan";
     }) : [];
+    const manualEditAmountByKey = /* @__PURE__ */ new Map();
+    if (preserveSelection) {
+      this.walletAssetsState.selectedItems.forEach((asset) => {
+        if (typeof (asset == null ? void 0 : asset.edit_current_amount) !== "number")
+          return;
+        manualEditAmountByKey.set(
+          getWalletAssetKey(asset),
+          asset.edit_current_amount
+        );
+      });
+    }
     if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
       this.queuePendingAutoSelectForAssets(scanSelectedAssets);
       this.generateWalletParams(businessData);
@@ -928,12 +1023,16 @@ var WalletPassPaymentImpl = class {
         searchedWalletAssets,
         result.transformList || [],
         result.noApplicableVoucher || []
-      ).map((asset) => ({
-        ...asset,
-        _wallet_asset_recommended: recommendedKeys.has(
-          getWalletAssetKey(asset)
-        )
-      }));
+      ).map((asset) => {
+        const assetKey = getWalletAssetKey(asset);
+        return {
+          ...asset,
+          ...manualEditAmountByKey.has(assetKey) ? {
+            edit_current_amount: manualEditAmountByKey.get(assetKey)
+          } : {},
+          _wallet_asset_recommended: recommendedKeys.has(assetKey)
+        };
+      });
       const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
       const pendingAutoSelectAssets = this.walletAssetsBehavior.autoSelectAfterSearch ? items.filter(
@@ -1047,6 +1146,13 @@ var WalletPassPaymentImpl = class {
       selectionSources: snapshot.state.selectionSources || {}
     });
   }
+  updateWalletAssetEditAmountInCaches(assetKey, amount) {
+    const updateAsset = (asset) => getWalletAssetKey(asset) === assetKey ? { ...asset, edit_current_amount: amount } : asset;
+    this.searchResults = this.searchResults.map(
+      updateAsset
+    );
+    return this.walletAssetsState.items.map(updateAsset);
+  }
   selectWalletAsset(assetId, options) {
     const assetKey = String(assetId);
     const asset = this.walletAssetsState.items.find(
@@ -1062,6 +1168,7 @@ var WalletPassPaymentImpl = class {
     );
     const selectionSources = { ...this.walletAssetsState.selectionSources };
     delete selectionSources[assetKey];
+    let nextItems = this.walletAssetsState.items;
     if (options.selected) {
       if (!asset || !isWalletAssetAvailable(asset)) {
         return this.getWalletAssetsState();
@@ -1070,9 +1177,13 @@ var WalletPassPaymentImpl = class {
       selectionSources[assetKey] = options.source || "manual";
     } else if (asset) {
       this.clearPendingAutoSelectForAsset(asset);
+      nextItems = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
     }
     const nextState = this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      nextItems,
       selectedIds,
       selectionSources
     );
@@ -1081,6 +1192,54 @@ var WalletPassPaymentImpl = class {
     }
     return nextState;
   }
+  /**
+   * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+   * 金额为 0 时沿用 legacy 行为取消选择。
+   */
+  updateWalletAssetAmount(assetId, amount) {
+    const assetKey = String(assetId);
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const asset = this.walletAssetsState.items.find(
+      (item) => getWalletAssetKey(item) === assetKey
+    );
+    const requestedAmount = Number(amount);
+    if (!asset || committedKeys.has(assetKey) || !selectedKeys.has(assetKey) || !Number.isFinite(requestedAmount) || requestedAmount < 0) {
+      return this.getWalletAssetsState();
+    }
+    const selectedIds = [...this.walletAssetsState.selectedIds];
+    const selectionSources = { ...this.walletAssetsState.selectionSources };
+    if (requestedAmount === 0) {
+      const nextItems2 = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
+      delete selectionSources[assetKey];
+      this.clearPendingAutoSelectForAsset(asset);
+      return this.recalculateWalletAssets(
+        nextItems2,
+        selectedIds.filter((id) => String(id) !== assetKey),
+        selectionSources
+      );
+    }
+    const currentDeductionAmount = getWalletAssetDeductionAmount(asset);
+    const editAmount = Math.min(requestedAmount, currentDeductionAmount);
+    if (editAmount <= 0)
+      return this.getWalletAssetsState();
+    const nextItems = this.updateWalletAssetEditAmountInCaches(
+      assetKey,
+      editAmount
+    );
+    return this.recalculateWalletAssets(
+      nextItems,
+      selectedIds,
+      selectionSources
+    );
+  }
   async scanWalletAssetAsync(code) {
     const normalizedCode = String(code || "").trim();
     if (!normalizedCode) {
@@ -1109,7 +1268,15 @@ var WalletPassPaymentImpl = class {
         this.walletAssetsState.selectedItems
       )
     });
-    const paymentAssets = result.data.filter(isWalletPaymentAsset);
+    const paymentAssets = this.formatSearchedWalletPaymentAssets(
+      result.data.filter(isWalletPaymentAsset)
+    );
+    if (paymentAssets.length > 0) {
+      this.searchResults = mergeWalletAssets(
+        this.searchResults,
+        paymentAssets
+      );
+    }
     const asset = paymentAssets.find(
       (item) => String((item == null ? void 0 : item.code) || "") === normalizedCode
     ) || paymentAssets[0];
@@ -1128,30 +1295,44 @@ var WalletPassPaymentImpl = class {
       this.walletAssetsState.selectionSources
     );
     const assetId = getWalletAssetId(asset);
-    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+    const recalculatedAsset = assetId === void 0 ? void 0 : recalculatedState.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(recalculatedAsset) ? this.selectWalletAsset(assetId, {
       selected: true,
       source: "scan"
     }) : recalculatedState;
     const isSelected = assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId));
+    const selectedStateAsset = assetId === void 0 ? void 0 : selected.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const resolvedAsset = selectedStateAsset || recalculatedAsset || asset;
     if (isSelected) {
-      this.clearPendingAutoSelectForAsset(asset);
+      this.clearPendingAutoSelectForAsset(resolvedAsset);
     } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
       this.pendingAutoSelectSearchCodes.add(
         normalizeWalletAssetCode(normalizedCode)
       );
-      this.queuePendingAutoSelectForAssets([asset]);
+      this.queuePendingAutoSelectForAssets([resolvedAsset]);
     }
     return {
       type: result.type,
-      asset,
+      asset: resolvedAsset,
       selected: isSelected,
       state: selected
     };
   }
   clearWalletAssetSelection() {
     this.pendingAutoSelectSearchCodes.clear();
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const clearSelectedEditAmount = (asset) => selectedKeys.has(getWalletAssetKey(asset)) ? { ...asset, edit_current_amount: void 0 } : asset;
+    this.searchResults = this.searchResults.map(
+      clearSelectedEditAmount
+    );
     return this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      this.walletAssetsState.items.map(clearSelectedEditAmount),
       [],
       {}
     );

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

@@ -23,12 +23,25 @@ export interface ProductDataVariant {
     module_data_id: number;
     /** 关联 data_variant_rule.id */
     data_variant_rule_id: number;
+    /** 多货币结算等业务类型 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at: string | null;
     updated_at: string | null;
     deleted_at: string | null;
 }
+export interface ProductSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 商品基本信息接口
  */
@@ -61,6 +74,8 @@ export interface ProductData {
     sum_stock: number;
     /** 商品价格 */
     price: string;
+    /** 当前上下文解析出的可选结算货币 */
+    available_settlement_options?: ProductSettlementOption[];
     /** 商品原价 */
     original_price: string;
     /** 商品成本价 */
@@ -237,6 +252,14 @@ export interface ProductData {
     option_group_count: number;
     /** 智能定价变体列表，/product/query with dataVariants 返回 */
     data_variants?: ProductDataVariant[];
+    /**
+     * 商品接口规则计算结果；data_variant_ids 按优先级从高到低排列。
+     * 空数组表示规则已经计算完成但没有命中 Data Variant。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -18,6 +18,19 @@ export declare class ProductList extends BaseModule implements Module {
      * productList.updateOtherParams({ channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 判断当前商品查询是否会被本地 OS Server 接管。
+     *
+     * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
+     * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
+     * Data Variant 评估。
+     */
+    private isProductQueryHandledByOsServer;
+    /**
+     * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+     * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+     */
+    private resolveClientDataVariants;
     storeChange(path?: string, value?: any): Promise<void>;
     /**
      * 获取加时商品列表。
@@ -25,11 +38,11 @@ export declare class ProductList extends BaseModule implements Module {
      * @example
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
-    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<ProductData[]>;
     loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
         customer_id?: number;

package/lib/modules/ProductList/index.js

@@ -67,6 +67,62 @@ var ProductList = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  /**
+   * 判断当前商品查询是否会被本地 OS Server 接管。
+   *
+   * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
+   * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
+   * Data Variant 评估。
+   */
+  isProductQueryHandledByOsServer() {
+    var _a, _b;
+    const server = (_a = this.core) == null ? void 0 : _a.server;
+    if (!server || typeof server.hasRoute !== "function")
+      return false;
+    const requestBaseUrl = String(
+      ((_b = this.request) == null ? void 0 : _b.baseUrl) || "/shop"
+    ).replace(/\/+$/, "");
+    const routePath = `${requestBaseUrl}/product/query`;
+    return server.hasRoute("post", routePath) === true;
+  }
+  /**
+   * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+   * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+   */
+  resolveClientDataVariants(products, queryPayload, handledByOsServer) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    if (handledByOsServer || products.length === 0)
+      return products;
+    const evaluator = (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator;
+    if (!evaluator || typeof evaluator.resolveProducts !== "function") {
+      return products;
+    }
+    const strategyContext = queryPayload.strategy_context && typeof queryPayload.strategy_context === "object" ? queryPayload.strategy_context : {};
+    const fatherModule = String(((_c = this.otherParams) == null ? void 0 : _c.fatherModule) || "").trim();
+    const scheduleModule = (fatherModule ? this.core.getModule(`${fatherModule}_schedule`) : null) || this.core.getModule("schedule");
+    const scheduleList = (_d = scheduleModule == null ? void 0 : scheduleModule.getScheduleList) == null ? void 0 : _d.call(scheduleModule);
+    const contextScheduleList = (_f = (_e = this.core) == null ? void 0 : _e.context) == null ? void 0 : _f.scheduleList;
+    const contextMenuList = (_h = (_g = this.core) == null ? void 0 : _g.context) == null ? void 0 : _h.menuList;
+    const businessData = {
+      products,
+      scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
+      scheduleList: Array.isArray(scheduleList) ? scheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
+      menuList: Array.isArray((_i = this.otherParams) == null ? void 0 : _i.menuList) ? this.otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
+      customerId: queryPayload.customer_id,
+      channel: strategyContext.channel,
+      orderType: strategyContext.orderType || strategyContext.order_type,
+      businessCode: strategyContext.business_code ?? strategyContext.businessCode,
+      availableWalletIds: strategyContext.available_wallet_ids,
+      custom: strategyContext
+    };
+    try {
+      const result = evaluator.resolveProducts(businessData);
+      return Array.isArray(result == null ? void 0 : result.products) ? result.products : products;
+    } catch (error) {
+      console.error("[ProductList] Data Variant 客户端解析失败", error);
+      return products;
+    }
+  }
   async storeChange(path, value) {
   }
   /**
@@ -151,15 +207,41 @@ var ProductList = class extends import_BaseModule.BaseModule {
       is_eject: 1,
       with_schedule,
       schedule_datetime,
-      extension_type
+      extension_type,
+      strategy_context
     };
+    const handledByOsServer = this.isProductQueryHandledByOsServer();
+    const callback = !handledByOsServer && typeof (options == null ? void 0 : options.callback) === "function" ? (result) => {
+      var _a2, _b2, _c;
+      const callbackList = (_a2 = result == null ? void 0 : result.data) == null ? void 0 : _a2.list;
+      if (!Array.isArray(callbackList)) {
+        (_b2 = options.callback) == null ? void 0 : _b2.call(options, result);
+        return;
+      }
+      (_c = options.callback) == null ? void 0 : _c.call(options, {
+        ...result,
+        data: {
+          ...result.data,
+          list: this.resolveClientDataVariants(
+            callbackList,
+            queryPayload,
+            false
+          )
+        }
+      });
+    } : options == null ? void 0 : options.callback;
     const productsData = await this.request.post(
       `/product/query`,
       queryPayload,
-      { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
+      { osServer: true, callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }
     );
-    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    const resolvedList = this.resolveClientDataVariants(
+      productsData.data.list || [],
+      queryPayload,
+      handledByOsServer
+    );
+    const sortedList = resolvedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     this.addProduct(sortedList);
     return sortedList;
   }

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

@@ -30,6 +30,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/lib/modules/SalesSummary/index.js

@@ -126,7 +126,14 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   }
   async getSummary(params) {
     var _a, _b;
-    const { products = [], isPriceIncludeTax, taxRate, shopDiscount, channel } = params;
+    const {
+      products = [],
+      isPriceIncludeTax,
+      taxRate,
+      shopDiscount,
+      channel,
+      virtualSettlementMode = false
+    } = params;
     const summaryChannel = channel || this.resolveChannel();
     if (summaryChannel !== this.surchargeListChannel) {
       await this.getSurchargeList(summaryChannel);
@@ -150,7 +157,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
       surchargeList: this.store.surchargeList,
       scheduleById,
       isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate,
-      shopDiscount
+      shopDiscount,
+      virtualSettlementMode
     });
     const summaryWithTaxMeta = {
       ...summary,

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

@@ -64,5 +64,6 @@ export interface SalesSummaryModuleAPI {
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<SalesSummaryData>;
 }

package/lib/modules/SalesSummary/utils.d.ts

@@ -8,4 +8,5 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
+    virtualSettlementMode?: boolean;
 }): SalesSummaryData;

package/lib/modules/SalesSummary/utils.js

@@ -890,13 +890,37 @@ function calculateSalesSummary(params) {
     surchargeList,
     scheduleById = {},
     isInScheduleByDate,
-    shopDiscount
+    shopDiscount,
+    virtualSettlementMode = false
   } = params;
   if (!(products == null ? void 0 : products.length))
     return createEmptySalesSummary();
   const summaryProducts = products.filter((product) => !isGeneratedVoucherProduct(product));
   if (!summaryProducts.length)
     return createEmptySalesSummary();
+  if (virtualSettlementMode) {
+    const productQuantity2 = summaryProducts.reduce(
+      (sum, item) => sum + getSafeNum(item.num),
+      0
+    );
+    const productAmount2 = summaryProducts.reduce(
+      (sum, item) => sum.plus(
+        toDecimal(item.selling_price).times(getSafeNum(item.num))
+      ),
+      new import_decimal.default(0)
+    );
+    const amount = toFixed2(productAmount2);
+    return {
+      ...createEmptySalesSummary(),
+      product_quantity: productQuantity2,
+      product_original_amount: amount,
+      product_amount: amount,
+      product_expect_amount: amount,
+      expect_amount: amount,
+      total_amount: amount,
+      is_price_include_tax: isPriceIncludeTax
+    };
+  }
   const productQuantity = summaryProducts.reduce(
     (sum, item) => sum + getSafeNum(item.num),
     0

package/lib/server/index.d.ts

@@ -263,6 +263,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */
@@ -518,6 +523,10 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+     */
+    private shouldAutoPrintCheckoutReceipt;
     private shouldBuildSmallTicketData;
     private shouldPrintSyncedOrder;
     private hasPaymentStatus;