@pisell/pisellos 2.2.308 → 2.2.310

package/lib/modules/Order/index.js

@@ -8,7 +8,10 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _weighedProduct = require("./utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _availability = require("../Discount/availability");
+var _osPrivatePayload = require("../../utils/os-private-payload");
 var _salesNotes = require("./salesNotes");
 var _paymentUtils = require("./payment-utils");
 var _paymentNumber = require("../../utils/payment-number");
@@ -21,6 +24,7 @@ var _discountProductLineIdentity = require("./utils/discountProductLineIdentity"
 var _virtualSettlement = require("./utils/virtualSettlement");
 var _Discount = require("../Discount");
 var _Rules = require("../Rules");
+var _entitlementPass = require("../Discount/entitlementPass");
 var _types2 = require("../Rules/types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
@@ -40,9 +44,27 @@ function isSameDiscountList(left, right) {
 function isManualProductDiscountProduct(product) {
   return (0, _manualProductDiscount.hasManualProductDiscountFlag)(product?.metadata) || (product?.discount_list || []).some(item => item?.type === 'product');
 }
+function syncReducedEntitlementPassUsageCount(discountList, previousQuantity, nextQuantity) {
+  if (!Array.isArray(discountList)) return discountList;
+  const previousCount = (0, _utils3.getSafeProductNum)(previousQuantity);
+  const nextCount = (0, _utils3.getSafeProductNum)(nextQuantity);
+  if (nextCount >= previousCount) return discountList;
+  return discountList.map(discount => {
+    if (!(0, _entitlementPass.isEntitlementPass)(discount)) return discount;
+    const rawUsageCount = Number(discount?.metadata?.num ?? previousCount);
+    const usageCount = Number.isFinite(rawUsageCount) ? Math.max(Math.floor(rawUsageCount), 0) : previousCount;
+    return {
+      ...discount,
+      metadata: {
+        ...(discount?.metadata || {}),
+        num: Math.min(usageCount, nextCount)
+      }
+    };
+  });
+}
 const ORDER_PAYMENT_STATUS_PAID = 'paid';
 const ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
-const CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['good_pass', 'product_discount_card', 'discount_card']);
+const CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['entitlement_pass', 'good_pass', 'product_discount_card', 'discount_card']);
 function isCustomerPromotionDiscount(discount) {
   return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(String(discount?.tag || discount?.type || '').toLowerCase());
 }
@@ -72,12 +94,27 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return `${String(payment.voucher_id)}::${String(payment.status || '')}`;
 }
-function hasPersistedOrderId(orderId) {
-  if (orderId === undefined || orderId === null || orderId === '') return false;
-  if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
-  const normalizedOrderId = Number(orderId);
-  if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
-  return String(orderId).trim() !== '';
+function getDiscountIdentityKey(discount) {
+  const id = discount?.id;
+  if (id === undefined || id === null || id === '') return null;
+  return String(id);
+}
+function mergeCommittedEntitlementWithRuntime(committed, runtime) {
+  const committedAppliedProductDetails = committed.committedAppliedProductDetails?.length ? committed.committedAppliedProductDetails : committed.appliedProductDetails || [];
+  return {
+    ...committed,
+    ...runtime,
+    id: runtime.id ?? committed.id,
+    tag: runtime.tag || committed.tag,
+    type: runtime.type || committed.type,
+    isEditMode: false,
+    isDisabled: runtime.isDisabled ?? false,
+    isSelected: runtime.isSelected ?? committed.isSelected,
+    isUsed: committed.isUsed || runtime.isUsed,
+    committedAppliedProductDetails: [...committedAppliedProductDetails],
+    applicableProductDetails: [...(committed.applicableProductDetails || []), ...(runtime.applicableProductDetails || [])],
+    appliedProductDetails: [...committedAppliedProductDetails, ...(runtime.appliedProductDetails || [])]
+  };
 }
 class OrderModule extends _BaseModule.BaseModule {
   defaultName = 'order';
@@ -92,6 +129,10 @@ class OrderModule extends _BaseModule.BaseModule {
   openCache = false;
   sessionStoragePersistEnabled = false;
   sessionStorageRestoreRecord = null;
+  /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
+  customerWalletPrepareConfigEpoch = 0;
+  /** Payment 可能早于 prepare/config 返回；先按实例 ID 暂存卡号等待 Snapshot。 */
+  pointCardSnapshotCodeCandidates = new Map();
   salesSummaryModuleName;
   rulesHooksOverride;
   moduleHooksOverride;
@@ -130,6 +171,7 @@ class OrderModule extends _BaseModule.BaseModule {
         const key = Number.isFinite(id) ? id : String(resourceId);
         const title = item?.discount?.title ?? {};
         const amount = Number(item?.amount || 0);
+        const encoded = item?.metadata?.encoded || item?.encoded || item?.discount?.encoded || '';
         const discountCardType = item?.discount?.discount_card_type;
         const parValue = isDiscountCard ? discountCardType === 'fixed_amount' ? item?.discount?.fixed_amount ?? item?.amount : item?.discount?.percent : '0';
         const detail = {
@@ -140,11 +182,21 @@ class OrderModule extends _BaseModule.BaseModule {
           original_amount: String(item?.discount?.original_amount ?? item?.amount ?? '0'),
           num: Number(item?.metadata?.num ?? product?.num ?? product?.product_quantity ?? 1) || 1,
           metadata: item?.metadata,
-          discount: item?.discount,
+          discount: {
+            ...(item?.discount || {}),
+            product_id: item?.discount?.product_id ?? product?.product_id
+          },
           _num: Number(item?.metadata?.num ?? product?.num ?? product?.product_quantity ?? 1) || 1
         };
         const existed = discountMap.get(key);
         if (existed) {
+          if (!existed.encoded && encoded) {
+            existed.encoded = encoded;
+            existed.metadata = {
+              ...existed.metadata,
+              encoded
+            };
+          }
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
           if (!isDiscountCard) {
@@ -164,8 +216,11 @@ class OrderModule extends _BaseModule.BaseModule {
         discountMap.set(key, {
           id: key,
           product_name: '',
-          encoded: '',
-          code: '',
+          encoded,
+          code: item?.code || item?.discount?.code || '',
+          metadata: {
+            encoded
+          },
           tag: type,
           product_id: item?.discount?.discount_product_id ?? product?.product_id ?? 0,
           relation_type: '',
@@ -456,13 +511,24 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.rules = rules;
   }
   createDefaultRulesHooks() {
-    return (0, _utils.createDefaultOrderRulesHooks)();
+    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || []);
+  }
+
+  /**
+   * Stable across notifyTempOrderChanged's immutable copy, but changes when a
+   * different local/server order becomes current.
+   */
+  getDiscountConfigOrderIdentityKey(tempOrder) {
+    const identity = this.getOrderIdentity();
+    return JSON.stringify([identity?.orderId ?? tempOrder?.order_id ?? '', tempOrder?.request_unique_idempotency_token ?? '', identity?.externalSaleNumber ?? tempOrder?.external_sale_number ?? '', identity?.localId ?? tempOrder?._extend?.localId ?? this.cacheId ?? '']);
   }
 
   // ─── Discount: 公共 API ───
 
   async loadDiscountConfig(params) {
     const orderId = params.orderId || this.store.tempOrder?.order_id || undefined;
+    const requestEpoch = ++this.customerWalletPrepareConfigEpoch;
+    const requestOrderIdentityKey = this.getDiscountConfigOrderIdentityKey(this.store.tempOrder);
     const prepareConfigResult = await this.store.discount?.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || (orderId ? 'edit' : 'create'),
@@ -471,38 +537,90 @@ class OrderModule extends _BaseModule.BaseModule {
       with_wallet_pass_holder: 1,
       with_available_wallet_flag: 1,
       with_available_wallet_pass_flag: 1,
+      with_entitlement_pass: 1,
+      filter_order_wallet_pass_usage: 0,
       with_virtual_currency: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...(orderId ? {
         order_id: orderId
       } : {})
     });
+    const isCurrentRequest = () => requestEpoch === this.customerWalletPrepareConfigEpoch && this.getDiscountConfigOrderIdentityKey(this.store.tempOrder) === requestOrderIdentityKey && String(this.store.tempOrder?.customer_id ?? '') === String(params.customerId);
+    if (!isCurrentRequest()) {
+      return this.getDiscountList();
+    }
     const discountList = prepareConfigResult?.discountList;
-    this.store.availableWalletIds = prepareConfigResult?.availableWalletIds || [];
-    this.store.virtualCurrencyList = prepareConfigResult?.virtualCurrencyList || [];
     if (prepareConfigResult) {
-      this.writePointCardSnapshotFromPrepareConfig({
-        orderId,
+      this.writeCustomerWalletSnapshotsFromPrepareConfig({
         customerId: params.customerId,
-        availableWalletPassList: prepareConfigResult.availableWalletPassList || []
+        availableWalletIds: prepareConfigResult.availableWalletIds || [],
+        availableWalletPassList: prepareConfigResult.availableWalletPassList || [],
+        virtualCurrencyList: prepareConfigResult.virtualCurrencyList || []
       });
     }
     if (discountList) {
       const currentDiscountList = this.store.discount?.getDiscountList() || [];
-      const currentEditDiscounts = currentDiscountList.filter(discount => discount?.isEditMode);
+      const currentCommittedDiscounts = currentDiscountList.filter(discount => discount?.isEditMode || discount?.committedAppliedProductDetails?.length);
       const currentScanDiscounts = currentDiscountList.filter(discount => discount?.isScan);
-      const currentScanDiscountIds = new Set(currentScanDiscounts.map(discount => discount?.id));
+      const currentScanDiscountById = new Map(currentScanDiscounts.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null ? [] : [[id, discount]];
+      }));
+      const committedDiscountById = new Map(currentCommittedDiscounts.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null ? [] : [[id, discount]];
+      }));
+      const mergedCommittedDiscountIds = new Set();
+      const refreshedScanDiscountIds = new Set();
       const runtimeDiscountIds = new Set();
-      const runtimeDiscounts = discountList.filter(discount => {
-        if (currentScanDiscountIds.has(discount?.id)) return false;
-        if (runtimeDiscountIds.has(discount?.id)) return false;
-        runtimeDiscountIds.add(discount?.id);
-        return true;
+      const runtimeDiscounts = discountList.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        if (id === null) return [discount];
+        if (runtimeDiscountIds.has(id)) return [];
+        runtimeDiscountIds.add(id);
+        const currentScanDiscount = currentScanDiscountById.get(id);
+        if (currentScanDiscount && (!(0, _entitlementPass.isEntitlementPass)(currentScanDiscount) || !(0, _entitlementPass.isEntitlementPass)(discount))) {
+          return [];
+        }
+        const committedDiscount = committedDiscountById.get(id);
+        let nextDiscount = discount;
+        if (committedDiscount && (0, _entitlementPass.isEntitlementPass)(committedDiscount) && (0, _entitlementPass.isEntitlementPass)(discount)) {
+          mergedCommittedDiscountIds.add(id);
+          nextDiscount = mergeCommittedEntitlementWithRuntime(committedDiscount, discount);
+        }
+        if (currentScanDiscount) {
+          refreshedScanDiscountIds.add(id);
+          nextDiscount = {
+            ...nextDiscount,
+            isScan: true,
+            isSelected: currentScanDiscount.isSelected ?? nextDiscount.isSelected,
+            isManualSelect: currentScanDiscount.isManualSelect ?? nextDiscount.isManualSelect
+          };
+        }
+        return [nextDiscount];
+      });
+      const retainedCommittedDiscounts = currentCommittedDiscounts.filter(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null || !mergedCommittedDiscountIds.has(id);
+      }).map(discount => discount.committedAppliedProductDetails?.length ? {
+        ...discount,
+        isEditMode: true,
+        isDisabled: true,
+        isSelected: true,
+        isUsed: true,
+        appliedProductDetails: [...discount.committedAppliedProductDetails]
+      } : discount);
+      const retainedScanDiscounts = currentScanDiscounts.filter(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null || !refreshedScanDiscountIds.has(id);
       });
-      const mergedDiscountList = [...currentEditDiscounts, ...currentScanDiscounts, ...runtimeDiscounts];
+      const mergedDiscountList = [...retainedCommittedDiscounts, ...retainedScanDiscounts, ...runtimeDiscounts];
+      if (!isCurrentRequest()) return this.getDiscountList();
       await this.store.discount?.setOriginalDiscountList(mergedDiscountList);
+      if (!isCurrentRequest()) return this.getDiscountList();
       await this.store.discount?.setDiscountList(mergedDiscountList);
     }
+    if (!isCurrentRequest()) return this.getDiscountList();
     if (params.apply !== false && this.store.tempOrder?.products?.length) {
       this.applyDiscount();
     }
@@ -517,6 +635,9 @@ class OrderModule extends _BaseModule.BaseModule {
   getVirtualCurrencyList() {
     return (0, _lodashEs.cloneDeep)(this.store.virtualCurrencyList || []);
   }
+  getCustomerWalletPrepareConfigEpoch() {
+    return this.customerWalletPrepareConfigEpoch;
+  }
   async syncScannedDiscountsToOriginalDiscountList(discountList) {
     const scanDiscounts = (discountList || []).filter(discount => discount?.isScan);
     if (!scanDiscounts.length) return;
@@ -614,19 +735,34 @@ class OrderModule extends _BaseModule.BaseModule {
       isAvailable: false,
       discountList: this.getDiscountList()
     };
-    const shouldRetainForLater = !isAvailable && unavailableReason === _types2.UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+    const scannedIds = new Set(withScanList.map(discount => String(discount.id)));
+    const evaluatedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(discount => scannedIds.has(String(discount.id)) && isCustomerPromotionDiscount(discount) && !(0, _availability.getDiscountLifecycleReason)(discount));
+    const shouldRetainForLater = !isAvailable && evaluatedScannedDiscounts.length > 0;
     const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
-    const retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
     let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
     if (isAvailable && normalizedNewDiscountList) {
       await this.store.discount?.setDiscountList(normalizedNewDiscountList);
-      this.applyDiscount();
+      // 实际写回商品时沿用扫码试算的优先级，避免旧商品行的选卡覆盖本次扫码。
+      this.applyDiscount({
+        preferredEntitlementPassIds: withScanList.filter(discount => (0, _entitlementPass.isEntitlementPass)(discount)).map(discount => discount.id)
+      });
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
-    } else if (shouldRetainForLater && retainedDiscountList) {
-      // 卡券有效但当前购物车没有适用商品：先保留在 Promotion 中，
-      // 不执行 applyDiscount，避免修改商品价格或订单金额。
-      await this.store.discount?.setDiscountList(retainedDiscountList);
+    } else if (shouldRetainForLater) {
+      // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
+      const retainedDiscounts = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+      evaluatedScannedDiscounts.forEach(discount => {
+        retainedDiscounts.set(String(discount.id), {
+          ...discount,
+          isScan: true,
+          isAvailable: false,
+          isSelected: false,
+          reasonCode: discount.reasonCode || 'product_not_applicable',
+          appliedProductDetails: [],
+          savedAmount: 0
+        });
+      });
+      await this.store.discount?.setDiscountList([...retainedDiscounts.values()]);
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
     }
@@ -635,7 +771,7 @@ class OrderModule extends _BaseModule.BaseModule {
       isAvailable: isAvailable || false,
       isAccepted: Boolean(isAvailable || shouldRetainForLater),
       discountList: resolvedDiscountList,
-      scannedDiscountList: resultDiscountList,
+      scannedDiscountList: evaluatedScannedDiscounts,
       unavailableReason
     };
   }
@@ -667,7 +803,9 @@ class OrderModule extends _BaseModule.BaseModule {
       isFormSubject: product => (0, _utils.resolveIsFormSubject)(tempOrder, product),
       orderTotalAmount: Number(this.store.summary?.total_amount || 0)
     }, {
-      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
+      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      reapplyWeighedDiscountProductUids: options?.reapplyWeighedDiscountProductUids,
+      preferredEntitlementPassIds: options?.preferredEntitlementPassIds
     });
     if (result?.productList) {
       const previousProductsByUid = (0, _utils.indexOrderProductsByUid)(tempOrder.products);
@@ -1005,31 +1143,106 @@ class OrderModule extends _BaseModule.BaseModule {
       now: (0, _utils.formatDateTime)(new Date())
     });
   }
-  clearTempOrderPointCardSnapshot(tempOrder) {
+  clearTempOrderCustomerWalletSnapshots(tempOrder) {
     const orderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list);
     if (!orderMetaList) return;
     const nextOrderMetaList = {
       ...orderMetaList
     };
     delete nextOrderMetaList.point_cards_snapshot;
+    delete nextOrderMetaList.virtual_currency_snapshot;
     if (Object.keys(nextOrderMetaList).length === 0) {
       delete tempOrder.order_meta_list;
       return;
     }
     tempOrder.order_meta_list = nextOrderMetaList;
   }
-  writePointCardSnapshotFromPrepareConfig(params) {
+  clearCustomerWalletState(tempOrder) {
+    this.clearCustomerWalletRuntimeState();
+    this.clearTempOrderCustomerWalletSnapshots(tempOrder);
+  }
+  clearCustomerWalletRuntimeState() {
+    this.customerWalletPrepareConfigEpoch += 1;
+    this.pointCardSnapshotCodeCandidates.clear();
+    this.store.availableWalletIds = [];
+    this.store.virtualCurrencyList = [];
+  }
+  rememberPointCardSnapshotCodeCandidates(value) {
+    (0, _utils.collectPointCardSnapshotCodeCandidates)(value).forEach(({
+      id,
+      code
+    }) => {
+      if (!this.pointCardSnapshotCodeCandidates.has(id)) {
+        this.pointCardSnapshotCodeCandidates.set(id, code);
+      }
+    });
+  }
+  getRememberedPointCardSnapshotCodeCandidates() {
+    return [...this.pointCardSnapshotCodeCandidates].map(([id, code]) => ({
+      id,
+      code
+    }));
+  }
+  getPointCardSnapshotOrderIdentityKey(identity) {
+    if (identity?.externalSaleNumber) {
+      return `external:${identity.externalSaleNumber}`;
+    }
+    if (identity?.orderId !== undefined && identity.orderId !== null) {
+      return `order:${identity.orderId}`;
+    }
+    if (identity?.localId) return `local:${identity.localId}`;
+    if (identity?.orderNumber) return `number:${identity.orderNumber}`;
+    return '';
+  }
+  isPointCardSnapshotMergeContextCurrent(context) {
+    if (!context) return true;
+    if (context.customerId !== undefined && String(context.customerId ?? '') !== String(this.store.tempOrder?.customer_id ?? '')) {
+      return false;
+    }
+    const expectedOrderKey = this.getPointCardSnapshotOrderIdentityKey(context.orderIdentity);
+    return !expectedOrderKey || expectedOrderKey === this.getPointCardSnapshotOrderIdentityKey(this.getOrderIdentity());
+  }
+  writeCustomerWalletSnapshotsFromPrepareConfig(params) {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder) return;
     if (String(tempOrder.customer_id ?? '') !== String(params.customerId)) return;
-    const effectiveOrderId = params.orderId ?? tempOrder.order_id;
-    if (hasPersistedOrderId(effectiveOrderId)) return;
+    const currentOrderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list);
+    const virtualCurrencyList = Array.isArray(params.virtualCurrencyList) ? params.virtualCurrencyList : [];
+    const snapshotsWithExistingCodes = (0, _utils.mergePointCardSnapshotCodes)(params.availableWalletPassList, currentOrderMetaList?.point_cards_snapshot);
+    tempOrder.order_meta_list = {
+      ...(currentOrderMetaList || {}),
+      point_cards_snapshot: (0, _utils.mergePointCardSnapshotCodes)(snapshotsWithExistingCodes, this.getRememberedPointCardSnapshotCodeCandidates()),
+      virtual_currency_snapshot: (0, _utils.buildVirtualCurrencySnapshotFromList)(virtualCurrencyList)
+    };
+    this.store.availableWalletIds = [...params.availableWalletIds];
+    this.store.virtualCurrencyList = (0, _lodashEs.cloneDeep)(virtualCurrencyList);
+    this.persistTempOrder();
+    this.saveDraftInBackground();
+  }
+
+  /**
+   * 将 Payment WalletPass 返回的实例 code 回填到当前订单 Snapshot。
+   * 这里只按资产 ID 补空值，不新增卡、不覆盖 prepare/config 冻结的余额。
+   */
+  mergePointCardSnapshotCodes(walletPassList, context) {
+    const tempOrder = this.store.tempOrder;
+    const currentOrderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder?.order_meta_list);
+    const currentSnapshots = currentOrderMetaList?.point_cards_snapshot || [];
+    if (!tempOrder || !this.isPointCardSnapshotMergeContextCurrent(context)) {
+      return currentSnapshots;
+    }
+    this.rememberPointCardSnapshotCodeCandidates(walletPassList);
+    if (!currentSnapshots.length) return currentSnapshots;
+    const nextSnapshots = (0, _utils.mergePointCardSnapshotCodes)(currentSnapshots, this.getRememberedPointCardSnapshotCodeCandidates());
+    const hasChanged = nextSnapshots.some((snapshot, index) => snapshot.code !== currentSnapshots[index]?.code);
+    if (!hasChanged) return currentSnapshots;
     tempOrder.order_meta_list = {
-      ...((0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list) || {}),
-      point_cards_snapshot: (0, _utils.buildPointCardSnapshotFromWalletPassList)(params.availableWalletPassList)
+      ...(currentOrderMetaList || {}),
+      point_cards_snapshot: nextSnapshots
     };
     this.persistTempOrder();
     this.saveDraftInBackground();
+    return nextSnapshots;
   }
   createExternalSaleNumber() {
     const timestamp = (0, _dayjs.default)().format('YYYYMMDDHHmmssSSS');
@@ -1548,7 +1761,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
-    const extensionType = product?.extension_type || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+    const fullCoveragePassType = discountTypes.find(type => ['entitlement_pass', 'good_pass'].includes(type));
+    const extensionType = product?.extension_type || fullCoveragePassType || 'normal';
     return {
       product_id: product?.product_id ?? null,
       product_variant_id: product?.product_variant_id ?? null,
@@ -1601,7 +1815,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
-    const extensionType = product?.extension_type || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+    const fullCoveragePassType = discountTypes.find(type => ['entitlement_pass', 'good_pass'].includes(type));
+    const extensionType = product?.extension_type || fullCoveragePassType || 'normal';
     return {
       product_id: product?.product_id ?? null,
       product_variant_id: product?.product_variant_id ?? null,
@@ -1810,6 +2025,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const freshTempOrder = this.createDefaultTempOrderInstance();
     this.ensureExternalSaleNumber(freshTempOrder);
     this.store.tempOrder = freshTempOrder;
+    this.clearCustomerWalletRuntimeState();
     this.store.summary = (0, _utils.createEmptySummary)();
     this.store.lastOrderInfo = undefined;
     this.store.syncState = undefined;
@@ -1830,6 +2046,7 @@ class OrderModule extends _BaseModule.BaseModule {
       ensureIdentity: false
     });
     this.store.tempOrder = nextTempOrder;
+    this.clearCustomerWalletRuntimeState();
     if (options?.recalculateSummary !== false) {
       await this.recalculateSummary({
         createIfMissing: false
@@ -2614,7 +2831,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   isCustomerBoundDiscount(discount) {
     const type = discount?.type ?? discount?.tag;
-    return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
+    return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
   }
   shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
     return Boolean(discount?.isScan || discount?.isEditMode);
@@ -2699,9 +2916,8 @@ class OrderModule extends _BaseModule.BaseModule {
       email: tempOrder.email
     });
     const nextCustomerId = tempOrder.customer_id ?? null;
-    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '') && !hasPersistedOrderId(tempOrder.order_id)) {
-      this.store.availableWalletIds = [];
-      this.clearTempOrderPointCardSnapshot(tempOrder);
+    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
+      this.clearCustomerWalletState(tempOrder);
     }
     this.persistTempOrder();
     return {
@@ -2737,11 +2953,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
-      this.store.availableWalletIds = [];
-      this.store.virtualCurrencyList = [];
-      if (!hasPersistedOrderId(tempOrder.order_id)) {
-        this.clearTempOrderPointCardSnapshot(tempOrder);
-      }
+      this.clearCustomerWalletState(tempOrder);
       (0, _utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
@@ -2779,11 +2991,7 @@ class OrderModule extends _BaseModule.BaseModule {
     tempOrder.email = '';
     tempOrder.customer = null;
     if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
-    this.store.availableWalletIds = [];
-    this.store.virtualCurrencyList = [];
-    if (!hasPersistedOrderId(tempOrder.order_id)) {
-      this.clearTempOrderPointCardSnapshot(tempOrder);
-    }
+    this.clearCustomerWalletState(tempOrder);
     this.clearCustomerBoundDiscounts(tempOrder);
     this.applyDiscount();
     this.persistTempOrder();
@@ -3246,17 +3454,35 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     normalizedIncoming.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedIncoming.discount_list);
     const hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
+    const hasIncomingEntitlementPass = this.hasEntitlementPassDiscount(normalizedIncoming);
+    const isIncomingEntitlementAppend = this.isRuntimeEntitlementAppend(productToAdd, tempOrder);
+    const isIncomingPersistedEntitlementPass = hasIncomingEntitlementPass && this.isPersistedProductLine(normalizedIncoming);
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
-    const shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
-    const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
       if (this.hasGoodPassDiscount(item)) return false;
-      if (this.hasOrderProductLineNote(item)) return false;
-      if (isManualProductDiscountProduct(item)) return false;
-      if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
-      if (item.metadata?.is_edit_for_runtime) return false;
+      const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
+      if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
+        return false;
+      }
+      if (isIncomingEntitlementAppend && this.isPersistedProductLine(item)) {
+        return false;
+      }
+      const hasExistingProductNote = this.hasOrderProductLineNote(item);
+      if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
+        return false;
+      }
+      const hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
+      if (isRuntimeEntitlementPass && !this.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+        return false;
+      }
+      if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
+        return false;
+      }
+      if (this.isPersistedProductLine(item)) return false;
       if (item.product_id !== productToAdd.product_id) return false;
       if (item.product_variant_id !== productToAdd.product_variant_id) return false;
       const existedFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(item), item.product_bundle);
@@ -3557,17 +3783,51 @@ class OrderModule extends _BaseModule.BaseModule {
     });
     return tempOrder.products;
   }
-  hasGoodPassDiscount(product) {
-    const hasMainGoodPass = (product.discount_list || []).some(item => item?.type === 'good_pass' || item?.tag === 'good_pass');
-    if (hasMainGoodPass) return true;
-    const bundleDiscountList = [];
+  getFullCoveragePassDiscounts(product) {
+    const discountList = [...(product.discount_list || [])];
     (product.product_bundle || []).forEach(item => {
-      bundleDiscountList.push(...(item?.discount_list || []));
+      discountList.push(...(item?.discount_list || []));
     });
     (product?._extend?.other?.bundle || []).forEach(item => {
-      bundleDiscountList.push(...(item?.discount_list || []));
+      discountList.push(...(item?.discount_list || []));
     });
-    return bundleDiscountList.some(item => item?.type === 'good_pass' || item?.tag === 'good_pass');
+    return discountList.filter(item => (0, _entitlementPass.isFullCoveragePass)(item));
+  }
+  hasEntitlementPassDiscount(product) {
+    return this.getFullCoveragePassDiscounts(product).some(item => (0, _entitlementPass.isEntitlementPass)(item));
+  }
+  hasGoodPassDiscount(product) {
+    return this.getFullCoveragePassDiscounts(product).some(item => !(0, _entitlementPass.isEntitlementPass)(item));
+  }
+  isPersistedProductLine(product) {
+    return product.order_detail_id !== undefined && product.order_detail_id !== null && product.order_detail_id !== '' || product.metadata?.is_edit_for_runtime === true;
+  }
+  isRuntimeEntitlementAppend(product, tempOrder) {
+    if (this.isPersistedProductLine(product)) return false;
+    const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+    const storedOrigin = uid !== undefined && uid !== null && uid !== '' ? tempOrder._extend?.productsByUid?.[String(uid)]?.origin : undefined;
+    return Boolean(product?._origin?.__entitlementPassRuntimeAppend === true || storedOrigin?.__entitlementPassRuntimeAppend === true);
+  }
+  hasSameEntitlementMergePriceConfig(incoming, existing) {
+    const buildPriceConfig = product => {
+      const metadata = product.metadata || {};
+      const bundle = (product.product_bundle || []).map(item => ({
+        bundle_id: item.bundle_id ?? item.id ?? null,
+        bundle_product_id: item.bundle_product_id ?? item._bundle_product_id ?? item.product_id ?? null,
+        bundle_variant_id: item.bundle_variant_id ?? item.product_variant_id ?? 0,
+        price_type: item.price_type ?? item.custom_price_type ?? '',
+        price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ''
+      })).sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
+      return JSON.stringify({
+        original_price: this.normalizeFingerprintMoney(product.original_price),
+        source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
+        main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
+        price_override: this.normalizeFingerprintMoney(metadata.price_override),
+        is_manual_discount: Boolean(metadata.is_manual_discount),
+        bundle
+      });
+    };
+    return buildPriceConfig(incoming) === buildPriceConfig(existing);
   }
   getBundleRuntimeIdentity(bundle) {
     if (!bundle || typeof bundle !== 'object') return '';
@@ -3599,7 +3859,7 @@ class OrderModule extends _BaseModule.BaseModule {
       };
     });
   }
