@pisell/pisellos 0.10.55 → 0.10.57

package/lib/modules/Order/index.js

@@ -15,6 +15,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _weighedProduct = require("./utils/weighedProduct");
 var _pickupTiming = require("./pickupTiming");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _availability = require("../Discount/availability");
@@ -567,9 +568,9 @@ class OrderModule extends _BaseModule.BaseModule {
       with_wallet_pass_holder: 1,
       with_available_wallet_flag: 1,
       with_available_wallet_pass_flag: 1,
-      with_virtual_currency: 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
@@ -838,6 +839,7 @@ class OrderModule extends _BaseModule.BaseModule {
       orderTotalAmount: Number(this.store.summary?.total_amount || 0)
     }, {
       reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      reapplyWeighedDiscountProductUids: options?.reapplyWeighedDiscountProductUids,
       preferredEntitlementPassIds: options?.preferredEntitlementPassIds
     });
     if (result?.productList) {
@@ -3938,7 +3940,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const product = uid !== undefined ? tempOrder.products.find(item => String(item.metadata?.unique_identification_number || item.unique_identification_number || '') === String(uid)) : tempOrder.products[(0, _utils3.getProductIdentityIndex)(tempOrder.products, params)];
     return !product || (0, _utils3.getSafeProductNum)(params.updates.num) > product.num;
   }
