@pisell/pisellos 0.0.474 → 0.0.475

package/dist/modules/Rules/index.js

@@ -1178,18 +1178,21 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _product$price2, _ref8, _product$_promotion$f, _product13;
+              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
+              var 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.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               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;
+              if ((product.discount_list || []).some(function (item) {
+                return item.type === 'promotion';
+              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+                var _product$total, _product$main_product;
+                total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: main_product_selling_price
+                price: product.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,
+                total: total,
                 price: product.price,
                 main_product_selling_price: main_product_selling_price
               }), {}, {
@@ -1339,13 +1342,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
-            var total = targetProductTotal;
+            var _total = targetProductTotal;
             if (product.options) {
-              total = product.options.reduce(function (accumulator, currentValue) {
+              _total = product.options.reduce(function (accumulator, currentValue) {
                 var currentPrice = new Decimal(currentValue.price || 0);
                 var currentNum = new Decimal(currentValue.num || 0);
                 return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(total)).toNumber();
+              }, new Decimal(_total)).toNumber();
             }
 
             // 记录应用了优惠券的商品

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

@@ -1,49 +0,0 @@
-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,18 +869,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               })
             ]);
           } else {
+            let 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;
             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;
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+              total = product.total ?? product.origin_total;
+              main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price
+                  price: product.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,
+                  total,
                   price: product.price,
                   main_product_selling_price
                 },

package/package.json

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