@pisell/pisellos 2.2.308 → 2.2.310

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

@@ -5,10 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyGlobalScan = applyGlobalScan;
 var _addProductDecision = require("../addProductDecision");
-var _cartView = require("../cartView");
 var _scanProductValues = require("./scanProductValues");
 /** applyGlobalScan 所需的 BookingTicket 运行时能力 */
 
+function getRealCustomerId(customer) {
+  const customerId = Number(customer?.id ?? customer?.customer_id);
+  return Number.isInteger(customerId) && customerId > 1 ? customerId : undefined;
+}
+function getWalletAssetCustomerId(asset) {
+  const customerId = Number(asset?.customer_id ?? asset?.holder?.customer_id);
+  return Number.isInteger(customerId) && customerId > 1 ? customerId : undefined;
+}
+function getErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error || '');
+}
+
 /**
  * 处理单条扫码商品的加车决策（含弹窗链）。
  */
@@ -93,17 +104,81 @@ async function applyGlobalScan(host, formatted, bridge) {
   const {
     searchType,
     data,
-    scanCode
+    scanCode,
+    customerId: formattedCustomerId,
+    isCrossShopWallet,
+    isWalletPassUnavailableAtStore
   } = formatted;
   if (searchType === 'wallet') {
-    if (!data) {
+    const currentCustomer = host.getOrderCustomerSnapshot();
+    const currentCustomerId = getRealCustomerId(currentCustomer);
+    let customer = data;
+    if (isCrossShopWallet) {
+      const sourceCustomerId = getRealCustomerId({
+        id: formattedCustomerId
+      });
+      if (sourceCustomerId === undefined || !host.resolveCustomerById) {
+        bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+      try {
+        customer = await host.resolveCustomerById(sourceCustomerId);
+      } catch (error) {
+        bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+    }
+    const customerId = getRealCustomerId(customer) ?? (!isCrossShopWallet ? getRealCustomerId({
+      id: formattedCustomerId
+    }) : undefined);
+    if (!customer || customerId === undefined) {
       bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
       return {
         status: 'failed',
         reason: 'invalid_data'
       };
     }
-    host.setOrderCustomer(data);
+    const orderCustomer = customer.id === undefined || customer.id === null ? {
+      ...customer,
+      id: customerId
+    } : customer;
+    if (currentCustomerId === customerId) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
+    }
+    if (currentCustomerId !== undefined) {
+      // 未接入新桥接的宿主保持原行为：已有客户时不直接覆盖。
+      if (!bridge?.requestCustomerSwitch) {
+        return {
+          status: 'success',
+          kind: 'customer'
+        };
+      }
+      try {
+        const switched = await bridge.requestCustomerSwitch(orderCustomer);
+        return switched ? {
+          status: 'success',
+          kind: 'customer'
+        } : {
+          status: 'cancelled'
+        };
+      } catch (error) {
+        bridge.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+    }
+    host.setOrderCustomer(orderCustomer);
     bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
       status: 'success',
@@ -111,8 +186,70 @@ async function applyGlobalScan(host, formatted, bridge) {
     };
   }
   if (searchType === 'walletPass') {
+    if (isWalletPassUnavailableAtStore) {
+      bridge?.onNotify?.('fail', 'pisell2.text.wallet-pass-not-available-at-store');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
     const snapshot = host.getOrderCustomerSnapshot();
-    const scannedCustomerIsWalkIn = (0, _cartView.isWalkInCustomer)(data);
+    let activeCustomer = snapshot;
+    const bindWalletPassCustomer = async asset => {
+      if (getRealCustomerId(activeCustomer) !== undefined) {
+        return {
+          resolveFailed: false,
+          customerBound: false
+        };
+      }
+      const assetCustomerId = getWalletAssetCustomerId(asset) ?? getRealCustomerId({
+        id: formattedCustomerId
+      });
+      let customer = null;
+      if (assetCustomerId !== undefined) {
+        if (!host.resolveCustomerById) {
+          bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+          return {
+            resolveFailed: true,
+            customerBound: false
+          };
+        }
+        try {
+          customer = await host.resolveCustomerById(assetCustomerId);
+        } catch (error) {
+          console.warn('[GlobalScan] Wallet asset customer lookup failed', error);
+          bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+          return {
+            resolveFailed: true,
+            customerBound: false
+          };
+        }
+      }
+      const customerId = getRealCustomerId(customer);
+      if (!customer || customerId === undefined) {
+        if (assetCustomerId !== undefined) {
+          bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+        }
+        return {
+          resolveFailed: assetCustomerId !== undefined,
+          customerBound: false
+        };
+      }
+      const orderCustomer = customer.id === undefined || customer.id === null ? {
+        ...customer,
+        id: customerId
+      } : customer;
+      host.setOrderCustomer(orderCustomer);
+      activeCustomer = orderCustomer;
+      await host.refreshWalletAssets?.({
+        preserveSelection: false,
+        retainSearchResultCodes: [scanCode]
+      });
+      return {
+        resolveFailed: false,
+        customerBound: true
+      };
+    };
     const trySelectWalletAsset = async () => {
       if (!host.scanWalletAsset) return null;
       const walletResult = await host.scanWalletAsset(scanCode).catch(error => {
@@ -123,61 +260,56 @@ async function applyGlobalScan(host, formatted, bridge) {
       if (walletResult.type !== 'normalCode' || !walletResult.asset) {
         return null;
       }
+      const bindResult = await bindWalletPassCustomer(walletResult.asset);
       if (walletResult.selected) {
-        bridge?.onNotify?.('success');
+        if (!bindResult.resolveFailed) {
+          bridge?.onNotify?.('success');
+        }
         return {
           status: 'success',
           kind: 'promotion'
         };
       }
       // 已识别为 Wallet 支付资产但当前不可用：保留禁用展示，不回退优惠码。
-      bridge?.onNotify?.('fail', 'pisell2.text.goodpass.code-invalid-cart');
+      if (!bindResult.resolveFailed) {
+        bridge?.onNotify?.('fail', 'pisell2.text.goodpass.code-invalid-cart');
+      }
       return {
         status: 'failed',
         reason: 'invalid_data'
       };
     };
-    if ((0, _cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
-      // 当前购物车或 walletPass 绑定客户为 walk-in 时不绑客户，避免覆盖已有下单客户。
-      const walletSelection = await trySelectWalletAsset();
-      if (walletSelection) return walletSelection;
-      if (!bridge?.applyPromotionCode) {
-        return {
-          status: 'failed',
-          reason: 'no_bridge'
-        };
-      }
-      const result = await bridge.applyPromotionCode(scanCode);
-      if (result?.isAccepted ?? result?.isAvailable) {
-        return {
-          status: 'success',
-          kind: 'promotion'
-        };
-      }
+
+    // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
+    // 支付资产查询使用本店客户上下文。
+    const bindResult = await bindWalletPassCustomer();
+    const walletSelection = await trySelectWalletAsset();
+    if (walletSelection) return walletSelection;
+    if (!bridge?.applyPromotionCode) {
       return {
         status: 'failed',
-        reason: 'invalid_data'
+        reason: 'no_bridge'
       };
     }
-    host.setOrderCustomer(data);
-    await host.refreshWalletAssets?.({
-      preserveSelection: false
-    });
-    const walletSelection = await trySelectWalletAsset();
-    if (walletSelection) return walletSelection;
-    if (bridge?.applyPromotionCode) {
-      const promotionResult = await bridge.applyPromotionCode(scanCode, Number(data?.id ?? data?.customer_id) || undefined);
-      if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
-        return {
-          status: 'success',
-          kind: 'promotion'
-        };
-      }
+    const promotionCustomerId = getRealCustomerId(activeCustomer);
+    const promotionResult = bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+      suppressFailureNotification: true
+    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId);
+    if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
+      return {
+        status: 'success',
+        kind: 'promotion'
+      };
+    }
+    if (bindResult.customerBound) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
     }
-    bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
-      status: 'success',
-      kind: 'customer'
+      status: 'failed',
+      reason: 'invalid_data'
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

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

@@ -14,7 +14,8 @@ const searchWalletPass = async (request, code) => {
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,
     // 组装关联商品: 0不处理 1处理
-    with: ['customer'],
+    with_franchisor_data: 1,
+    with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
     tags: ['point_card',
     // 积分卡
     'gift_card',
@@ -25,6 +26,8 @@ const searchWalletPass = async (request, code) => {
     // 折扣卡
     'good_pass',
     // 商品券
+    'entitlement_pass',
+    // 月卡 / 年卡 / 多次使用卡
     'session_ticket',
     // 场次票
     'appointment_ticket' // 预约类门票
@@ -51,17 +54,18 @@ exports.searchWalletPass = searchWalletPass;
 const searchWallet = async (request, code) => {
   const params = {
     code,
-    with_customer: 1
+    with_customer: 1,
+    with_franchisor_data: 1
   };
   try {
     const res = await request?.post('/wallet/detail/search', params);
-    if (res?.code == 200 && !!res?.data) {
+    if (res?.status === true && res?.code === 200 && !!res?.data) {
       return {
         searchType: 'wallet',
         response: res
       };
     }
-    throw new Error('没有找到对应的识别码');
+    throw new Error(res?.message || '没有找到对应的识别码');
   } catch (error) {
     throw error;
   }

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

@@ -6,6 +6,12 @@ export interface GlobalScanFormattedResult {
     searchType: GlobalScanSearchType;
     data: any;
     scanCode: string;
+    /** Wallet / Wallet Pass 来源客户 ID；跨店时必须先解析为当前店客户。 */
+    customerId?: string | number;
+    /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
+    isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

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

@@ -36,14 +36,22 @@ function formatGlobalScanResult(raw, scanCode) {
     return {
       searchType,
       data: resultData?.customer,
-      scanCode
+      scanCode,
+      customerId: resultData?.customer_id,
+      isCrossShopWallet: resultData?.is_cross_shop_wallet === true || Number(resultData?.is_cross_shop_wallet) === 1
     };
   }
   if (searchType === 'walletPass') {
+    const firstResult = resultData?.[0];
+    const isWalletPassUnavailableAtStore = firstResult?.is_franchisor_pass === 1 && firstResult?.franchisee_wallet_pass?.use !== 'enabled';
     return {
       searchType,
-      data: resultData?.[0]?.customer,
-      scanCode
+      data: firstResult?.customer,
+      scanCode,
+      customerId: firstResult?.customer_id ?? firstResult?.holder?.customer_id ?? firstResult?.customer?.id ?? firstResult?.customer?.customer_id,
+      ...(isWalletPassUnavailableAtStore ? {
+        isWalletPassUnavailableAtStore: true
+      } : {})
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

package/lib/solution/ScanOrder/utils.js

@@ -34,6 +34,7 @@ exports.toNonNegativeInt = toNonNegativeInt;
 exports.toNonNegativeNumber = toNonNegativeNumber;
 exports.toPositiveString = toPositiveString;
 exports.toPriceString = toPriceString;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
@@ -612,7 +613,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

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

@@ -43,6 +43,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
@@ -62,6 +63,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
     }): Promise<void>;
 }
 export default ShopDiscountImpl;

package/lib/solution/ShopDiscount/index.js

@@ -7,8 +7,10 @@ exports.default = exports.ShopDiscountImpl = void 0;
 var _BaseModule = require("../../modules/BaseModule");
 var _Discount = require("../../modules/Discount");
 var _Rules = require("../../modules/Rules");
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
 var _utils = require("./utils");
 var _types = require("../../modules/Rules/types");
+var _availability = require("../../modules/Discount/availability");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -125,7 +127,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         customerId: customer.id,
         action: 'create',
         with_good_pass: 1,
-        with_discount_card: 1
+        with_discount_card: 1,
+        with_entitlement_pass: 1
       });
     });
   }
@@ -347,6 +350,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
+        evaluatedDiscountList,
         isAvailable,
         unavailableReason
       } = rulesModule.isDiscountListAvailable({
@@ -361,6 +365,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         productList: this.store.productList || [],
         discountList: this.getDiscountList()
       };
+      let isAccepted = isAvailable;
       if (isAvailable) {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
@@ -368,12 +373,34 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         if (this.isWalkIn() && resultDiscountList.length && this.options.otherParams?.platform === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(resultDiscountList[0].customer_id);
         }
+      } else {
+        const scannedIds = new Set(withScanList.map(discount => String(discount.id)));
+        const retainedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(discount => scannedIds.has(String(discount.id)) && !(0, _availability.getDiscountLifecycleReason)(discount));
+        if (retainedScannedDiscounts.length) {
+          const retainedDiscounts = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+          retainedScannedDiscounts.forEach(discount => {
+            retainedDiscounts.set(String(discount.id), {
+              ...discount,
+              isScan: true,
+              isAvailable: false,
+              isSelected: false,
+              reasonCode: discount.reasonCode || 'product_not_applicable',
+              appliedProductDetails: [],
+              savedAmount: 0
+            });
+          });
+          this.setDiscountList([...retainedDiscounts.values()]);
+          this.store.originalDiscountList = this.getDiscountList();
+          await this.store.discount?.setOriginalDiscountList(this.getDiscountList());
+          isAccepted = true;
+        }
       }
       return {
         type: "clientCalc",
         isAvailable: isAvailable || false,
+        isAccepted: Boolean(isAccepted),
         productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList(),
+        discountList: this.getDiscountList(),
         unavailableReason
       };
     } catch (error) {
@@ -416,7 +443,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       if (item.booking_id) {
         const product = this.hooks?.getProduct(item);
         (item.discount_list || []).forEach(discount => {
-          if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+          if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
             const index = editModeDiscountList.findIndex(n => n.id === (discount.discount?.resource_id || discount.id));
             if (index !== -1) {
               editModeDiscountList[index] = {
@@ -522,6 +549,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
+        with_entitlement_pass: 1,
+        filter_order_wallet_pass_usage: 0,
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...(orderId ? {
           order_id: orderId
@@ -530,17 +559,34 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       const goodPassList = prepareConfigResult?.discountList || [];
       const scanDiscount = this.getDiscountList()?.filter(item => item.isScan);
 
-      // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-      const scanDiscountIds = scanDiscount.map(n => n.id);
-      const newGoodPassList = goodPassList?.filter(n => !scanDiscountIds.includes(n.id));
-      const newDiscountList = [...scanDiscount, ...(newGoodPassList || [])];
+      // 扫码 Entitlement Pass 与客户列表重复时保留扫码选择状态，但刷新实时余额。
+      // 其他券继续沿用原来的“保留扫码结果、剔除列表重复项”行为。
+      const scanDiscountById = new Map(scanDiscount.map(discount => [String(discount.id), discount]));
+      const refreshedScanEntitlementIds = new Set();
+      const newGoodPassList = goodPassList.flatMap(discount => {
+        const key = String(discount.id);
+        const scannedDiscount = scanDiscountById.get(key);
+        if (!scannedDiscount) return [discount];
+        if ((0, _entitlementPass.isEntitlementPass)(scannedDiscount) && (0, _entitlementPass.isEntitlementPass)(discount)) {
+          refreshedScanEntitlementIds.add(key);
+          return [{
+            ...discount,
+            isScan: true,
+            isSelected: scannedDiscount.isSelected ?? discount.isSelected,
+            isManualSelect: scannedDiscount.isManualSelect ?? discount.isManualSelect
+          }];
+        }
+        return [];
+      });
+      const retainedScanDiscounts = scanDiscount.filter(discount => !refreshedScanEntitlementIds.has(String(discount.id)));
+      const newDiscountList = [...retainedScanDiscounts, ...newGoodPassList];
 
       // 存储原始优惠券列表
       this.store.originalDiscountList = newDiscountList;
       await this.store.discount?.setOriginalDiscountList(newDiscountList);
 
-      // 根据当前预约时间过滤优惠券列表
-      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+      // 日程限制交给 Rules 计算可用状态，展示列表保留当前不可用的卡券。
+      const filteredDiscountList = newDiscountList;
       this.store.filteredDiscountList = filteredDiscountList;
       this.setDiscountList(filteredDiscountList || []);
       if (this.store.productList?.length) {

package/lib/solution/ShopDiscount/utils.d.ts

@@ -59,12 +59,14 @@ export interface ScheduleItem {
 }
 export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣

package/lib/solution/ShopDiscount/utils.js

@@ -3,10 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
+exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountTimeUnavailableReason = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrAfter.default);
+_dayjs.default.extend(_isSameOrBefore.default);
 const uniqueById = (arr, key = 'id') => {
   const seen = new Set();
   return arr.filter(item => !seen.has(item[key]) && seen.add(item[key]));
@@ -35,8 +40,8 @@ const isAllNormalProduct = items => {
  */
 exports.isAllNormalProduct = isAllNormalProduct;
 const getDiscountAmount = (discount, total, price) => {
-  // 商品券
-  if (discount.tag === 'good_pass') {
+  // 商品券和 Entitlement Pass 都是全额抵扣。
+  if ((0, _entitlementPass.isFullCoveragePass)(discount)) {
     return new _decimal.default(price).minus(new _decimal.default(price || 0)).toNumber();
   }
 
@@ -376,41 +381,53 @@ const isInWeeklyRepeatForDate = (targetDate, startDate, repeatRule) => {
 };
 
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 const filterDiscountListByBookingTime = (discountList, bookingTime) => {
-  if (!bookingTime) {
-    return discountList;
-  }
-  return discountList.filter(discount => {
+  if (!bookingTime) return discountList;
+  return discountList.filter(discount => !getDiscountTimeUnavailableReason(discount, bookingTime));
+};
+
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+exports.filterDiscountListByBookingTime = filterDiscountListByBookingTime;
+const getDiscountTimeUnavailableReason = (discount, useTime) => {
+  const useTimeDayjs = (0, _dayjs.default)(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
     if (discount?.metadata?.validity_type === "custom_schedule_validity") {
-      return getDateIsInSchedule(bookingTime, discount.custom_schedule_snapshot?.data || []);
+      return getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || []) ? undefined : 'outside_schedule';
     }
-    try {
-      const isHasStart = !!discount.start_date && !!discount.start_time;
-      const startDate = (0, _dayjs.default)(`${discount.start_date} ${discount.start_time}`);
-      const bookingTimeDayjs = (0, _dayjs.default)(bookingTime);
-
-      // 判断预约时间是否在开始时间之后
-      const isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
-
-      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
-      const isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore((0, _dayjs.default)(discount.expire_time)) : true;
-      return isAfterStart && isBeforeExpire;
-    } catch (error) {
-      return true;
+    const isHasStart = !!discount.start_date && !!discount.start_time;
+    const startDate = (0, _dayjs.default)(`${discount.start_date} ${discount.start_time}`);
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
     }
-  });
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    const expireTime = discount.expire_time ? (0, _dayjs.default)(discount.expire_time) : null;
+    const isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    const validity = discount.extension_data?.find(field => field.field_key === 'valid_times')?.value;
+    if (validity?.restrict_use_by_schedule === true && !getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
 };
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣
  * @returns 是否是订单级别的固定金额折扣卡
  */
-exports.filterDiscountListByBookingTime = filterDiscountListByBookingTime;
+exports.getDiscountTimeUnavailableReason = getDiscountTimeUnavailableReason;
 const isOrderLevelFixedAmountDiscount = discount => {
   return discount.tag === 'product_discount_card' && discount?.metadata?.discount_card_type === 'fixed_amount' && discount?.metadata?.discount_calculation_mode === 'order_level';
 };

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

@@ -127,8 +127,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */