@pisell/pisellos 2.2.268 → 2.2.269

package/lib/solution/BaseSales/types.d.ts

@@ -3,6 +3,7 @@ import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrde
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
+import type { PaymentMethod } from '../../modules/Payment/types';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -16,11 +17,62 @@ export declare const BaseSalesHookNames: {
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
     readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
+    readonly onWalletAssetsStateChanged: "onWalletAssetsStateChanged";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | string;
+export interface BaseSalesCashPaymentConfig {
+    available: boolean;
+    paymentMethod?: PaymentMethod;
+    amountDue: number;
+    recommendedAmounts: number[];
+}
+export interface BaseSalesPayCashParams {
+    /** 实际计入订单的现金支付金额（部分支付时小于待付金额）。 */
+    amount: number;
+    /** 顾客实际交付现金；可大于 amount。 */
+    actualPaidAmount?: number;
+    changeAmount?: number;
+    roundingAmount?: number;
+}
+export interface BaseSalesPayCashResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesCommitPaymentMethodParams {
+    /** 支付方式 id；与 paymentMethodCode 至少传一个。 */
+    paymentMethodId?: number | string;
+    /** 支付方式 code，大小写不敏感。 */
+    paymentMethodCode?: string;
+    /** 本次计入订单的支付金额。 */
+    amount: number;
+    /** 支付设备返回的原始金额；缺省时与 amount 相同。 */
+    originAmount?: number;
+    /** 支付设备返回的实际手续费配置。 */
+    serviceCharge?: {
+        amount?: string | number;
+        percentage?: string | number;
+    } | null;
+    /** 支付设备返回的唯一流水号等扩展信息。 */
+    metadata?: Record<string, any>;
+    /** 少数支付方式需要透传的额外 payment 字段。 */
+    paymentData?: Record<string, any>;
+}
+export interface BaseSalesCommitPaymentMethodResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesConfirmWalletPaymentResult<T = Record<string, any>> {
+    submitResult: T;
+    payments: Record<string, any>[];
+    isOrderFullyPaid: boolean;
+}
 export interface BaseSalesEntryContext {
     biz: string;
     mode: 'scan' | 'append';
@@ -387,8 +439,10 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
+    isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
     scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/types.js

@@ -31,7 +31,8 @@ var BaseSalesHookNames = {
   onCartValidationChanged: "onCartValidationChanged",
   onPaymentSyncStart: "onPaymentSyncStart",
   onPaymentSyncEnd: "onPaymentSyncEnd",
-  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd"
+  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd",
+  onWalletAssetsStateChanged: "onWalletAssetsStateChanged"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,6 +78,7 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
+    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -267,7 +268,8 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -77,19 +77,43 @@ function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
-function updatePromotionDiscountList(item, promotionDiscount) {
+var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+var ITEM_REWARD = "ITEM_REWARD";
+function isItemRewardPromotionDiscountItem(item) {
+  var _a, _b;
+  return (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === ITEM_REWARD;
+}
+function isManagedPromotionDiscountItem(item) {
+  if ((item == null ? void 0 : item.type) === "promotion")
+    return true;
+  return isItemRewardPromotionDiscountItem(item);
+}
+function wasInPromotionBeforeEvaluation(item) {
+  var _a, _b;
+  if (((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true)
+    return true;
+  return Array.isArray(item == null ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
+}
+function updatePromotionDiscountList(item, promotionDiscount, options) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => (d == null ? void 0 : d.type) !== "promotion");
+  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
   if (promotionDiscount) {
+    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
     discountList.push({
-      type: "promotion",
+      type: discountType,
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
         resource_id: ""
-      }
+      },
+      ...discountType === "product" ? {
+        metadata: {
+          source: "promotion",
+          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
+        }
+      } : {}
     });
   }
   if (discountList.length > 0) {
@@ -98,7 +122,15 @@ function updatePromotionDiscountList(item, promotionDiscount) {
     delete item.discount_list;
   }
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+function evaluatorHasActionType(evaluator, actionType) {
+  var _a;
+  const configs = (_a = evaluator == null ? void 0 : evaluator.getStrategyConfigs) == null ? void 0 : _a.call(evaluator);
+  if (!Array.isArray(configs))
+    return false;
+  return configs.some(
+    (config) => ((config == null ? void 0 : config.actions) || []).some((action) => (action == null ? void 0 : action.type) === actionType)
+  );
+}
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
@@ -125,6 +157,9 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
+    }, {
+      actionType: input.actionType,
+      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -399,14 +434,13 @@ function buildConsolidateKeyForPromotion(item) {
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {
-  var _a, _b;
   if (!Array.isArray(entries) || entries.length <= 1) {
     return [...entries || []];
   }
   const groups = /* @__PURE__ */ new Map();
   for (const { item, originalListIndex } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
-    const wasInPromotion = ((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(item);
     const existing = groups.get(key);
     if (!existing) {
       const mergedItem = (0, import_lodash_es.cloneDeep)(item);
@@ -472,6 +506,9 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + Date.now();
 }
+function isBookingEditProductLine(product) {
+  return (product == null ? void 0 : product.booking_id) !== void 0 && (product == null ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== "0";
+}
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
@@ -484,6 +521,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
+    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -585,6 +623,9 @@ function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === "BUY_X_GET_Y_FREE") {
     return Number(detail.buyQuantity) || 1;
   }
+  if (matched.actionType === "ITEM_REWARD") {
+    return Number(detail.triggerQuantity) || 1;
+  }
   return 1;
 }
 function resolveStrategyEligibleProducts(matched) {
@@ -695,6 +736,10 @@ function processCartPromotion(list, evaluator, options) {
   };
   if (!list || list.length === 0 || !evaluator)
     return empty;
+  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
+    evaluator,
+    ITEM_REWARD
+  );
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -705,8 +750,12 @@ function processCartPromotion(list, evaluator, options) {
       editProductsWithIndex.push({ item, originalListIndex: i });
     } else if (giftInfo) {
       existingGiftsWithIndex.push({ item, originalListIndex: i });
-    } else if ((item == null ? void 0 : item.booking_id) !== void 0 && (item == null ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== "0") {
-      editProductsWithIndex.push({ item, originalListIndex: i });
+    } else if (isBookingEditProductLine(item)) {
+      if (shouldIncludeEditProductsForItemReward) {
+        mainProductsWithIndex.push({ item, originalListIndex: i });
+      } else {
+        editProductsWithIndex.push({ item, originalListIndex: i });
+      }
     } else {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
@@ -749,7 +798,8 @@ function processCartPromotion(list, evaluator, options) {
       name: ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.product_name) || (item == null ? void 0 : item.title) || "",
       price: getOrderProductBasePrice(item),
       quantity: Number((item == null ? void 0 : item.num) ?? 1) || 1,
-      bundle: getProductBundleForEvaluator(item)
+      bundle: getProductBundleForEvaluator(item),
+      _promotionOnlyForItemReward: isBookingEditProductLine(item)
     };
   });
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
@@ -818,7 +868,7 @@ function processCartPromotion(list, evaluator, options) {
     const metadata = newItem.metadata || {};
     const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
-    const wasInPromotion = ((_a = metadata._promotion) == null ? void 0 : _a.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
@@ -835,7 +885,8 @@ function processCartPromotion(list, evaluator, options) {
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
+          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
+          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
         });
       } else {
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -132,14 +132,15 @@ function transformBaseProductToOrderProduct(params) {
     ...callbackOrigin || {}
   };
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
+  const catalogSourcePrice = (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price);
   const sourceProductPrice = toPriceString(
-    payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
+    hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice,
     "0.00"
   );
   const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
       ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -46,6 +46,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;
     getOpenData(): Promise<OpenDataConfig | null>;
+    /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+    clearOpenDataCache(): void;
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
@@ -189,10 +191,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
-    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
+    getProductByIds(ids: number[], options?: {
+        loadMissing?: boolean;
+    }): Promise<ProductData[]>;
     /**
      * 获取日程时间段点
      * @param params 参数
@@ -322,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -441,19 +445,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -219,8 +219,14 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
   }
   async getOpenData() {
+    return this.loadOpenDataConfig();
+  }
+  /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+  clearOpenDataCache() {
     var _a;
-    return (_a = this.store.openData) == null ? void 0 : _a.getOpenData();
+    this.loadOpenDataConfigInFlight = null;
+    this.otherParams.openData = null;
+    (_a = this.store.openData) == null ? void 0 : _a.clearCache();
   }
   async getShortNumberOrDeviceId() {
     const getAsyncIotDeviceInfo = this.getAppData("async_iot_device_info");
@@ -233,6 +239,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return String(this.getAppData("device_id") || 0).slice(-2);
   }
   async configureIdGeneratorFromOpenData() {
+    this.setPaymentNumberDevicePrefix(null);
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -264,6 +271,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const resetReceiptSequenceDaily = typeof (openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"]) === "boolean" ? openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"] : false;
     const operatingDayBoundary = this.getAppData("operating_day_boundary");
     const deviceId = await this.getShortNumberOrDeviceId();
+    this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
     if (!businessCode) {
       console.warn("[BookingTicket] businessCode 缺失，跳过 idGenerator 配置");
@@ -360,6 +368,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return {
       isAvailable: raw.isAvailable,
+      ...raw.isAccepted !== void 0 ? { isAccepted: raw.isAccepted } : {},
       type: raw.type,
       unavailableReason: raw.unavailableReason,
       scannedDiscountList: raw.scannedDiscountList
@@ -714,11 +723,53 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return this.getOrderCustomerSnapshot();
   }
   /**
-   * 通过 ids 获取商品列表（不加载到模块中）
-   * @returns 商品列表
+   * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+   * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
    */
-  async getProductByIds(ids) {
-    return this.store.products.getProductByIds(ids);
+  async getProductByIds(ids, options) {
+    var _a, _b;
+    const normalizedIds = Array.from(
+      new Set(
+        (ids || []).map((id) => Number(id)).filter((id) => Number.isFinite(id))
+      )
+    );
+    const localProducts = await this.store.products.getProductByIds(normalizedIds) || [];
+    if (!(options == null ? void 0 : options.loadMissing)) {
+      return localProducts;
+    }
+    const localProductIds = new Set(
+      localProducts.map((product) => Number(product.id))
+    );
+    const missingIds = normalizedIds.filter(
+      (id) => !localProductIds.has(id)
+    );
+    if (!missingIds.length) {
+      return localProducts;
+    }
+    const rawBookingDate = this.getBookingDate();
+    const bookingDate = rawBookingDate && (0, import_dayjs.default)(rawBookingDate).isValid() ? (0, import_dayjs.default)(rawBookingDate) : null;
+    const customerId = Number(
+      ((_a = this.getOrderCustomerSnapshot()) == null ? void 0 : _a.id) ?? ((_b = this.getOrderCustomer()) == null ? void 0 : _b.customer_id)
+    );
+    const loadedProducts = await this.store.products.loadProducts({
+      product_ids: missingIds,
+      with_count: ["bundleGroup", "optionGroup"],
+      with_schedule: 1,
+      cacheId: this.cacheId,
+      ...bookingDate ? {
+        schedule_date: bookingDate.format("YYYY-MM-DD"),
+        schedule_datetime: bookingDate.format("YYYY-MM-DD HH:mm:ss")
+      } : {},
+      ...Number.isFinite(customerId) && customerId > 0 ? { customer_id: customerId } : {}
+    });
+    const productById = /* @__PURE__ */ new Map();
+    [...localProducts, ...loadedProducts || []].forEach((product) => {
+      const productId = Number(product.id);
+      if (Number.isFinite(productId)) {
+        productById.set(productId, product);
+      }
+    });
+    return normalizedIds.map((id) => productById.get(id)).filter((product) => Boolean(product));
   }
   /**
    * 获取日程时间段点
@@ -1153,7 +1204,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    return this.store.bookingContext.getBookingConfig();
+    var _a;
+    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {
@@ -1389,7 +1441,9 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
           decideAddProduct: (item, options) => this.decideAddProduct(item, options),
           decideAfterDetail: (cacheItem, options) => this.decideAfterDetail(cacheItem, options),
           transformDetailToProductAndBooking: (input) => this.transformDetailToProductAndBooking(input),
-          addProductToOrder: (product, booking) => this.addProductToOrder(product, booking)
+          addProductToOrder: (product, booking) => this.addProductToOrder(product, booking),
+          refreshWalletAssets: (params) => this.refreshWalletAssets(params),
+          scanWalletAsset: (scanCode) => this.scanWalletAsset(scanCode)
         },
         formatted,
         bridge
@@ -1526,8 +1580,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return result;
   }
   async setOtherParams(params, { cover = false } = {}) {
-    super.setOtherParams(params, { cover });
-    if (params == null ? void 0 : params.businessCode) {
+    await super.setOtherParams(params, { cover });
+    if ((params == null ? void 0 : params.businessCode) !== void 0 || (params == null ? void 0 : params.business_code) !== void 0) {
       await this.configureIdGeneratorFromOpenData();
     }
   }

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

@@ -232,6 +232,7 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number) => Promise<{
         isAvailable?: boolean;
+        isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts

@@ -24,6 +24,14 @@ export interface GlobalScanApplyHost {
         cacheItem: any;
     };
     addProductToOrder(product: any, booking?: any): Promise<any>;
+    refreshWalletAssets?(params?: {
+        preserveSelection?: boolean;
+    }): Promise<any>;
+    scanWalletAsset?(code: string): Promise<{
+        type: 'walletCode' | 'normalCode';
+        asset?: any;
+        selected: boolean;
+    }>;
 }
 /**
  * 应用全局扫码格式化结果：设客户 / 加车 / 开单 / 弹窗链。

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -101,23 +101,55 @@ async function applyGlobalScan(host, formatted, bridge) {
     return { status: "success", kind: "customer" };
   }
   if (searchType === "walletPass") {
-    if (!data) {
-      (_c = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _c.call(bridge, "fail", "pisell2.text.scan-global-failed");
-      return { status: "failed", reason: "invalid_data" };
-    }
     const snapshot = host.getOrderCustomerSnapshot();
     const scannedCustomerIsWalkIn = (0, import_cartView.isWalkInCustomer)(data);
+    const trySelectWalletAsset = async () => {
+      var _a2, _b2;
+      if (!host.scanWalletAsset)
+        return null;
+      const walletResult = await host.scanWalletAsset(scanCode).catch((error) => {
+        console.warn("[GlobalScan] Wallet asset lookup failed", error);
+        return null;
+      });
+      if (!walletResult)
+        return null;
+      if (walletResult.type !== "normalCode" || !walletResult.asset) {
+        return null;
+      }
+      if (walletResult.selected) {
+        (_a2 = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _a2.call(bridge, "success");
+        return { status: "success", kind: "promotion" };
+      }
+      (_b2 = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _b2.call(bridge, "fail", "pisell2.text.goodpass.code-invalid-cart");
+      return { status: "failed", reason: "invalid_data" };
+    };
     if ((0, import_cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
+      const walletSelection2 = await trySelectWalletAsset();
+      if (walletSelection2)
+        return walletSelection2;
       if (!(bridge == null ? void 0 : bridge.applyPromotionCode)) {
         return { status: "failed", reason: "no_bridge" };
       }
       const result = await bridge.applyPromotionCode(scanCode);
-      if (result == null ? void 0 : result.isAvailable) {
+      if ((result == null ? void 0 : result.isAccepted) ?? (result == null ? void 0 : result.isAvailable)) {
         return { status: "success", kind: "promotion" };
       }
       return { status: "failed", reason: "invalid_data" };
     }
     host.setOrderCustomer(data);
+    await ((_c = host.refreshWalletAssets) == null ? void 0 : _c.call(host, { preserveSelection: false }));
+    const walletSelection = await trySelectWalletAsset();
+    if (walletSelection)
+      return walletSelection;
+    if (bridge == null ? void 0 : bridge.applyPromotionCode) {
+      const promotionResult = await bridge.applyPromotionCode(
+        scanCode,
+        Number((data == null ? void 0 : data.id) ?? (data == null ? void 0 : data.customer_id)) || void 0
+      );
+      if ((promotionResult == null ? void 0 : promotionResult.isAccepted) ?? (promotionResult == null ? void 0 : promotionResult.isAvailable)) {
+        return { status: "success", kind: "promotion" };
+      }
+    }
     (_d = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _d.call(bridge, "success", "pisell2.text.add-client-success");
     return { status: "success", kind: "customer" };
   }

package/lib/solution/Sales/index.d.ts

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;
@@ -94,6 +95,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**