-  applyOrderProductUpdateToTempOrder(tempOrder, params) {
+  applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
     const {
       product_id,
       product_variant_id,
@@ -3672,7 +3932,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const previousLineFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(targetProduct), targetProduct.product_bundle);
     const nextLineFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(nextProduct), nextProduct.product_bundle);
     const callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
-    const callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
+    const callerChangesWeighing = (0, _weighedProduct.getWeighedProductPriceFingerprint)(targetProduct.product_sku) !== (0, _weighedProduct.getWeighedProductPriceFingerprint)(nextProduct.product_sku);
+    const callerChangesLineConfiguration = callerChangesVariant || callerChangesWeighing || previousLineFingerprint !== nextLineFingerprint;
     const isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
     const callerChangesDiscountList = Array.isArray(updates?.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
     const callerUpdatesManualPrice = updates?.metadata?.price_override !== undefined || updates?.metadata?.is_manual_discount !== undefined || updates?.metadata?.product_discount_reason !== undefined || callerChangesDiscountList;
@@ -3688,6 +3949,23 @@ class OrderModule extends _BaseModule.BaseModule {
       };
       return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
     })();
+    const weighedSourcePrice = callerChangesWeighing ? (0, _weighedProduct.resolveWeighedSourcePrice)(nextProduct.product_sku) : undefined;
+    const hasResolvedWeighedPrice = weighedSourcePrice !== undefined;
+    if (hasResolvedWeighedPrice && !callerUpdatesSourcePrice) {
+      const nextMainOriginal = new _decimal.default(weighedSourcePrice).plus((0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(nextProduct)));
+      const previousMainOriginal = new _decimal.default(targetProduct.metadata?.main_product_original_price ?? targetProduct.original_price ?? 0);
+      const previousMainSelling = new _decimal.default(targetProduct.metadata?.main_product_selling_price ?? targetProduct.selling_price ?? 0);
+      // A manual final price remains fixed; other legacy discounts keep their amount
+      // until Rules reapplies the currently selected wallet discount below.
+      const nextMainSelling = isManualProductDiscountProduct(nextProduct) ? previousMainSelling : nextMainOriginal.minus(previousMainOriginal.minus(previousMainSelling));
+      nextProduct.metadata = {
+        ...nextProduct.metadata,
+        source_product_price: weighedSourcePrice,
+        main_product_original_price: callerUpdatesMainOriginalPrice ? nextProduct.metadata.main_product_original_price : nextMainOriginal.toFixed(2),
+        main_product_selling_price: callerUpdatesMainSellingPrice ? nextProduct.metadata.main_product_selling_price : _decimal.default.max(0, nextMainSelling).toFixed(2),
+        price_schema_version: 2
+      };
+    }
     if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