-  applyOrderProductUpdateToTempOrder(tempOrder, params) {
+  applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
     const {
       product_id,
       product_variant_id,
@@ -4011,7 +4013,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;
@@ -4027,6 +4030,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;
@@ -4043,17 +4063,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 迁移到新价格。
@@ -4065,7 +4085,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));
@@ -4082,7 +4102,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
@@ -4092,6 +4112,37 @@ 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)));
@@ -4129,6 +4180,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);
@@ -4139,9 +4194,11 @@ class OrderModule extends _BaseModule.BaseModule {
     if (this.isRestrictedCartProductUpdate(tempOrder, params)) {
       this.createCartIntentCommitGuard('update_product', tempOrder)();
     }
-    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);
@@ -4163,8 +4220,9 @@ class OrderModule extends _BaseModule.BaseModule {
     if (paramsList.some(params => this.isRestrictedCartProductUpdate(tempOrder, params))) {
       this.createCartIntentCommitGuard('update_product', tempOrder)();
     }
+    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));
@@ -4172,6 +4230,7 @@ class OrderModule extends _BaseModule.BaseModule {
       return acc;
     }, []);
     await this.finalizeAfterProductsMutation(tempOrder, {
+      reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
     });
     this.logInfo('updateOrderProduct success', {
@@ -4307,7 +4366,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({

package/lib/modules/Order/utils/weighedProduct.d.ts

@@ -0,0 +1,12 @@
+/** Only pricing/measurement fields participate; display and option data do not. */
+export declare function getWeighedProductPriceFingerprint(sku?: Record<string, any>): string;
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export declare function resolveWeighedSourcePrice(sku?: Record<string, any>, weighing?: Record<string, any>): string | undefined;
+/** Original bundle totals must use the nested options before manual distribution. */
+export declare function withOriginalBundleOptionPrices(bundles?: Array<Record<string, any>>): {
+    option: any;
+}[] | undefined;

package/lib/modules/Order/utils/weighedProduct.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWeighedProductPriceFingerprint = getWeighedProductPriceFingerprint;
+exports.resolveWeighedSourcePrice = resolveWeighedSourcePrice;
+exports.withOriginalBundleOptionPrices = withOriginalBundleOptionPrices;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const UNIT_GRAMS = {
+  kg: '1000',
+  KILOGRAMS: '1000',
+  g: '1',
+  GRAMS: '1',
+  lb: '453.59237',
+  POUNDS: '453.59237',
+  oz: '28.349523125',
+  OUNCES: '28.349523125'
+};
+function nonNegative(value) {
+  if (value === null || value === undefined || value === '') return undefined;
+  try {
+    const result = new _decimal.default(value);
+    return result.isFinite() && result.gte(0) ? result : undefined;
+  } catch {
+    return undefined;
+  }
+}
+function numericKey(value) {
+  return nonNegative(value)?.toString();
+}
+function unitKey(value) {
+  return UNIT_GRAMS[String(value)] || (value == null ? undefined : String(value));
+}
+function snapshotKey(snapshot) {
+  return [numericKey(snapshot?.price), unitKey(snapshot?.unit), numericKey(snapshot?.unit_value ?? 1)];
+}
+
+/** Only pricing/measurement fields participate; display and option data do not. */
+function getWeighedProductPriceFingerprint(sku) {
+  if (Number(sku?.open_sold_weight) !== 1) return 'unweighed';
+  return JSON.stringify([1, numericKey(sku?.net_weight), unitKey(sku?.unit), numericKey(sku?.unit_price), numericKey(sku?.unit_weight ?? 1), snapshotKey(sku?.unit_data_snapshot)]);
+}
+
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+function resolveWeighedSourcePrice(sku, weighing) {
+  if (sku?.open_sold_weight != null && Number(sku.open_sold_weight) !== 1) return undefined;
+  if (Number(sku?.open_sold_weight) !== 1 && !weighing) return undefined;
+  const hasSkuMeasurement = sku?.net_weight !== undefined && sku?.net_weight !== null;
+  const measurement = hasSkuMeasurement ? sku : weighing;
+  const netWeight = nonNegative(measurement?.net_weight);
+  if (netWeight === undefined) return undefined;
+  const snapshot = hasSkuMeasurement ? sku?.unit_data_snapshot : weighing?.scalePriceProduct;
+  const snapshotPrice = nonNegative(snapshot?.price);
+  const snapshotUnits = nonNegative(snapshot?.unit_value ?? 1);
+  const sourceGrams = UNIT_GRAMS[String(snapshot?.unit)];
+  const targetGrams = UNIT_GRAMS[String(measurement?.unit)];
+  if (snapshotPrice && snapshotUnits?.gt(0) && sourceGrams && targetGrams) {
+    return snapshotPrice.mul(netWeight).mul(targetGrams).div(sourceGrams).div(snapshotUnits).toFixed(2);
+  }
+
+  // Legacy callers may only retain the native scale's amount. Do not let an old
+  // amount overwrite a changed SKU measurement, unit price, or pricing snapshot.
+  const runtimeAmount = nonNegative(weighing?.total_amount);
+  const runtimeMatchesSku = !hasSkuMeasurement || numericKey(weighing?.net_weight) === numericKey(sku?.net_weight) && unitKey(weighing?.unit) === unitKey(sku?.unit) && numericKey(weighing?.unit_price) === numericKey(sku?.unit_price) && numericKey(weighing?.unit_weight ?? 1) === numericKey(sku?.unit_weight ?? 1) && JSON.stringify(snapshotKey(weighing?.scalePriceProduct)) === JSON.stringify(snapshotKey(sku?.unit_data_snapshot));
+  if (runtimeAmount && runtimeMatchesSku) return runtimeAmount.toFixed(2);
+
+  // Older persisted orders have only a rounded per-scale-unit price.
+  const unitPrice = nonNegative(measurement?.unit_price);
+  const unitWeight = nonNegative(measurement?.unit_weight ?? 1);
+  if (!unitPrice || !unitWeight?.gt(0)) return undefined;
+  return netWeight.div(unitWeight).mul(unitPrice).toFixed(2);
+}
+
+/** Original bundle totals must use the nested options before manual distribution. */
+function withOriginalBundleOptionPrices(bundles) {
+  return bundles?.map(bundle => ({
+    ...bundle,
+    option: bundle.option?.map(option => ({
+      ...option,
+      add_price: option.original_price ?? option.add_price ?? option.price
+    }))
+  }));
+}

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

@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js';
-import type { CartItem } from '../Cart';
+import type { CartItem } from "../Cart";
 import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem, VirtualCurrencySnapshotItem } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';

package/lib/modules/Order/utils.js

@@ -131,12 +131,13 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _weighedProduct = require("./utils/weighedProduct");
+var _manualProductDiscount = require("./utils/manualProductDiscount");
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
 var _pickupTiming = require("./pickupTiming");
-var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
@@ -957,7 +958,7 @@ function createDefaultOrderRulesHooks(getBookings) {
       });
       const composedOriginalPrice = composeLinePrice({
         mainPrice: nextMainOriginalPrice,
-        bundle: nextBundle,
+        bundle: Number(product.product_sku?.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadataAny) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(nextBundle) : nextBundle,
         useOriginalBundle: true
       });
       const finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
@@ -1058,6 +1059,7 @@ function ensureCartItemOriginHolder(cartItem, window) {
     form_record: [formRecordId]
   };
 }
+;
 const getAllDiscountList = cartItem => {
   let discountList = cartItem?._origin?.product?.discount_list || [];
   (cartItem?._origin?.product?.product_bundle || []).forEach(item => {
@@ -1538,7 +1540,7 @@ function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(booking => (0, _pickupTiming.isFulfillmentTimingBooking)(booking) || Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),

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

@@ -171,11 +171,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取钱包支付方式
      */
     getWalletPaymentMethod(): Promise<PaymentMethod | null>;
-    /**
-     * 确保支付模块所需的数据库表已创建
-     */
-    /** @deprecated */
-    private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */

package/lib/modules/Payment/index.js

@@ -160,10 +160,6 @@ class PaymentModule extends _BaseModule.BaseModule {
     this.app = this.appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
-
-    // 确保支付模块所需的对象存储已创建
-    // await this.ensurePaymentTables();
-
     this.registerNetworkHandlers();
 
     // // 预连接数据库
@@ -1110,7 +1106,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getCashPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Cash) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取现金支付方式失败', error);
@@ -1123,7 +1119,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getEftposPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Eftpos) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取Eftpos支付方式失败', error);
@@ -1136,7 +1132,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getWalletPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Wallet) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取钱包支付方式失败', error);
@@ -1144,27 +1140,6 @@ class PaymentModule extends _BaseModule.BaseModule {
     }
   }
 
-  /**
-   * 确保支付模块所需的数据库表已创建
-   */
-  /** @deprecated */
-  async ensurePaymentTables() {
-    try {
-      // 尝试访问 pay_method 表，如果不存在会抛出错误
-      await this.dbManager.getAll('pay_method');
-    } catch (error) {
-      console.warn('[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置：');
-      console.warn('{ name: "pay_method", keyPath: "id" }');
-    }
-    try {
-      // 尝试访问 order 表，如果不存在会抛出错误
-      await this.dbManager.getAll('order');
-    } catch (error) {
-      console.warn('[PaymentModule] order 表不存在，请在数据库配置中添加以下配置：');
-      console.warn('{ name: "order", keyPath: "uuid" }');
-    }
-  }
-
   /**
    * 获取部分支付的订单
    */

package/lib/modules/ProductList/index.js

@@ -130,6 +130,19 @@ class ProductList extends _BaseModule.BaseModule {
     };
     const rawApplicationCode = this.otherParams?.channel;
     const mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
+    const configuredBusinessCode = this.otherParams?.businessCode ?? this.otherParams?.business_code;
+    // application_code 是后端商品筛选字段；智能定价评估器则只读取
+    // strategy_context 中的 channel / business_code。默认补齐两者，
+    // 但允许调用方显式传入的上下文覆盖默认值。
+    const resolvedStrategyContext = {
+      ...(mappedApplicationCode ? {
+        channel: mappedApplicationCode
+      } : {}),
+      ...(configuredBusinessCode ? {
+        business_code: configuredBusinessCode
+      } : {}),
+      ...(strategy_context || {})
+    };
     const queryPayload = {
       ...((0, _platform.isCustomerUserPlatform)(this.otherParams?.platform) ? {} : {
         open_quotation: 1
@@ -162,7 +175,7 @@ class ProductList extends _BaseModule.BaseModule {
       with_schedule,
       schedule_datetime,
       extension_type,
-      strategy_context
+      strategy_context: Object.keys(resolvedStrategyContext).length ? resolvedStrategyContext : undefined
     };
     const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     const originalCallback = typeof options?.callback === 'function' ? options.callback : undefined;

package/lib/modules/ResourcePlanner/planner.js

@@ -412,7 +412,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
   };
 }
 function normalizeRequirementGroup(product, requirementGroup) {
-  const resourceType = 'single';
+  const resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   const required = requirementGroup.required !== false;
   const min = required ? 1 : 0;
   return {
@@ -457,7 +457,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(resource => ({
     ...resource,
-    resourceType: 'single',
+    resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
     capacity: Math.max(1, Number(resource.capacity || 1) || 1),
     windows: (resource.windows || []).map(window => ({
       ...window
@@ -573,7 +573,8 @@ function buildCells(projection) {
             occupancy
           }) => occupancy) : [];
           const usedCapacity = segmentOccupancies.reduce((sum, occupancy) => sum + Math.max(1, Number(occupancy.pax || 1) || 1), 0);
-          const remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          const remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           const requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           const reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(occupancy => {
             const source = occupancy.source || 'remote';
@@ -607,7 +608,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -615,7 +616,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1500,7 +1501,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: resource.raw?.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: isPast ? ['past'] : [...(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), 'outside_resource_window']
@@ -1524,7 +1525,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: resource.raw?.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status,
         remainingCapacity,
         maxCapacity,
@@ -2008,7 +2009,8 @@ function validateAvailabilitySelection(projection, params, runtimeOptions = {})
       const remainingCapacity = matchedCell?.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         const capacityPerBooking = normalizedPartySize ?? 1;
-        const availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/lib/modules/Rules/index.js

@@ -225,7 +225,8 @@ class RulesModule extends _BaseModule.BaseModule {
     // 识别出来是不是在编辑的界面里又新增了商品
     // 这种情况下，如果有可用的优惠券，也会自动勾选上
     const isEditModeAddNewProduct = productList.find(n => n.booking_id) && productList.find(n => !n.booking_id);
-    const reapplyBookingDiscountProductUids = new Set((options?.reapplyBookingDiscountProductUids || []).filter(uid => uid !== undefined && uid !== null && uid !== '').map(String));
+    const reapplyWeighedDiscountProductUids = new Set((options?.reapplyWeighedDiscountProductUids || []).map(String));
+    const reapplyBookingDiscountProductUids = new Set([...(options?.reapplyBookingDiscountProductUids || []), ...reapplyWeighedDiscountProductUids].filter(uid => uid !== undefined && uid !== null && uid !== '').map(String));
     const getOriginProductUid = originProduct => {
       const uid = originProduct?.metadata?.unique_identification_number ?? originProduct?.unique_identification_number;
       if (uid === undefined || uid === null || uid === '') return undefined;
@@ -235,8 +236,8 @@ class RulesModule extends _BaseModule.BaseModule {
       if (!selectedDiscount) return false;
       const uid = getOriginProductUid(originProduct);
       if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
-      const discountType = selectedDiscount.tag || selectedDiscount.type || '';
-      return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      const discountType = selectedDiscount.tag || selectedDiscount.type;
+      return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType ?? '');
     };
     const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
@@ -287,8 +288,8 @@ class RulesModule extends _BaseModule.BaseModule {
       };
     }
     const canUseEditModeDiscountForReapply = discount => {
-      const discountType = discount.tag || discount.type || '';
-      return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      const discountType = discount.tag || discount.type;
+      return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType ?? '');
     };
 
     // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
@@ -509,9 +510,9 @@ class RulesModule extends _BaseModule.BaseModule {
       addModeDiscount.forEach(discount => {
         // 即使没有匹配的动态策略，服务端状态和次数限制也不能被覆盖为可用。
         if (discount.reasonCode) return;
-        const discountType = discount.tag || discount.type || '';
+        const discountType = discount.tag || discount.type;
         // 对两类全额抵扣卡和折扣卡执行附加策略检查。
-        if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+        if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType ?? '')) {
           const entitlementQuota = (0, _entitlementPass.isEntitlementPass)(discount) ? (0, _entitlementPass.resolveEntitlementQuota)(discount) : null;
           if ((0, _entitlementPass.isEntitlementPass)(discount) && !entitlementQuota) {
             discount.config = {
@@ -1079,7 +1080,8 @@ class RulesModule extends _BaseModule.BaseModule {
       });
 
       // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
-      if (isPersistedProduct && hasExistingWalletDiscount) {
+      const isReweighedProduct = reapplyWeighedDiscountProductUids.has(getOriginProductUid(originProduct) || '');
+      if (isPersistedProduct && hasExistingWalletDiscount && !isReweighedProduct) {
         if (flatItem.type === 'main') {
           processedProductsMap.set(product._id, [originProduct]);
         }
@@ -1093,7 +1095,7 @@ class RulesModule extends _BaseModule.BaseModule {
       const applicableDiscounts = sortedDiscountList.filter(discount => {
         if (this.isItemRewardProductDiscount(product)) return false;
         // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
-        const discountType = discount.tag || discount.type || '';
+        const discountType = discount.tag || discount.type;
         const currentOriginUid = getOriginProductUid(originProduct);
         const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
         if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
@@ -1101,7 +1103,7 @@ class RulesModule extends _BaseModule.BaseModule {
           if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
           if (!discount.isSelected) return false;
         }
-        if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
+        if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType ?? '') && !isReapplyEditModeDiscountForProduct) {
           // 如果策略检查后没有config，说明不可用
           if (discount.config === undefined || !discount?.config?.isAvailable) {
             return false;
@@ -1172,8 +1174,8 @@ class RulesModule extends _BaseModule.BaseModule {
       // 识别用户本次显式选择的卡券，供次卡和折扣卡各自的优先级使用。
       // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
       const explicitlySelectedDiscount = options?.isSelected === true && options.discountId !== undefined ? applicableDiscounts.find(discount => {
-        const discountType = discount.tag || discount.type || '';
-        return String(discount.id) === String(options.discountId) && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+        const discountType = discount.tag || discount.type;
+        return String(discount.id) === String(options.discountId) && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType ?? '');
       }) : undefined;
       // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
       const explicitlySelectedDiscountCard = explicitlySelectedDiscount && !(0, _entitlementPass.isFullCoveragePass)(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined;
@@ -1182,8 +1184,8 @@ class RulesModule extends _BaseModule.BaseModule {
       // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
       const appliedWalletDiscountIds = new Set((product.discount_list || []).filter(item => ['entitlement_pass', 'discount_card', 'product_discount_card'].includes(item?.tag || item?.type)).map(item => item?.discount?.resource_id ?? item?.resource_id ?? item?.id).filter(id => id !== undefined && id !== null).map(String));
       const appliedDiscountCard = options?.scan ? undefined : applicableDiscounts.find(discount => {
-        const discountType = discount.tag || discount.type || '';
-        return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedWalletDiscountIds.has(String(discount.id));
+        const discountType = discount.tag || discount.type;
+        return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType ?? '') && appliedWalletDiscountIds.has(String(discount.id));
       });
       const appliedEntitlementPass = options?.scan || options?.preserveEntitlementSelection === false ? undefined : applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount) && discount.isSelected === true && appliedWalletDiscountIds.has(String(discount.id)));
 

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

@@ -35,6 +35,8 @@ export interface RulesCalcDiscountOptions {
     preserveEntitlementSelection?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
+    /** Reweighed order lines only: reapply selected wallet discounts against their new amount. */
+    reapplyWeighedDiscountProductUids?: string[];
 }
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;