@pisell/pisellos 0.0.472 → 0.0.474

package/dist/modules/Rules/index.js

@@ -1178,15 +1178,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _product$main_product, _ref8, _product$_promotion$f, _product13, _product$main_product2;
+              var _product$price2, _ref8, _product$_promotion$f, _product13;
+              var main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
+              if (product.booking_id) {
+                var _product$main_product;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price;
+              }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
-                main_product_selling_price: (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price
+                main_product_selling_price: main_product_selling_price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : product.origin_total || product.total,
                 price: product.price,
-                main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
+                main_product_selling_price: main_product_selling_price
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);

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

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

package/dist/solution/Checkout/index.js

@@ -426,7 +426,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 可选，附加费均摊舍入金额
               "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
             },
-            product_bundle: item.product_bundle.map(function (bundle) {
+            product_bundle: (item.product_bundle || []).map(function (bundle) {
               return {
                 is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+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);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Rules/index.js

@@ -869,16 +869,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               })
             ]);
           } else {
+            let main_product_selling_price = product.price ?? product.main_product_selling_price;
+            if (product.booking_id) {
+              main_product_selling_price = product.main_product_selling_price ?? product.price;
+            }
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  main_product_selling_price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total || product.total,
                   price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  main_product_selling_price
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })

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

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

package/lib/solution/Checkout/index.js

@@ -245,7 +245,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             // 可选，附加费均摊舍入金额
             "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
           },
-          product_bundle: item.product_bundle.map((bundle) => {
+          product_bundle: (item.product_bundle || []).map((bundle) => {
             return {
               is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,

package/package.json

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