@@ -3704,17 +3982,17 @@ class OrderModule extends _BaseModule.BaseModule {
       // 新配置只传了 source 时，不能把未传的 main_product_* 从旧行继承下来。
       // 以新 source + 新 option 重建券前价；券后价未显式提供时保留旧主商品折扣额。
       const previousMainOriginal = new _decimal.default(Number(targetProduct.metadata?.main_product_original_price) || 0);
-      const previousMainSelling = new _decimal.default(Number(targetProduct.metadata?.main_product_selling_price) || previousMainOriginal.toNumber());
+      const previousMainSelling = new _decimal.default(Number(targetProduct.metadata?.main_product_selling_price ?? previousMainOriginal.toNumber()));
       const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
       const nextMainOriginal = new _decimal.default(Number(updates.metadata.source_product_price) || 0).plus((0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(nextProduct)));
       nextProduct.metadata = {
         ...(nextProduct.metadata || {}),
         source_product_price: String(updates.metadata.source_product_price),
         main_product_original_price: callerUpdatesMainOriginalPrice ? String(updates.metadata.main_product_original_price) : nextMainOriginal.toDecimalPlaces(2).toFixed(2),
-        main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+        main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : hasResolvedWeighedPrice && isManualProductDiscountProduct(nextProduct) ? previousMainSelling.toFixed(2) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
         price_schema_version: 2
       };
-    } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    } else if (callerChangesVariant && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       // variant 已变化但 caller 没有显式报价时，旧 v2 metadata 不能继续充当权威价格源。
       // 清理后由 normalize 优先读取 metadata.origin.variant 中新 variant 的目录价；
       // 顶层 original/selling 的旧差额仍会作为 legacy discount 迁移到新价格。
@@ -3726,7 +4004,7 @@ class OrderModule extends _BaseModule.BaseModule {
       delete nextProduct.metadata.main_product_selling_price;
       delete nextProduct.metadata.main_product_original_price;
       delete nextProduct.metadata.price_schema_version;
-    } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    } else if (callerChangesLineConfiguration && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
       // 但必须让 original 与 selling 一起随新的 option 金额移动。
       const previousOptionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(targetProduct));
