@pisell/pisellos 2.3.42 → 2.3.44

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

@@ -21,11 +21,13 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private emitEvent;
     private publishWalletAssetsState;
     private recalculateWalletAssets;
+    /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
+    private getSearchedWalletAssetCodes;
     /**
-     * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
-     * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+     * 用订单重算接口返回的数据更新扫码 Wallet 缓存。
+     * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
      */
-    private revalidateSearchedWalletAssets;
+    private syncSearchedWalletAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -67,6 +69,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
         noApplicableVoucher: any[];
         products: any[];
     }>;
+    /**
+     * 商品或订单金额变化后，使用聚合接口一次重算已选与剩余 WalletPass。
+     * Walk-In 不发送 customer_id；会员才携带真实 customer_id。
+     */
+    private aggregateRecalculateWalletAssetsAsync;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
         voucher_id: number;

package/lib/modules/Payment/walletpass.js

@@ -41,6 +41,11 @@ function getWalletAssetKey(assetOrId) {
   const id = assetOrId && typeof assetOrId === "object" ? getWalletAssetId(assetOrId) : assetOrId;
   return id === void 0 || id === null ? "" : String(id);
 }
+function matchesWalletAssetCode(asset, normalizedCode) {
+  return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].some(
+    (identifier) => String(identifier ?? "").trim() === normalizedCode
+  );
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -150,12 +155,10 @@ var WalletPassPaymentImpl = class {
     const committedKeys = new Set(
       this.walletAssetsState.committedIds.map((id) => String(id))
     );
-    const requestedKeys = new Set(
-      requestedIds.map((id) => String(id)).filter((id) => !committedKeys.has(id))
-    );
-    const requested = items.filter(
-      (item) => requestedKeys.has(getWalletAssetKey(item)) && isWalletAssetAvailable(item)
+    const itemsByKey = new Map(
+      items.map((item) => [getWalletAssetKey(item), item])
     );
+    const requested = requestedIds.map((id) => String(id)).filter((id) => !committedKeys.has(id)).map((id) => itemsByKey.get(id)).filter((item) => item && isWalletAssetAvailable(item));
     let nextItems = items;
     let selectedItems = requested;
     const evaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
@@ -201,57 +204,40 @@ var WalletPassPaymentImpl = class {
       error: null
     });
   }
+  /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
+  getSearchedWalletAssetCodes() {
+    const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
+    const seenCodes = /* @__PURE__ */ new Set();
+    return cachedAssets.map((item) => String((item == null ? void 0 : item.code) || "").trim()).filter((code) => {
+      const normalizedCode = code.toUpperCase();
+      if (!normalizedCode || seenCodes.has(normalizedCode))
+        return false;
+      seenCodes.add(normalizedCode);
+      return true;
+    });
+  }
   /**
-   * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
-   * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+   * 用订单重算接口返回的数据更新扫码 Wallet 缓存。
+   * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
    */
