@pisell/pisellos 2.2.307 → 2.2.309

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.js

@@ -126,11 +126,12 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
 });
 var _dayjs = _interopRequireDefault(require("dayjs"));
 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 _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
 function isPlainObject(value) {
@@ -773,7 +774,7 @@ function createDefaultOrderRulesHooks() {
       });
       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({

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

@@ -211,7 +211,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;
@@ -915,7 +916,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]);
         }

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

@@ -31,6 +31,8 @@ export interface RulesCalcDiscountOptions {
     scan?: 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>;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
+var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
 var _utils = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
@@ -65,11 +66,11 @@ function appendDataVariantIds(base, ...values) {
   }
   return Array.isArray(base) || result.length ? result : undefined;
 }
-function normalizeOptionItems(optionItems) {
+function normalizeOptionItems(optionItems, useOriginalPrice = false) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(optionItem => {
     const optionGroupItemId = toNumber(optionItem?.option_group_item_id ?? optionItem?.id);
-    const price = optionItem?.price ?? optionItem?.add_price ?? 0;
+    const price = (useOriginalPrice ? optionItem?.original_price : undefined) ?? optionItem?.price ?? optionItem?.add_price ?? 0;
     return {
       ...optionItem,
       option_group_item_id: optionGroupItemId,
@@ -80,10 +81,12 @@ function normalizeOptionItems(optionItems) {
     };
   });
 }
-function normalizeBundleItems(bundleItems, preferPriceField = false) {
+function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundleSellingPrice = false) {
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(bundleItem => {
-    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
+    // Weighed manual prices distribute the bundle base and nested options separately.
+    // Its explicit selling amount already includes those options.
+    const unitSelling = preferPriceField && !preferBundleSellingPrice ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
     const unitStr = toPriceString(unitSelling, '0.00');
     const num = toSafePositiveInt(bundleItem?.num ?? bundleItem?.quantity, 1);
     const magnitudeSource = {
@@ -147,19 +150,25 @@ function transformBaseProductToOrderProduct(params) {
   const productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant?.production_code : origin?.production_code ?? sourceProduct?.production_code);
   const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
-  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
+  // 称重商品使用改价前净重金额；其它商品从商品/variant 快照读取目录价。
+  // 售价仍由 line_total - bundle 推导。
   const catalogSourcePrice = matchedVariant?.price ?? matchedVariant?.base_price ?? origin?.price ?? origin?.base_price ?? sourceProduct?.price ?? sourceProduct?.selling_price ?? sourceProduct?.base_price;
-  const sourceProductPrice = toPriceString(hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice, '0.00');
+  const weighedSourcePrice = (0, _weighedProduct.resolveWeighedSourcePrice)(payload.product_sku ?? origin.product_sku, payload._extend?.weighing ?? origin._extend?.weighing);
+  const sourceProductPrice = toPriceString(weighedSourcePrice ?? (hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice), '0.00');
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item));
-  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride);
+  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+    bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
+    useOriginalBundle: true
+  })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
     extendOriginTotal: payload._extend?.origin_total,
     originExtendOriginTotal: origin?._extend?.origin_total,
@@ -260,6 +269,12 @@ function transformBaseProductToOrderProduct(params) {
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),
     _origin: {
       ...(sourceProduct || {}),
+      ...(weighedSourcePrice !== undefined && hasPriceOverride ? {
+        _extend: {
+          ...sourceProduct?._extend,
+          origin_total: originTotal
+        }
+      } : {}),
       callbackData: payload
     }
   };

package/lib/solution/BaseSales/utils.js

@@ -8,6 +8,7 @@ exports.createEmptySummary = createEmptySummary;
 exports.getSafeProductNum = getSafeProductNum;
 exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
 exports.normalizeOrderProduct = normalizeOrderProduct;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
 var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
@@ -237,7 +238,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/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/UnifiedBookingSales/index.js

@@ -283,10 +283,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   if (product.duration || product.service_duration) return 'duration';

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.307",
+  "version": "2.2.309",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",