@@ -3743,7 +4021,7 @@ class OrderModule extends _BaseModule.BaseModule {
         main_product_selling_price: nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
         price_schema_version: 2
       };
-    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta && !hasResolvedWeighedPrice) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = {
         ...existedMeta
@@ -3753,10 +4031,41 @@ class OrderModule extends _BaseModule.BaseModule {
       delete nextProduct.metadata.main_product_original_price;
       delete nextProduct.metadata.price_schema_version;
     }
+    if (callerChangesLineConfiguration && (0, _weighedProduct.resolveWeighedSourcePrice)(nextProduct.product_sku) !== undefined && nextProduct.metadata.main_product_original_price != null && nextProduct.metadata.main_product_selling_price != null && isManualProductDiscountProduct(nextProduct)) {
+      const originalPrice = (0, _utils.composeLinePrice)({
+        mainPrice: nextProduct.metadata.main_product_original_price,
+        bundle: (0, _weighedProduct.withOriginalBundleOptionPrices)(nextProduct.product_bundle),
+        useOriginalBundle: true
+      });
+      const sellingPrice = (0, _utils.composeLinePrice)({
+        mainPrice: nextProduct.metadata.main_product_selling_price,
+        bundle: nextProduct.product_bundle
+      });
+      const previousManualDiscount = (0, _manualProductDiscount.findManualProductDiscountItem)(nextProduct.discount_list);
+      nextProduct.original_price = originalPrice;
+      nextProduct.metadata = {
+        ...nextProduct.metadata,
+        origin: {
+          ...nextProduct.metadata.origin,
+          _extend: {
+            ...nextProduct.metadata.origin?._extend,
+            origin_total: Number(originalPrice)
+          }
+        }
+      };
+      nextProduct.discount_list = (0, _manualProductDiscount.mergeManualProductDiscountIntoList)(nextProduct.discount_list, (0, _manualProductDiscount.buildManualProductDiscountItem)({
+        originTotal: Number(originalPrice),
+        sellingTotal: Number(sellingPrice),
+        quantity: nextProduct.num,
+        message: previousManualDiscount?.discount.message,
+        discountway: previousManualDiscount?.discount.discountway,
+        discount_per: previousManualDiscount?.discount.discount_per
+      }));
+    }
     // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
     // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
     let normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled((0, _utils.mergeOrderProductDisplayFields)(nextProduct, (0, _utils3.normalizeOrderProduct)(nextProduct)));
-    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedProduct.discount_list);
+    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
     const preservedBookingUid = nextProduct.booking_uid || nextProduct.metadata?.booking_uid || targetProduct.booking_uid || targetProduct.metadata?.booking_uid;
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
@@ -3790,6 +4099,10 @@ class OrderModule extends _BaseModule.BaseModule {
       };
       tempOrder.bookings = [...(tempOrder.bookings || []), linked.booking];
     }
