@pisell/pisellos 0.0.511 → 0.0.512

package/lib/solution/ScanOrder/utils.js

@@ -61,6 +61,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
 function createEmptySummary() {
   return {
@@ -405,31 +406,81 @@ function normalizeOrderProduct(product) {
   if (!metadata.unique_identification_number) {
     metadata.unique_identification_number = resolvedIdentityKey;
   }
-  const resolvedSellingPrice = product.selling_price || "0.00";
-  const resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
-  if (metadata.main_product_original_price === void 0) {
-    metadata.main_product_original_price = resolvedOriginalPrice;
-  }
-  if (metadata.main_product_selling_price === void 0) {
-    metadata.main_product_selling_price = resolvedSellingPrice;
-  }
-  if (metadata.source_product_price === void 0) {
-    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.price) ?? ((_b = product._origin) == null ? void 0 : _b.base_price) ?? resolvedSellingPrice;
-  }
   const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
     bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
     custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? "0.00"
   }));
+  const normalizedOptions = product.product_option_item || [];
+  const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
+  const variantId = Number(product.product_variant_id || 0);
+  const variantList = variantId ? (_a = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _a.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_b = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _b.price : void 0;
+  const resolvedSource = (() => {
+    var _a2, _b2;
+    if (metadata.source_product_price !== void 0) {
+      return String(metadata.source_product_price);
+    }
+    if (variantPrice !== void 0 && variantPrice !== null) {
+      return String(variantPrice);
+    }
+    const originPrice = (_a2 = product._origin) == null ? void 0 : _a2.price;
+    if (originPrice !== void 0 && originPrice !== null) {
+      return String(originPrice);
+    }
+    const originBasePrice = (_b2 = product._origin) == null ? void 0 : _b2.base_price;
+    if (originBasePrice !== void 0 && originBasePrice !== null) {
+      return String(originBasePrice);
+    }
+    if (!isV2 && metadata.main_product_original_price !== void 0) {
+      return String(metadata.main_product_original_price);
+    }
+    return product.original_price ?? product.selling_price ?? "0.00";
+  })();
+  const mainOriginalDec = new import_decimal.default(Number(resolvedSource) || 0).plus(optionSum);
+  const mainOriginalStr = mainOriginalDec.toDecimalPlaces(2).toFixed(2);
+  let mainSellingDec;
+  if (isV2 && metadata.main_product_selling_price != null) {
+    mainSellingDec = new import_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 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);
+    const legacyDiscount = topOriginal.minus(topSelling);
+    mainSellingDec = mainOriginalDec.minus(legacyDiscount);
+  } else {
+    mainSellingDec = mainOriginalDec;
+  }
+  const mainSellingStr = mainSellingDec.toDecimalPlaces(2).toFixed(2);
+  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)({
+    mainPrice: mainSellingStr,
+    bundle: normalizedBundle
+  });
+  const composedOriginalPrice = (0, import_utils.composeLinePrice)({
+    mainPrice: mainOriginalStr,
+    bundle: normalizedBundle,
+    useOriginalBundle: true
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
     identity_key: resolvedIdentityKey,
-    product_option_item: product.product_option_item || [],
-    selling_price: resolvedSellingPrice,
-    original_price: resolvedOriginalPrice,
+    product_option_item: normalizedOptions,
+    selling_price: composedSellingPrice,
+    original_price: composedOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],
@@ -497,7 +548,7 @@ function computeResourceIsFull(params) {
         occupied += pax;
     }
   }
-  return occupied > totalCapacity;
+  return occupied >= totalCapacity;
 }
 function pickFirstCustomCapacityPaxBounds(products) {
   for (const p of products) {

package/lib/solution/VenueBooking/index.js

@@ -1244,7 +1244,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     this.logMethodStart("setDiscountSelected", params);
     try {
       if (!this.store.order)
@@ -1311,11 +1311,18 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-        product.selling_price = newSellingPrice;
+        const optionSum = (0, import_utils3.sumOptionUnitPrice)(product.product_option_item);
+        const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
-          product.metadata.main_product_selling_price = newSellingPrice;
+          product.metadata.main_product_selling_price = newMainSellingPrice;
+          product.metadata.price_schema_version = 2;
         }
+        product.selling_price = (0, import_utils3.composeLinePrice)({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
       }
       import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
       await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
@@ -1323,8 +1330,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       const afterApplyTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
-      const finalSummary = ((_d = this.store.order.getTempOrder()) == null ? void 0 : _d.summary) || null;
-      const finalProduct = ((_f = (_e = this.store.order.getTempOrder()) == null ? void 0 : _e.products) == null ? void 0 : _f[0]) || null;
+      const finalSummary = ((_f = this.store.order.getTempOrder()) == null ? void 0 : _f.summary) || null;
+      const finalProduct = ((_h = (_g = this.store.order.getTempOrder()) == null ? void 0 : _g.products) == null ? void 0 : _h[0]) || null;
       this.logMethodSuccess("setDiscountSelected", params);
       const finalTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       return this.store.order.getDiscountList();

package/package.json

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