-  async revalidateSearchedWalletAssets(requestSequence) {
+  syncSearchedWalletAssets(refreshedCandidates) {
     const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
-    const searchCodes = [
-      ...new Set(
-        cachedAssets.map((item) => String((item == null ? void 0 : item.code) || "").trim()).filter(Boolean)
-      )
-    ];
-    if (searchCodes.length === 0)
-      return cachedAssets;
-    const preparePayments = this.formatWalletPassList2PreparePayments(
-      this.walletAssetsState.selectedItems
-    );
-    const refreshedGroups = await Promise.all(
-      searchCodes.map(async (searchCode) => {
-        try {
-          const result = await this.searchIdentificationCodeAsync(
-            {
-              ...this.walletParams || {},
-              code: searchCode,
-              prepare_payments: preparePayments
-            },
-            { noCache: true }
-          );
-          return {
-            searchCode,
-            items: result.type === "normalCode" ? result.data.filter(isWalletPaymentAsset) : []
-          };
-        } catch (error) {
-          this.paymentModule.logWarning(
-            "[WalletPass] 重验扫码 Wallet 资产失败，保留旧结果",
-            {
-              code: searchCode,
-              error: error instanceof Error ? error.message : String(error)
-            }
-          );
-          return { searchCode, items: [] };
-        }
-      })
+    const searchedCodeKeys = new Set(
+      this.getSearchedWalletAssetCodes().map((code) => code.toUpperCase())
     );
-    if (requestSequence !== this.walletAssetsRequestSequence) {
+    if (searchedCodeKeys.size === 0)
       return cachedAssets;
-    }
-    const replacedCodes = new Set(
-      refreshedGroups.filter((group) => group.items.length > 0).map((group) => group.searchCode.toUpperCase())
+    const refreshedAssets = refreshedCandidates.filter(
+      (item) => isWalletPaymentAsset(item) && searchedCodeKeys.has(
+        String((item == null ? void 0 : item.code) || "").trim().toUpperCase()
+      )
     );
-    const refreshedAssets = refreshedGroups.flatMap((group) => group.items);
     if (refreshedAssets.length > 0) {
+      const replacedCodes = new Set(
+        refreshedAssets.map(
+          (item) => String((item == null ? void 0 : item.code) || "").trim().toUpperCase()
+        )
+      );
       this.searchResults = [
         ...this.searchResults.filter(
           (item) => !replacedCodes.has(String((item == null ? void 0 : item.code) || "").trim().toUpperCase())
@@ -259,7 +245,10 @@ var WalletPassPaymentImpl = class {
         ...refreshedAssets
       ];
     }
-    return mergeWalletAssets(cachedAssets, refreshedAssets);
+    return mergeWalletAssets(
+      cachedAssets,
+      refreshedAssets
+    );
   }
   /**
    * 生成钱包API默认参数
@@ -468,6 +457,96 @@ var WalletPassPaymentImpl = class {
       throw error;
     }
   }
+  /**
+   * 商品或订单金额变化后，使用聚合接口一次重算已选与剩余 WalletPass。
+   * Walk-In 不发送 customer_id；会员才携带真实 customer_id。
+   */
+  async aggregateRecalculateWalletAssetsAsync(businessData, selectedIds) {
+    var _a, _b;
+    const walletParams = this.generateWalletParams(businessData);
+    const customerId = Number(walletParams.customer_id || 0);
+    const requestParams = {
+      ids: selectedIds.map((id) => String(id)),
+      exact_codes: this.getSearchedWalletAssetCodes(),
+      order_product_amount: walletParams.order_product_amount,
+      order_expect_amount: walletParams.order_expect_amount,
+      order_wait_pay_amount: walletParams.order_wait_pay_amount,
+      products: walletParams.products,
+      available: 2,
+      filter_prepare_wallet_pass: 1,
+      sale_channel: walletParams.sale_channel || "pos"
+    };
+    if (customerId > 1) {
+      requestParams.customer_id = customerId;
+    }
+    const response = await this.paymentModule.request.post(
+      "/machinecode/prepare/deduction/aggregate-recalculate",
+      requestParams
+    );
+    const responseData = response == null ? void 0 : response.data;
+    const hasAggregateLists = responseData && (Object.prototype.hasOwnProperty.call(
+      responseData,
+      "recalculate_list"
+    ) || Object.prototype.hasOwnProperty.call(
+      responseData,
+      "customer_wallet_pass_list"
+    ));
+    if (!hasAggregateLists) {
+      throw new Error("WalletPass aggregate response is missing list data");
+    }
+    const recalculateList = Array.isArray(responseData == null ? void 0 : responseData.recalculate_list) ? responseData.recalculate_list : [];
+    const customerWalletPassList = Array.isArray(
+      responseData == null ? void 0 : responseData.customer_wallet_pass_list
+    ) ? responseData.customer_wallet_pass_list : [];
+    const allList = mergeWalletAssets(
+      recalculateList,
+      customerWalletPassList
+    );
+    const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+    const evaluated = (walletPassEvaluator == null ? void 0 : walletPassEvaluator.getRecommendedVouchers) ? walletPassEvaluator.getRecommendedVouchers({
+      orderTotalAmount: walletParams.order_wait_pay_amount,
+      products: walletParams.products,
+      vouchers: allList
+    }) : {
+      recommended: [],
+      transformList: allList.filter(isWalletAssetAvailable),
+      noApplicableVoucher: allList.filter(
+        (item) => !isWalletAssetAvailable(item)
+      )
+    };
+    const returnedSelectedKeys = new Set(
+      recalculateList.filter(isWalletAssetAvailable).map((item) => getWalletAssetKey(item))
+    );
+    const authoritativeSelectedIds = selectedIds.filter(
+      (id) => returnedSelectedKeys.has(String(id))
+    );
+    this.walletRecommendList = evaluated.recommended || [];
+    this.userIdentificationCodes = allList;
+    this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+      userIdentificationCodes: this.userIdentificationCodes
+    });
+    this.walletInitData = {
+      transformList: evaluated.transformList || [],
+      noApplicableVoucher: evaluated.noApplicableVoucher || [],
+      products: walletParams.products || []
+    };
+    this.paymentModule.logInfo(
+      "[WalletPass] 聚合重算 WalletPass 完成",
+      {
+        selected_count: recalculateList.length,
+        remaining_count: customerWalletPassList.length,
+        searched_codes_count: requestParams.exact_codes.length
+      }
+    );
+    return {
+      walletRecommendList: this.walletRecommendList,
+      userIdentificationCodes: this.userIdentificationCodes,
+      transformList: evaluated.transformList || [],
+      noApplicableVoucher: evaluated.noApplicableVoucher || [],
+      products: walletParams.products || [],
+      authoritativeSelectedIds
+    };
+  }
   async getWalletPassRecommendListAsync(params) {
     var _a;
     try {
@@ -681,6 +760,7 @@ var WalletPassPaymentImpl = class {
    * 推荐结果只作为可用性/金额计算输入，不会自动成为 selectedIds。
    */
   async refreshWalletAssetsFromBusinessAsync(businessData, options = {}) {
+    var _a;
     const requestSequence = ++this.walletAssetsRequestSequence;
     const nextCustomerId = businessData.customer_id;
     const previousCustomerId = this.walletAssetsState.customerId;
@@ -697,6 +777,44 @@ var WalletPassPaymentImpl = class {
     );
     const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
     const selectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
+    if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
+      this.generateWalletParams(businessData);
+      const restoredSearchedAssets = this.searchResults.filter(isWalletPaymentAsset).map((item) => ({
+        ...item,
+        actualDeduction: 0,
+        deductionDetails: [],
+        _available_max_amount: 0,
+        _unified_available_status: 0,
+        _wallet_asset_recommended: false
+      }));
+      this.walletRecommendList = [];
+      this.userIdentificationCodes = [];
+      this.walletInitData = {
+        transformList: [],
+        noApplicableVoucher: restoredSearchedAssets,
+        products: []
+      };
+      this.walletAssetsCalculationContext = {
+        orderTotalAmount: 0,
+        products: []
+      };
+      this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+        userIdentificationCodes: []
+      });
+      return this.publishWalletAssetsState({
+        status: "ready",
+        customerId: nextCustomerId,
+        items: mergeWalletAssets(
+          restoredSearchedAssets,
+          committedItems
+        ),
+        selectedIds: [],
+        selectedItems: [],
+        selectionSources: {},
+        totalSelectedAmount: 0,
+        error: null
+      });
+    }
     this.publishWalletAssetsState({
       status: "loading",
       customerId: nextCustomerId,
@@ -708,9 +826,13 @@ var WalletPassPaymentImpl = class {
       error: null
     });
     try {
-      const result = await this.initializeWalletDataFromBusinessAsync(
-        businessData
-      );
+      const searchedWalletAssetCodes = preserveSelection ? this.getSearchedWalletAssetCodes() : [];
+      const useAggregateRecalculate = preserveSelection && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
+      const aggregateResult = useAggregateRecalculate ? await this.aggregateRecalculateWalletAssetsAsync(
+        businessData,
+        selectedIds
+      ) : null;
+      const result = aggregateResult || await this.initializeWalletDataFromBusinessAsync(businessData);
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
       }
@@ -718,7 +840,27 @@ var WalletPassPaymentImpl = class {
         orderTotalAmount: Number(businessData.order_wait_pay_amount || 0),
         products: result.products || businessData.products || []
       };
-      const searchedWalletAssets = preserveSelection ? await this.revalidateSearchedWalletAssets(requestSequence) : [];
+      const authoritativeSelectedIds = (aggregateResult == null ? void 0 : aggregateResult.authoritativeSelectedIds) || selectedIds;
+      if (aggregateResult) {
+        const returnedAggregateKeys = new Set(
+          [
+            ...result.transformList || [],
+            ...result.noApplicableVoucher || []
+          ].map((item) => getWalletAssetKey(item))
+        );
+        const missingSelectedKeys = new Set(
+          selectedIds.map((id) => String(id)).filter((id) => !returnedAggregateKeys.has(id))
+        );
+        if (missingSelectedKeys.size > 0) {
+          this.searchResults = this.searchResults.filter(
+            (item) => !missingSelectedKeys.has(getWalletAssetKey(item))
+          );
+        }
+      }
+      const searchedWalletAssets = preserveSelection ? this.syncSearchedWalletAssets([
+        ...result.transformList || [],
+        ...result.noApplicableVoucher || []
+      ]) : [];
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
       }
@@ -728,7 +870,7 @@ var WalletPassPaymentImpl = class {
         )
       );
       const items = mergeWalletAssets(
-        preserveSelection ? this.walletAssetsState.selectedItems : [],
+        preserveSelection && !aggregateResult ? this.walletAssetsState.selectedItems : [],
         searchedWalletAssets,
         result.transformList || [],
         result.noApplicableVoucher || []
@@ -738,7 +880,7 @@ var WalletPassPaymentImpl = class {
           getWalletAssetKey(asset)
         )
       }));
-      const latestSelectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
+      const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
       return this.recalculateWalletAssets(
         items,
@@ -749,6 +891,15 @@ var WalletPassPaymentImpl = class {
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
       }
+      this.paymentModule.logError(
+        "[WalletPass] 刷新共享钱包资产失败，保留刷新前状态",
+        error,
+        {
+          customer_id: businessData.customer_id,
+          selected_ids: selectedIds,
+          searched_codes: this.getSearchedWalletAssetCodes()
+        }
+      );
       return this.publishWalletAssetsState({
         status: "error",
         items: preserveSelection ? this.walletAssetsState.items : committedItems,
@@ -841,6 +992,17 @@ var WalletPassPaymentImpl = class {
         state: this.getWalletAssetsState()
       };
     }
+    const selectedAsset = this.walletAssetsState.selectedItems.find(
+      (asset2) => matchesWalletAssetCode(asset2, normalizedCode)
+    );
+    if (selectedAsset) {
+      return {
+        type: "normalCode",
+        asset: selectedAsset,
+        selected: true,
+        state: this.getWalletAssetsState()
+      };
+    }
     this.walletAssetsRequestSequence += 1;
     const result = await this.searchIdentificationCodeAsync({
       ...this.walletParams || {},

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

@@ -193,6 +193,7 @@ 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,39 +106,48 @@ 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`,
-      {
-        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
-      },
+      queryPayload,
       { 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` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = 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) => a.sort - b.sort);
+    list.sort((a, b) => b.sort - a.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` ascending (lowest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */

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

@@ -0,0 +1,24 @@
+import { BaseModule } from '../BaseModule';
+import type { Module, ModuleOptions, PisellCore } from '../../types';
+import type { ResourcePlannerAssignmentResult, ResourcePlannerAssignableSlotResult, ResourcePlannerContextInput, ResourcePlannerProjection, ResourcePlannerQuery, ResourcePlannerSelectionPatch, ResourcePlannerSnapshot, ResourcePlannerValidationResult } from './types';
+export * from './types';
+export * from './planner';
+export declare enum ResourcePlannerHooks {
+    onContextChanged = "resourcePlanner:onContextChanged",
+    onSelectionChanged = "resourcePlanner:onSelectionChanged",
+    onProjectionChanged = "resourcePlanner:onProjectionChanged"
+}
+export declare class ResourcePlannerModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    setContext(input: ResourcePlannerContextInput): ResourcePlannerSnapshot;
+    mergeContext(input: ResourcePlannerContextInput): ResourcePlannerSnapshot;
+    setSelectionPatch(patch: ResourcePlannerSelectionPatch): ResourcePlannerSnapshot;
+    queryAvailability(query?: ResourcePlannerQuery): ResourcePlannerProjection;
+    autoAssign(query?: ResourcePlannerQuery): ResourcePlannerAssignmentResult;
+    resolveAssignableSlots(query?: ResourcePlannerQuery): ResourcePlannerAssignableSlotResult;
+    validateSelection(): ResourcePlannerValidationResult;
+    getSnapshot(): ResourcePlannerSnapshot;
+}