@pisell/pisellos 2.2.282 → 2.2.284

package/lib/solution/BaseSales/utils.js

@@ -1,72 +1,53 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BaseSales/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  buildProductLineFingerprint: () => buildProductLineFingerprint,
-  createEmptySummary: () => createEmptySummary,
-  getSafeProductNum: () => getSafeProductNum,
-  isSkuOnlyDeleteIdentity: () => isSkuOnlyDeleteIdentity,
-  normalizeOrderProduct: () => normalizeOrderProduct
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../../modules/Order/utils");
-var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
+exports.buildProductLineFingerprint = buildProductLineFingerprint;
+exports.createEmptySummary = createEmptySummary;
+exports.getSafeProductNum = getSafeProductNum;
+exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
+exports.normalizeOrderProduct = normalizeOrderProduct;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _utils = require("../../modules/Order/utils");
+var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 构建金额全为 0 的空 summary。
+ * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
+ */
 function createEmptySummary() {
   return {
     product_quantity: 0,
-    product_original_amount: "0.00",
-    product_amount: "0.00",
-    product_expect_amount: "0.00",
-    product_tax_fee: "0.00",
-    shipping_fee: "0.00",
-    shipping_tax_fee: "0.00",
-    tax_fee: "0.00",
-    surcharge_fee: "0.00",
-    discount_amount: "0.00",
-    deposit_amount: "0.00",
-    expect_amount: "0.00",
-    total_amount: "0.00",
-    amount_gap: "0.00",
-    rounding_amount: "0.00",
-    pay_service_charge_amount: "0.00"
+    product_original_amount: '0.00',
+    product_amount: '0.00',
+    product_expect_amount: '0.00',
+    product_tax_fee: '0.00',
+    shipping_fee: '0.00',
+    shipping_tax_fee: '0.00',
+    tax_fee: '0.00',
+    surcharge_fee: '0.00',
+    discount_amount: '0.00',
+    deposit_amount: '0.00',
+    expect_amount: '0.00',
+    total_amount: '0.00',
+    amount_gap: '0.00',
+    rounding_amount: '0.00',
+    pay_service_charge_amount: '0.00'
   };
 }
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const normalizeOptions = (options) => {
+  const normalizeOptions = options => {
     const optionArr = Array.isArray(options) ? options : [];
-    return optionArr.map((item) => ({
-      option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
-      num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    return optionArr.map(item => ({
+      option_group_item_id: Number(item?.option_group_item_id) || 0,
+      option_group_id: Number(item?.option_group_id) || 0,
+      num: typeof item?.num === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String(item?.add_price ?? item?.price ?? '')
     })).sort((p, q) => {
       if (p.option_group_item_id !== q.option_group_item_id) {
         return p.option_group_item_id - q.option_group_item_id;
@@ -74,68 +55,89 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
       if (p.option_group_id !== q.option_group_id) {
         return p.option_group_id - q.option_group_id;
       }
-      if (p.num !== q.num)
-        return p.num - q.num;
+      if (p.num !== q.num) return p.num - q.num;
       return p.price.localeCompare(q.price);
     });
   };
   const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
-  const normalizedBundles = bundleArr.map((item) => ({
-    bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
-    product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    option: normalizeOptions(item == null ? void 0 : item.option)
+  const normalizedBundles = bundleArr.map(item => ({
+    bundle_id: Number(item?.bundle_id ?? item?.id ?? 0) || 0,
+    product_id: Number(item?.product_id) || 0,
+    product_variant_id: Number(item?.bundle_variant_id ?? item?.product_variant_id) || 0,
+    num: typeof item?.num === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item?.option)
   })).sort((p, q) => {
-    if (p.bundle_id !== q.bundle_id)
-      return p.bundle_id - q.bundle_id;
-    if (p.product_id !== q.product_id)
-      return p.product_id - q.product_id;
+    if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
+    if (p.product_id !== q.product_id) return p.product_id - q.product_id;
     if (p.product_variant_id !== q.product_variant_id) {
       return p.product_variant_id - q.product_variant_id;
     }
-    if (p.num !== q.num)
-      return p.num - q.num;
+    if (p.num !== q.num) return p.num - q.num;
     return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }
 function getSafeProductNum(num) {
-  if (!num || Number.isNaN(num))
-    return 1;
-  if (num < 1)
-    return 1;
+  if (!num || Number.isNaN(num)) return 1;
+  if (num < 1) return 1;
   return Math.floor(num);
 }
+
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
+ */
 function isSkuOnlyDeleteIdentity(x) {
-  if (x.identity_key)
-    return false;
-  return !("product_sku" in x) && !("product_bundle" in x);
+  if (x.identity_key) return false;
+  return !('product_sku' in x) && !('product_bundle' in x);
 }
+
+/**
+ * 对外部传入的商品对象做归一化（v2 composite 语义）：
+ * - 补全可选字段默认值（未传则使用兜底值，避免后续计算时因 undefined 导致异常）
+ * - 对 num 调用 getSafeProductNum 做安全处理
+ * - 保留 _origin 供后续业务流程（如促销规则）使用
+ *
+ * 价格字段语义（metadata 权威源 + composite 派生）：
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），**不含 option**、
+ *   **不含折扣**。是推导 main_product_* 的起点。variant 分支优先读 `metadata.origin.variant[vid].price`。
+ * - `metadata.main_product_original_price`：`source + Σ(option.price × option.num)`，**含 option**、
+ *   **不含折扣**。
+ * - `metadata.main_product_selling_price`：`main_product_original_price - 主商品券 per-unit amount`，
+ *   **含 option**、**含折扣**。
+ * - 行级 `selling_price` = `main_product_selling_price + Σ(bundle_selling_price × num)`。
+ * - 行级 `original_price` = `main_product_original_price + Σ(bundle 原价 × num)`。
+ *
+ * 迁移与幂等：
+ * - `metadata.price_schema_version === 2` → 已新语义归一化，保留 main_product_* 原值（保留折扣）。
+ * - 其它情况（v1 / 缺字段 / 无 metadata）→ 按"main_product_selling_price 曾是 main-only"的旧约定
+ *   反推 legacyDiscount，再以新 source + options 基准重算。最终统一打上 `price_schema_version: 2`。
+ * - 因此多次 normalize 不会重复叠加 option/bundle。
+ */
 function normalizeOrderProduct(product) {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const metadata = { ...product.metadata || {} };
-  const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
+  const metadata = {
+    ...(product.metadata || {})
+  };
+  // 不透明 identity 契约：每条订单行必须带 identity_key。
+  // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
+  const resolvedIdentityKey = product.metadata?.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, _utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
   const priceOverride = metadata.price_override;
-  const originOtherBundle = (_d = (_c = (_b = metadata.origin) == null ? void 0 : _b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle;
+  const originOtherBundle = metadata.origin?._extend?.other?.bundle;
   let bundleInput = product.product_bundle || [];
-  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "" && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
-    const priceById = /* @__PURE__ */ new Map();
-    originOtherBundle.forEach((item) => {
-      if ((item == null ? void 0 : item.id) == null)
-        return;
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = new Map();
+    originOtherBundle.forEach(item => {
+      if (item?.id == null) return;
       const unit = item.price ?? item.bundle_selling_price;
-      if (unit === void 0 || unit === null)
-        return;
+      if (unit === undefined || unit === null) return;
       priceById.set(String(item.id), String(unit));
     });
     const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
-    bundleInput = base.map((item) => {
-      const unit = priceById.get(String(item == null ? void 0 : item.id));
-      if (unit === void 0)
-        return item;
+    bundleInput = base.map(item => {
+      const unit = priceById.get(String(item?.id));
+      if (unit === undefined) return item;
       return {
         ...item,
         price: unit,
@@ -143,86 +145,107 @@ function normalizeOrderProduct(product) {
       };
     });
   }
-  const normalizedBundle = bundleInput.map((item) => ({
+  const normalizedBundle = bundleInput.map(item => ({
     ...item,
     bundle_id: item.bundle_id ?? item.id,
     bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
     bundle_group_id: item.bundle_group_id ?? item.group_id,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
-    price_type: item.price_type ?? item.custom_price_type ?? "",
-    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
+    bundle_selling_price: item.bundle_selling_price ?? item.price ?? '0.00',
+    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? '0.00',
+    price_type: item.price_type ?? item.custom_price_type ?? '',
+    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ''
   }));
-  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const normalizedOptions = (0, _utils.normalizeProductSkuOptions)(product.product_sku?.option);
+  const optionSum = (0, _utils.sumOptionUnitPrice)(normalizedOptions);
   const productSku = {
-    ...(0, import_utils.ensureProductSku)(product),
+    ...(0, _utils.ensureProductSku)(product),
     option: normalizedOptions
   };
-  const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
+
+  // 1) 解析 source_product_price。
+  // 优先级：
+  //   1) metadata.source_product_price（v2 权威）
+  //   2) variantPrice（命中 variant_id，从 metadata.origin.variant[vid].price 读）
+  //   3) _origin.price / _origin.base_price（后端语义的基础价）
+  //   4) v1 兼容：无 v2 标记但存在 metadata.main_product_original_price（v1 main-only，即旧 source）
+  //   5) 入参 original_price（v1 addProduct 约定：original_price 为 pre-discount 基础价）
+  //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
+  const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
+  const variantList = variantId ? metadata?.origin?.variant : null;
+  const variantPrice = Array.isArray(variantList) ? variantList.find(v => Number(v?.id) === variantId)?.price : undefined;
   const resolvedSource = (() => {
-    var _a2, _b2;
-    if (metadata.source_product_price !== void 0) {
+    if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
-    if (variantPrice !== void 0 && variantPrice !== null) {
+    if (variantPrice !== undefined && variantPrice !== null) {
       return String(variantPrice);
     }
-    const originPrice = (_a2 = product._origin) == null ? void 0 : _a2.price;
-    if (originPrice !== void 0 && originPrice !== null) {
+    const originPrice = product._origin?.price;
+    if (originPrice !== undefined && originPrice !== null) {
       return String(originPrice);
     }
-    const originBasePrice = (_b2 = product._origin) == null ? void 0 : _b2.base_price;
-    if (originBasePrice !== void 0 && originBasePrice !== null) {
+    const originBasePrice = product._origin?.base_price;
+    if (originBasePrice !== undefined && originBasePrice !== null) {
       return String(originBasePrice);
     }
-    if (!isV2 && metadata.main_product_original_price !== void 0) {
+    if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return product.original_price ?? product.selling_price ?? "0.00";
+    return product.original_price ?? product.selling_price ?? '0.00';
   })();
-  const mainOriginalDec = new import_decimal.default(Number(resolvedSource) || 0).plus(optionSum);
+
+  // 2) 派生 main_product_original_price（含 option、不含折扣）
+  const mainOriginalDec = new _decimal.default(Number(resolvedSource) || 0).plus(optionSum);
   const mainOriginalStr = mainOriginalDec.toDecimalPlaces(2).toFixed(2);
+
+  // 3) 派生 main_product_selling_price（含 option、含主商品折扣）
+  //    - v2 数据：直接沿用 metadata.main_product_selling_price（保留折扣）
+  //    - v1 metadata：main_product_selling_price 旧语义是 main-only（≈ source-level 折后价），
+  //      反推 legacyDiscount = main_original(旧) - main_selling(旧)，再用新 main_original - legacyDiscount
+  //    - v1 addProduct 入参：top-level selling_price < original_price 表示主商品折扣；
+  //      用差额作为 legacyDiscount 映射到新 main_selling
+  //    - 其它：视为无折扣，main_selling = main_original
   let mainSellingDec;
   if (isV2 && metadata.main_product_selling_price != null) {
-    mainSellingDec = new import_decimal.default(Number(metadata.main_product_selling_price) || 0);
+    mainSellingDec = new _decimal.default(Number(metadata.main_product_selling_price) || 0);
   } else if (metadata.main_product_selling_price != null && metadata.main_product_original_price != null) {
-    const legacyOriginal = new import_decimal.default(Number(metadata.main_product_original_price) || 0);
-    const legacySelling = new import_decimal.default(Number(metadata.main_product_selling_price) || 0);
+    const legacyOriginal = new _decimal.default(Number(metadata.main_product_original_price) || 0);
+    const legacySelling = new _decimal.default(Number(metadata.main_product_selling_price) || 0);
     const legacyDiscount = legacyOriginal.minus(legacySelling);
     mainSellingDec = mainOriginalDec.minus(legacyDiscount);
-  } else if (product.original_price != null && product.selling_price != null && new import_decimal.default(Number(product.original_price) || 0).greaterThan(
-    new import_decimal.default(Number(product.selling_price) || 0)
-  )) {
-    const topOriginal = new import_decimal.default(Number(product.original_price) || 0);
-    const topSelling = new import_decimal.default(Number(product.selling_price) || 0);
+  } else if (product.original_price != null && product.selling_price != null && new _decimal.default(Number(product.original_price) || 0).greaterThan(new _decimal.default(Number(product.selling_price) || 0))) {
+    const topOriginal = new _decimal.default(Number(product.original_price) || 0);
+    const topSelling = new _decimal.default(Number(product.selling_price) || 0);
     const legacyDiscount = topOriginal.minus(topSelling);
     mainSellingDec = mainOriginalDec.minus(legacyDiscount);
   } else {
     mainSellingDec = mainOriginalDec;
   }
   const mainSellingStr = mainSellingDec.toDecimalPlaces(2).toFixed(2);
+
+  // 4) 落盘 metadata：三字段 + schema 版本 sentinel
   metadata.source_product_price = resolvedSource;
   metadata.main_product_original_price = mainOriginalStr;
   metadata.main_product_selling_price = mainSellingStr;
   metadata.price_schema_version = 2;
-  const composedSellingPrice = (0, import_utils.composeLinePrice)({
+
+  // 5) 合成行级 composite（main 已含 option，本步只叠 bundle）
+  const composedSellingPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainSellingStr,
     bundle: normalizedBundle
   });
-  const composedOriginalPrice = (0, import_utils.composeLinePrice)({
+  const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
-  const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata, lineOriginalPrice: product.original_price },
-    composedOriginalPrice
-  );
-  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+  const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({
+    num: product.num,
+    metadata,
+    lineOriginalPrice: product.original_price
+  }, composedOriginalPrice);
+  const discountList = (0, _manualProductDiscount.ensureManualProductDiscountList)({
     discountList: product.discount_list,
     metadata,
     originalPrice: finalOriginalPrice,
@@ -237,19 +260,11 @@ function normalizeOrderProduct(product) {
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,
-    tax_fee: product.tax_fee || "0.00",
+    tax_fee: product.tax_fee || '0.00',
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
-    note: product.note != null ? String(product.note) : ""
+    note: product.note != null ? String(product.note) : ''
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildProductLineFingerprint,
-  createEmptySummary,
-  getSafeProductNum,
-  isSkuOnlyDeleteIdentity,
-  normalizeOrderProduct
-});
+}

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 2 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;