@pisell/pisellos 2.3.50 → 2.3.53

package/lib/modules/Order/utils.js

@@ -36,9 +36,8 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils3.createEmptySummary,
+  createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
-  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -86,10 +85,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Holder/utils");
-var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils = require("../../solution/ScanOrder/utils");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
-var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
@@ -548,7 +546,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
+        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           getProductSkuOptions(product),
           product.product_bundle
         )}`,
@@ -640,34 +638,6 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
-function getCustomerIdFromStorage(window) {
-  var _a;
-  try {
-    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
-    const customerId = Number(customer == null ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function ensureCartItemOriginHolder(cartItem, window) {
-  var _a;
-  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
-    return;
-  }
-  const holderConfig = (0, import_utils.getProductHolderConfig)(
-    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
-  );
-  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
-  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
-    return;
-  }
-  cartItem._origin.holder = {
-    customer_id: getCustomerIdFromStorage(window),
-    form_id: holderConfig.resource_id,
-    form_record: [formRecordId]
-  };
-}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -1033,7 +1003,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    summary: summary || tempOrder.summary || (0, import_utils2.createEmptySummary)(),
+    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -1282,7 +1252,6 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

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

@@ -397,12 +397,18 @@ export interface WalletAssetsState {
 export interface WalletAssetsSnapshot {
     state: WalletAssetsState;
     searchResults: SearchIdentificationCodeItem[];
+    /** 已搜索但尚未满足订单条件、等待首次可用后自动选中的 Wallet Asset code。 */
+    pendingAutoSelectSearchCodes?: string[];
     walletParams: WalletDeductionRecommendParams | null;
     calculationContext: {
         orderTotalAmount: number;
         products: any[];
     };
 }
+export interface WalletAssetsBehaviorOptions {
+    /** 搜索到 Wallet Asset 后，当前或后续首次可用时是否自动选中。 */
+    autoSelectAfterSearch?: boolean;
+}
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
@@ -472,6 +478,8 @@ export interface WalletPassPayment {
     refreshWalletAssetsFromBusinessAsync: (businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions) => Promise<WalletAssetsState>;
     /** 获取共享钱包资产状态快照。 */
     getWalletAssetsState: () => WalletAssetsState;
+    /** 配置仅影响 Wallet Assets 的交互行为。 */
+    configureWalletAssetsBehavior: (options: WalletAssetsBehaviorOptions) => void;
     /** 导出供 Shared Checkout 跨运行时传递的 Wallet Assets 快照。 */
     exportWalletAssetsSnapshot: () => WalletAssetsSnapshot;
     /** 恢复 Shared Checkout 传回的 Wallet Assets 快照。 */

package/lib/modules/Payment/walletpass.d.ts

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -12,8 +12,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private walletInitData;
     private walletAssetsState;
     private walletAssetsRequestSequence;
+    private walletAssetsBehavior;
+    private pendingAutoSelectSearchCodes;
     private walletAssetsCalculationContext;
     constructor(paymentModule: PaymentModule);
+    configureWalletAssetsBehavior(options: WalletAssetsBehaviorOptions): void;
     /**
      * 发送事件的辅助方法
      * 支持使用WalletPassHooks或PaymentHooks
@@ -28,6 +31,9 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
      */
     private syncSearchedWalletAssets;
+    private isPendingAutoSelectAsset;
+    private clearPendingAutoSelectForAsset;
+    private queuePendingAutoSelectForAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中

package/lib/modules/Payment/walletpass.js

@@ -46,6 +46,12 @@ function matchesWalletAssetCode(asset, normalizedCode) {
     (identifier) => String(identifier ?? "").trim() === normalizedCode
   );
 }
+function normalizeWalletAssetCode(code) {
+  return String(code ?? "").trim().toUpperCase();
+}
+function getWalletAssetCodeKeys(asset) {
+  return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -107,11 +113,23 @@ var WalletPassPaymentImpl = class {
     this.walletInitData = null;
     this.walletAssetsState = createInitialWalletAssetsState();
     this.walletAssetsRequestSequence = 0;
+    this.walletAssetsBehavior = {
+      autoSelectAfterSearch: true
+    };
+    this.pendingAutoSelectSearchCodes = /* @__PURE__ */ new Set();
     this.walletAssetsCalculationContext = {
       orderTotalAmount: 0,
       products: []
     };
   }
+  configureWalletAssetsBehavior(options) {
+    if (options.autoSelectAfterSearch === void 0)
+      return;
+    this.walletAssetsBehavior.autoSelectAfterSearch = options.autoSelectAfterSearch;
+    if (!options.autoSelectAfterSearch) {
+      this.pendingAutoSelectSearchCodes.clear();
+    }
+  }
   /**
    * 发送事件的辅助方法
    * 支持使用WalletPassHooks或PaymentHooks
@@ -250,6 +268,25 @@ var WalletPassPaymentImpl = class {
       refreshedAssets
     );
   }
+  isPendingAutoSelectAsset(asset) {
+    return getWalletAssetCodeKeys(asset).some(
+      (code) => this.pendingAutoSelectSearchCodes.has(code)
+    );
+  }
+  clearPendingAutoSelectForAsset(asset) {
+    getWalletAssetCodeKeys(asset).forEach((code) => {
+      this.pendingAutoSelectSearchCodes.delete(code);
+    });
+  }
+  queuePendingAutoSelectForAssets(assets) {
+    if (!this.walletAssetsBehavior.autoSelectAfterSearch)
+      return;
+    assets.forEach((asset) => {
+      getWalletAssetCodeKeys(asset).forEach((code) => {
+        this.pendingAutoSelectSearchCodes.add(code);
+      });
+    });
+  }
   /**
    * 生成钱包API默认参数
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -777,7 +814,12 @@ var WalletPassPaymentImpl = class {
     );
     const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
     const selectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
+    const scanSelectedAssets = preserveSelection ? this.walletAssetsState.selectedItems.filter((asset) => {
+      const assetId = getWalletAssetId(asset);
+      return assetId !== void 0 && assetId !== null && selectionSources[String(assetId)] === "scan";
+    }) : [];
     if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
+      this.queuePendingAutoSelectForAssets(scanSelectedAssets);
       this.generateWalletParams(businessData);
       const restoredSearchedAssets = this.searchResults.filter(isWalletPaymentAsset).map((item) => ({
         ...item,
@@ -882,11 +924,43 @@ var WalletPassPaymentImpl = class {
       }));
       const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
-      return this.recalculateWalletAssets(
+      const pendingAutoSelectAssets = this.walletAssetsBehavior.autoSelectAfterSearch ? items.filter(
+        (asset) => this.isPendingAutoSelectAsset(asset) && isWalletAssetAvailable(asset)
+      ) : [];
+      const requestedKeySet = new Set(
+        latestSelectedIds.map((id) => String(id))
+      );
+      pendingAutoSelectAssets.forEach((asset) => {
+        const assetId = getWalletAssetId(asset);
+        if (assetId === void 0 || assetId === null)
+          return;
+        const assetKey = String(assetId);
+        if (!requestedKeySet.has(assetKey)) {
+          requestedKeySet.add(assetKey);
+          latestSelectedIds.push(assetId);
+        }
+        latestSelectionSources[assetKey] = "scan";
+      });
+      const nextState = this.recalculateWalletAssets(
         items,
         latestSelectedIds,
         latestSelectionSources
       );
+      const selectedKeySet = new Set(
+        nextState.selectedIds.map((id) => String(id))
+      );
+      pendingAutoSelectAssets.forEach((asset) => {
+        const assetId = getWalletAssetId(asset);
+        if (assetId !== void 0 && assetId !== null && selectedKeySet.has(String(assetId))) {
+          this.clearPendingAutoSelectForAsset(asset);
+        }
+      });
+      const droppedScanSelectedAssets = scanSelectedAssets.filter((asset) => {
+        const assetId = getWalletAssetId(asset);
+        return assetId !== void 0 && assetId !== null && !selectedKeySet.has(String(assetId));
+      });
+      this.queuePendingAutoSelectForAssets(droppedScanSelectedAssets);
+      return nextState;
     } catch (error) {
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
@@ -926,6 +1000,9 @@ var WalletPassPaymentImpl = class {
     return {
       state: this.getWalletAssetsState(),
       searchResults: [...this.searchResults],
+      pendingAutoSelectSearchCodes: [
+        ...this.pendingAutoSelectSearchCodes
+      ],
       walletParams: this.walletParams ? { ...this.walletParams } : null,
       calculationContext: {
         orderTotalAmount: this.walletAssetsCalculationContext.orderTotalAmount,
@@ -939,6 +1016,9 @@ var WalletPassPaymentImpl = class {
       return this.getWalletAssetsState();
     this.walletAssetsRequestSequence += 1;
     this.searchResults = Array.isArray(snapshot.searchResults) ? [...snapshot.searchResults] : [];
+    this.pendingAutoSelectSearchCodes = this.walletAssetsBehavior.autoSelectAfterSearch && Array.isArray(snapshot.pendingAutoSelectSearchCodes) ? new Set(
+      snapshot.pendingAutoSelectSearchCodes.map(normalizeWalletAssetCode).filter(Boolean)
+    ) : /* @__PURE__ */ new Set();
     this.walletParams = snapshot.walletParams ? { ...snapshot.walletParams } : null;
     this.walletAssetsCalculationContext = {
       orderTotalAmount: Number(
@@ -957,6 +1037,9 @@ var WalletPassPaymentImpl = class {
   }
   selectWalletAsset(assetId, options) {
     const assetKey = String(assetId);
+    const asset = this.walletAssetsState.items.find(
+      (item) => getWalletAssetKey(item) === assetKey
+    );
     const committedKeys = new Set(
       this.walletAssetsState.committedIds.map((id) => String(id))
     );
@@ -968,20 +1051,23 @@ var WalletPassPaymentImpl = class {
     const selectionSources = { ...this.walletAssetsState.selectionSources };
     delete selectionSources[assetKey];
     if (options.selected) {
-      const asset = this.walletAssetsState.items.find(
-        (item) => getWalletAssetKey(item) === assetKey
-      );
       if (!asset || !isWalletAssetAvailable(asset)) {
         return this.getWalletAssetsState();
       }
       selectedIds.push(assetId);
       selectionSources[assetKey] = options.source || "manual";
+    } else if (asset) {
+      this.clearPendingAutoSelectForAsset(asset);
     }
-    return this.recalculateWalletAssets(
+    const nextState = this.recalculateWalletAssets(
       this.walletAssetsState.items,
       selectedIds,
       selectionSources
     );
+    if (options.selected && asset && nextState.selectedIds.some((id) => String(id) === assetKey)) {
+      this.clearPendingAutoSelectForAsset(asset);
+    }
+    return nextState;
   }
   async scanWalletAssetAsync(code) {
     const normalizedCode = String(code || "").trim();
@@ -1024,24 +1110,34 @@ var WalletPassPaymentImpl = class {
       };
     }
     const items = mergeWalletAssets(this.walletAssetsState.items, [asset]);
-    this.recalculateWalletAssets(
+    const recalculatedState = this.recalculateWalletAssets(
       items,
       this.walletAssetsState.selectedIds,
       this.walletAssetsState.selectionSources
     );
     const assetId = getWalletAssetId(asset);
-    const selected = assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
       selected: true,
       source: "scan"
-    }) : this.getWalletAssetsState();
+    }) : recalculatedState;
+    const isSelected = assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId));
+    if (isSelected) {
+      this.clearPendingAutoSelectForAsset(asset);
+    } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
+      this.pendingAutoSelectSearchCodes.add(
+        normalizeWalletAssetCode(normalizedCode)
+      );
+      this.queuePendingAutoSelectForAssets([asset]);
+    }
     return {
       type: result.type,
       asset,
-      selected: assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId)),
+      selected: isSelected,
       state: selected
     };
   }
   clearWalletAssetSelection() {
+    this.pendingAutoSelectSearchCodes.clear();
     return this.recalculateWalletAssets(
       this.walletAssetsState.items,
       [],
@@ -1156,6 +1252,7 @@ var WalletPassPaymentImpl = class {
    */
   clearSearchResults() {
     this.searchResults = [];
+    this.pendingAutoSelectSearchCodes.clear();
     this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
   /**
@@ -1178,6 +1275,7 @@ var WalletPassPaymentImpl = class {
     this.walletRecommendList = [];
     this.userIdentificationCodes = [];
     this.searchResults = [];
+    this.pendingAutoSelectSearchCodes.clear();
     this.walletParams = null;
     this.walletInitData = null;
     this.walletAssetsRequestSequence += 1;

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

@@ -193,7 +193,6 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
-        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/lib/modules/ProductList/index.js

@@ -106,48 +106,39 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    const channelMap = {
-      online_store: "online-store",
-      scan_to_order: "online-store",
-      "scan-to-order": "online-store",
-      scan_to_order_2: "mobile_order",
-      scan_to_order_3: "scantoorder3"
-    };
-    const rawApplicationCode = (_b = this.otherParams) == null ? void 0 : _b.channel;
-    const mappedApplicationCode = typeof rawApplicationCode === "string" ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-    const queryPayload = {
-      open_quotation: 1,
-      open_bundle: 0,
-      exclude_extension_type: [
-        "product_party",
-        "product_event",
-        "product_series_event",
-        "product_package_ticket",
-        "ticket",
-        "event_item"
-      ],
-      with: ["category", "collection", "resourceRelation"],
-      status,
-      num: 500,
-      skip: 1,
-      customer_id,
-      ...Array.isArray(category_ids) && category_ids.length ? { category_ids } : {},
-      ...Array.isArray(product_ids) && product_ids.length ? { ids: product_ids } : {},
-      ...Array.isArray(collection) && collection.length ? { collection } : {},
-      front_end_cache_id: cacheId,
-      ...Array.isArray(menu_list_ids) && menu_list_ids.length ? { menu_list_ids } : {},
-      with_count,
-      // client_schedule_ids: schedule_ids,
-      schedule_date,
-      application_code: mappedApplicationCode,
-      is_eject: 1,
-      with_schedule,
-      schedule_datetime,
-      extension_type
-    };
     const productsData = await this.request.post(
       `/product/query`,
-      queryPayload,
+      {
+        open_quotation: 1,
+        open_bundle: 0,
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
+        ],
+        with: ["category", "collection", "resourceRelation"],
+        status,
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
+        // client_schedule_ids: schedule_ids,
+        schedule_date,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1,
+        with_schedule,
+        schedule_datetime,
+        extension_type,
+        strategy_context
+      },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }
     );

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

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false, osServer: true }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => b.sort - a.sort);
+    list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -96,7 +96,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
    *
-   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */