@pisell/pisellos 2.1.179 → 2.1.183

package/dist/modules/Schedule/index.js

@@ -136,8 +136,8 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadScheduleAvailableDate",
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
-        var startDate, endDate, custom_page_id, channel, dates, res;
+        var _res$data, _res$data2, _res$data3, _res$data4, _res$data5;
+        var startDate, endDate, custom_page_id, channel, dates, res, _res$data6;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -165,22 +165,22 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 8:
               res = _context3.sent;
-              this.setAvailabilityScheduleDateList(res.data.date_list);
-              this.setOtherProductsIds(res.data.other_product_ids || []);
+              this.setAvailabilityScheduleDateList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.date_list) || []);
+              this.setOtherProductsIds(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.other_product_ids) || []);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+              if (!(!((_res$data3 = res.data) !== null && _res$data3 !== void 0 && (_res$data3 = _res$data3.date_list) !== null && _res$data3 !== void 0 && _res$data3.length) && !((_res$data4 = res.data) !== null && _res$data4 !== void 0 && (_res$data4 = _res$data4.other_product_ids) !== null && _res$data4 !== void 0 && _res$data4.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
                 _context3.next = 13;
                 break;
               }
               return _context3.abrupt("return", dates);
             case 13:
-              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
+              if ((_res$data5 = res.data) !== null && _res$data5 !== void 0 && (_res$data5 = _res$data5.other_product_ids) !== null && _res$data5 !== void 0 && _res$data5.length) {
                 // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
                 dates.forEach(function (n) {
                   n.status = 'available';
                 });
               } else {
-                res.data.date_list.forEach(function (n) {
+                (_res$data6 = res.data) === null || _res$data6 === void 0 || (_res$data6 = _res$data6.date_list) === null || _res$data6 === void 0 || _res$data6.forEach(function (n) {
                   var index = dates.findIndex(function (m) {
                     return m.date === n.date;
                   });

package/dist/modules/Summary/utils.js

@@ -747,9 +747,9 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref13, _bundleItem$bundle_se2;
+        var _ref13, _bundleItem$bundle_se2, _ref14, _bundleItem$num;
         // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price 和 price 其实都已经是折后价格了，不需要单独再减一次
-        var bundleItemTotal = new Decimal((_ref13 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref13 !== void 0 ? _ref13 : 0);
+        var bundleItemTotal = new Decimal((_ref13 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref13 !== void 0 ? _ref13 : 0).times((_ref14 = (_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity) !== null && _ref14 !== void 0 ? _ref14 : 1);
         total = total.add(bundleItemTotal);
       }
     }
@@ -869,12 +869,12 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref14, options) {
+export var getSurcharge = function getSurcharge(_ref15, options) {
   var _service$filter;
-  var service = _ref14.service,
-    addons = _ref14.addons,
-    bookingDetail = _ref14.bookingDetail,
-    bookingId = _ref14.bookingId;
+  var service = _ref15.service,
+    addons = _ref15.addons,
+    bookingDetail = _ref15.bookingDetail,
+    bookingId = _ref15.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -996,11 +996,11 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref15, _bundleItem$bundle_se3;
+                var _ref16, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref15 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref15 !== void 0 ? _ref15 : 0),
+                  total: Number((_ref16 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref16 !== void 0 ? _ref16 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1216,9 +1216,9 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref16) {
-  var service = _ref16.service,
-    addons = _ref16.addons;
+function resetItemsSurchargeSideEffects(_ref17) {
+  var service = _ref17.service,
+    addons = _ref17.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

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/Schedule/index.js

@@ -96,7 +96,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -114,17 +114,17 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         channel
       }
     );
-    this.setAvailabilityScheduleDateList(res.data.date_list);
-    this.setOtherProductsIds(res.data.other_product_ids || []);
-    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    this.setAvailabilityScheduleDateList(((_a = res.data) == null ? void 0 : _a.date_list) || []);
+    this.setOtherProductsIds(((_b = res.data) == null ? void 0 : _b.other_product_ids) || []);
+    if (!((_d = (_c = res.data) == null ? void 0 : _c.date_list) == null ? void 0 : _d.length) && !((_f = (_e = res.data) == null ? void 0 : _e.other_product_ids) == null ? void 0 : _f.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+    if ((_h = (_g = res.data) == null ? void 0 : _g.other_product_ids) == null ? void 0 : _h.length) {
       dates.forEach((n) => {
         n.status = "available";
       });
     } else {
-      res.data.date_list.forEach((n) => {
+      (_j = (_i = res.data) == null ? void 0 : _i.date_list) == null ? void 0 : _j.forEach((n) => {
         const index = dates.findIndex((m) => m.date === n.date);
         if (index !== -1) {
           dates[index].status = "available";

package/lib/modules/Summary/utils.js

@@ -470,7 +470,7 @@ var getMainProductTotal = (item) => {
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-      const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
+      const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0).times(bundleItem.num ?? bundleItem.quantity ?? 1);
       total = total.add(bundleItemTotal);
     }
   }

package/package.json

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