+    if (callerChangesWeighing && !isManualProductDiscountProduct(normalizedProduct)) {
+      const uid = normalizedProduct.metadata?.unique_identification_number;
+      if (uid) reapplyWeighedDiscountProductUids?.push(String(uid));
+    }
     tempOrder.products[productIndex] = normalizedProduct;
     this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], tempOrder.products[productIndex].metadata?.unique_identification_number);
@@ -3797,9 +4110,11 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
-    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const reapplyWeighedDiscountProductUids = [];
+    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
+      reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
     });
     this.sanitizeTempOrderProducts(tempOrder);
@@ -3818,8 +4133,9 @@ class OrderModule extends _BaseModule.BaseModule {
     if (!paramsList.length) {
       return tempOrder.products;
     }
+    const reapplyWeighedDiscountProductUids = [];
     const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
-      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
       // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
       if (params.allow_booking_discount_reapply && updatedProductUid) {
         acc.push(String(updatedProductUid));
@@ -3827,6 +4143,7 @@ class OrderModule extends _BaseModule.BaseModule {
       return acc;
     }, []);
     await this.finalizeAfterProductsMutation(tempOrder, {
+      reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
     });
     this.logInfo('updateOrderProduct success', {
@@ -3873,6 +4190,7 @@ class OrderModule extends _BaseModule.BaseModule {
       throw new Error('[Order] 目标商品不存在，无法更新数量');
     }
     const targetProduct = tempOrder.products[productIndex];
+    const isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
     const normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled((0, _utils3.normalizeOrderProduct)({
       ...targetProduct,
       num: (0, _utils3.getSafeProductNum)(num),
@@ -3881,7 +4199,7 @@ class OrderModule extends _BaseModule.BaseModule {
         unique_identification_number: targetProduct.metadata?.unique_identification_number || unique_identification_number
       }
     }));
-    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedProduct.discount_list);
+    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
     const settlementSnapshot = (0, _virtualSettlement.getSelectedSettlementSnapshot)(normalizedProduct);
     if (this.isMultiCurrencySettlementEnabled() && settlementSnapshot?.settlement_type === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1) {
       const currencyProductId = Number(settlementSnapshot.currency_product_id);
@@ -3958,7 +4276,8 @@ class OrderModule extends _BaseModule.BaseModule {
     this.syncTempOrderHolderFromBookings(tempOrder);
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
-      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
+      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      reapplyWeighedDiscountProductUids: options?.reapplyWeighedDiscountProductUids
     });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({
@@ -4680,11 +4999,21 @@ class OrderModule extends _BaseModule.BaseModule {
       query
     } = params;
     const fetchUrl = url || '/order/sales/checkout';
-    return this.request.post(fetchUrl, query, {
+    const requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : (0, _osPrivatePayload.stripOsPrivatePayloadFields)(query);
+    return this.request.post(fetchUrl, requestQuery, {
       osServer: true,
       customToast: () => {}
     });
   }
+  isSalesCheckoutHandledByOsServer(fetchUrl) {
+    const server = this.core?.server;
+    if (!server || typeof server.hasRoute !== 'function') return false;
+    const requestBaseUrl = String(this.request?.baseUrl || '/shop').replace(/\/+$/, '');
+    if (!requestBaseUrl.startsWith('/')) return false;
+    const normalizedFetchUrl = fetchUrl.startsWith('/') ? fetchUrl : `/${fetchUrl}`;
+    const routePath = normalizedFetchUrl === requestBaseUrl || normalizedFetchUrl.startsWith(`${requestBaseUrl}/`) ? normalizedFetchUrl : `${requestBaseUrl}${normalizedFetchUrl}`;
+    return server.hasRoute('post', routePath) === true;
+  }
 
   /**
    * 发送支付链接邮件。
@@ -4773,6 +5102,7 @@ class OrderModule extends _BaseModule.BaseModule {
       allowUnresolvedSalesNotes: isSessionStorageHydrate
     });
     this.store.tempOrder = nextTempOrder;
+    this.clearCustomerWalletRuntimeState();
     if (isSessionStorageHydrate) {
       // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
       const restoredSessionDiscounts = Array.isArray(raw.discount_list) ? (0, _lodashEs.cloneDeep)(raw.discount_list) : [];