@pisell/pisellos 2.3.43 → 2.3.44

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -81,6 +81,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         discountList: Discount[];
         type: 'server' | 'clientCalc';
         unavailableReason?: UnavailableReason;
@@ -486,7 +487,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -70,6 +70,24 @@ function isManualProductDiscountProduct(product) {
 }
 var ORDER_PAYMENT_STATUS_PAID = "paid";
 var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
+var CUSTOMER_PROMOTION_DISCOUNT_TAGS = /* @__PURE__ */ new Set([
+  "good_pass",
+  "product_discount_card",
+  "discount_card"
+]);
+function isCustomerPromotionDiscount(discount) {
+  return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(
+    String((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type) || "").toLowerCase()
+  );
+}
+function markScannedDiscounts(discountList, scannedDiscountList) {
+  const scannedIds = new Set(
+    scannedDiscountList.map((discount) => discount == null ? void 0 : discount.id).filter((id) => id !== void 0 && id !== null).map(String)
+  );
+  return discountList.map(
+    (discount) => scannedIds.has(String(discount == null ? void 0 : discount.id)) ? { ...discount, isScan: true } : discount
+  );
+}
 function isVoucherPaymentRecord(payment) {
   return (payment == null ? void 0 : payment.voucher_id) !== void 0 && Number(payment.voucher_id) !== 0;
 }
@@ -122,6 +140,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const type = (item == null ? void 0 : item.type) ?? (item == null ? void 0 : item.tag);
         if (!type || type === "product")
           continue;
+        const isDiscountCard = type === "discount_card" || type === "product_discount_card";
         const resourceId = ((_a = item == null ? void 0 : item.discount) == null ? void 0 : _a.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id) ?? (item == null ? void 0 : item.order_discount_id);
         if (resourceId === void 0 || resourceId === null || resourceId === "")
           continue;
@@ -144,7 +163,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         if (existed) {
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
-          existed.balance = String(Number(existed.balance || 0) + amount);
+          if (!isDiscountCard) {
+            existed.balance = String(Number(existed.balance || 0) + amount);
+          }
           const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
@@ -181,7 +202,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             filter: 0,
             exclude_product_ids: []
           },
-          balance: String((item == null ? void 0 : item.amount) ?? "0"),
+          balance: isDiscountCard ? void 0 : String((item == null ? void 0 : item.amount) ?? "0"),
           format_title: title,
           product: {
             id: (product == null ? void 0 : product.product_id) ?? 0,
@@ -528,7 +549,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
     const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
     const rulesModule = this.store.rules;
@@ -536,6 +557,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReason: import_types2.UnavailableReason.Unknown
@@ -545,6 +567,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "server",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReasonKey
@@ -560,13 +583,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: true,
+        isAccepted: true,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList
       };
     }
     const tempOrder = this.store.tempOrder;
     const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record) || [];
-    const { isAvailable, discountList: newDiscountList, unavailableReason } = rulesModule.isDiscountListAvailable({
+    const {
+      isAvailable,
+      discountList: newDiscountList,
+      evaluatedDiscountList,
+      unavailableReason
+    } = rulesModule.isDiscountListAvailable({
       productList: (tempOrder == null ? void 0 : tempOrder.products) || [],
       oldDiscountList: this.getDiscountList(),
       newDiscountList: withScanList,
@@ -574,15 +603,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       holders,
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product)
     }) || { isAvailable: false, discountList: this.getDiscountList() };
-    if (isAvailable && newDiscountList) {
-      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
+    const shouldRetainForLater = !isAvailable && unavailableReason === import_types2.UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+    const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : void 0;
+    const retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
+    let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
+    if (isAvailable && normalizedNewDiscountList) {
+      await ((_d = this.store.discount) == null ? void 0 : _d.setDiscountList(normalizedNewDiscountList));
       this.applyDiscount();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
+    } else if (shouldRetainForLater && retainedDiscountList) {
+      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(retainedDiscountList));
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
     }
     return {
       type: "clientCalc",
       isAvailable: isAvailable || false,
-      discountList: newDiscountList || this.getDiscountList(),
+      isAccepted: Boolean(isAvailable || shouldRetainForLater),
+      discountList: resolvedDiscountList,
       scannedDiscountList: resultDiscountList,
       unavailableReason
     };

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

@@ -165,6 +165,8 @@ export interface OrderCustomerChangePayload {
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入当前订单折扣列表，但不一定能立即应用。 */
+    isAccepted?: boolean;
     discountList: Discount[];
     scannedDiscountList: Discount[];
     type: 'server' | 'clientCalc';

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/Rules/index.d.ts

@@ -27,6 +27,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }): {
         isAvailable: boolean;
         discountList: Discount[];
+        /** 完整规则计算后的列表；调用方可用于保留暂时无适用商品的扫码卡券。 */
+        evaluatedDiscountList?: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
     };

package/lib/modules/Rules/index.js

@@ -94,7 +94,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    if (productList.every((item) => {
+    if (productList.length > 0 && productList.every((item) => {
       var _a;
       const product = this.hooks.getProduct(item);
       return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || product.total == 0);
@@ -152,6 +152,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     return {
       isAvailable: hasApplicableDiscount,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
+      evaluatedDiscountList: result.discountList,
       productList: hasApplicableDiscount ? result.productList : productList,
       unavailableReason
     };
@@ -181,9 +182,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getUnavailableReason(discountList, productList) {
     var _a;
     for (const discount of discountList) {
-      for (const item of productList) {
+      const bookingTimes = productList.length ? productList.map((item) => {
         const product = this.hooks.getProduct(item);
-        const bookingTime = ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss");
+        return ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+      }) : [(0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")];
+      for (const bookingTime of bookingTimes) {
         const filteredList = (0, import_utils.filterDiscountListByBookingTime)([discount], bookingTime);
         if (filteredList.length === 0) {
           return import_types.UnavailableReason.TimeLimit;

package/lib/solution/BaseSales/index.js

@@ -1719,6 +1719,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       return {
         isAvailable: raw.isAvailable,
+        ...raw.isAccepted !== void 0 ? { isAccepted: raw.isAccepted } : {},
         type: raw.type,
         unavailableReason: raw.unavailableReason,
         scannedDiscountList: raw.scannedDiscountList

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

@@ -439,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[];
 }