@pisell/pisellos 0.0.569 → 0.10.2

package/dist/modules/SalesSummary/utils.js

@@ -883,8 +883,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         _iterator18.f();
       }
       var mainTotal = getMainProductPaymentTotal(product);
-      var surchargeRoundingRemainder = toDecimal(product.surcharge_rounding_remainder);
-      var surchargeFee = toDecimal(product.surcharge_fee).plus(quantity.gt(0) ? surchargeRoundingRemainder.div(quantity) : 0);
+      var surchargeFee = toDecimal(product.surcharge_fee);
       var mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
       var mainTaxPrecise = calculateSingleItemTax({
         price: mainTaxableBase,

package/dist/modules/Schedule/getDateIsInSchedule.js

@@ -6,11 +6,6 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
-import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-dayjs.extend(isSameOrAfter);
-dayjs.extend(isSameOrBefore);
-
 // 获取时间是否在日程范围内
 export var getDateIsInSchedule = function getDateIsInSchedule(dateTime, scheduleList) {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {

package/dist/modules/Schedule/index.js

@@ -255,6 +255,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       var idSet = new Set(ids.map(function (id) {
         return String(id);
       }));
+      console.log('getScheduleListByIds', this.store.scheduleList);
       if (this.store.map instanceof Map && this.store.map.size > 0) {
         return ids.map(function (id) {
           return _this2.store.map.get(Number(id));

package/dist/modules/Schedule/utils.js

@@ -721,6 +721,7 @@ export function getAllSortedDateRanges(schedules) {
 
   // 如果没有找到任何 dateRange，返回空数组
   if (allDateRanges.length === 0) {
+    console.log('No dateRanges found in schedules:', schedules);
     return [];
   }
 

package/dist/modules/Step/index.js

@@ -166,6 +166,7 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
         return n.key === step.key;
       });
       if (index !== -1) {
+        console.log('[StepModule] 步骤已存在，添加失败');
         return;
       }
       if (key) {

package/dist/modules/Summary/utils.js

@@ -60,7 +60,7 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
 
   // 计算总价 不包含折扣卡商品券折扣信息价格
-  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal.plus(surchargeAmount) : subOriginTotal.plus(totalTaxFee).plus(surchargeAmount);
+  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
 
   // 计算定金
   var deposit = calculateDeposit(items);
@@ -616,27 +616,6 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   }, new Decimal(0));
   return totalTaxFee;
 };
-var getCartItemDepositData = function getCartItemDepositData(item) {
-  var _target$_productOrigi, _target$_origin, _target$_origin2;
-  var target = item;
-  return (target === null || target === void 0 || (_target$_productOrigi = target._productOrigin) === null || _target$_productOrigi === void 0 ? void 0 : _target$_productOrigi.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin = target._origin) === null || _target$_origin === void 0 ? void 0 : _target$_origin.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin2 = target._origin) === null || _target$_origin2 === void 0 || (_target$_origin2 = _target$_origin2.product) === null || _target$_origin2 === void 0 ? void 0 : _target$_origin2.custom_deposit_data);
-};
-var getCartItemQuantity = function getCartItemQuantity(item) {
-  return new Decimal((item === null || item === void 0 ? void 0 : item.num) || 1);
-};
-var calculateCartItemDepositTotal = function calculateCartItemDepositTotal(item) {
-  var _item$deposit;
-  var depositData = getCartItemDepositData(item);
-  if ((depositData === null || depositData === void 0 ? void 0 : depositData.has_deposit) == 1 && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_fixed) === 'string' && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_percentage) === 'string') {
-    var _ref7, _summaryTotal;
-    var lineTotal = new Decimal((_ref7 = (_summaryTotal = item.summaryTotal) !== null && _summaryTotal !== void 0 ? _summaryTotal : item.total) !== null && _ref7 !== void 0 ? _ref7 : 0);
-    var quantity = getCartItemQuantity(item);
-    var fixedTotal = new Decimal(depositData.deposit_fixed || 0).times(quantity);
-    var percentageTotal = new Decimal(depositData.deposit_percentage || 0).times(lineTotal);
-    return fixedTotal.plus(percentageTotal);
-  }
-  return new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
-};
 
 /**
  * @title: 计算定金
@@ -651,9 +630,9 @@ export var calculateDeposit = function calculateDeposit(items) {
   var hasDeposit = false;
   var total = items.reduce(function (sum, item) {
     if (item !== null && item !== void 0 && item.deposit) {
-      var _item$deposit2;
+      var _item$deposit, _item$deposit2;
       hasDeposit = true;
-      var cartItemTotalPrice = calculateCartItemDepositTotal(item);
+      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
       // 将协议数据去重合并
       item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
         if (protocols.findIndex(function (p) {
@@ -690,9 +669,9 @@ export var calculateDeposit = function calculateDeposit(items) {
  * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
  * @returns 订单附加费金额（number，金额单位与商品价格一致）
  */
-export var getSurchargeAmount = function getSurchargeAmount(_ref8, surcharge, options) {
-  var bookingDetail = _ref8.bookingDetail,
-    bookingId = _ref8.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref7, surcharge, options) {
+  var bookingDetail = _ref7.bookingDetail,
+    bookingId = _ref7.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -737,17 +716,17 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref9, _ref10, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
+  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
   // 新语义 v2 下 `main_product_selling_price` / `metadata.main_product_selling_price`
   // 已经是"含 option、含主商品折扣"的主价，直接作为主商品基准，无需再减折扣或加 option。
   // 仅需叠加 markup / markdown 类 bundle（原价 bundle 的税费单独处理）。
-  var total = new Decimal((_ref9 = (_ref10 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref10 !== void 0 ? _ref10 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
+  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
 
   // 做个兜底 如果新语义价格字段都没有，则切换回老逻辑
   var hasMainProductPrice = (item === null || item === void 0 ? void 0 : item.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.main_product_original_price) != null;
   if (!hasMainProductPrice) {
-    var _ref11, _ref12, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
-    total = new Decimal((_ref11 = (_ref12 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref12 !== void 0 ? _ref12 : item.price) !== null && _ref11 !== void 0 ? _ref11 : 0);
+    var _ref10, _ref11, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
+    total = new Decimal((_ref10 = (_ref11 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref11 !== void 0 ? _ref11 : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
     var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
       var _item$metadata6;
       return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
@@ -768,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 _ref12, _bundleItem$bundle_se2;
         // 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((_ref12 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -890,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(_ref13, options) {
   var _service$filter;
-  var service = _ref14.service,
-    addons = _ref14.addons,
-    bookingDetail = _ref14.bookingDetail,
-    bookingId = _ref14.bookingId;
+  var service = _ref13.service,
+    addons = _ref13.addons,
+    bookingDetail = _ref13.bookingDetail,
+    bookingId = _ref13.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -1017,11 +996,11 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref15, _bundleItem$bundle_se3;
+                var _ref14, _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((_ref14 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1237,9 +1216,9 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref16) {
-  var service = _ref16.service,
-    addons = _ref16.addons;
+function resetItemsSurchargeSideEffects(_ref15) {
+  var service = _ref15.service,
+    addons = _ref15.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

package/dist/plugins/request.js

@@ -107,12 +107,15 @@ var RequestPluginImpl = /*#__PURE__*/function () {
     // 初始化方法
     function initialize() {
       this.core = globalThis.pisellOS;
+      console.log('[RequestPlugin] 初始化完成');
     }
 
     // 销毁方法
   }, {
     key: "destroy",
-    value: function destroy() {}
+    value: function destroy() {
+      console.log('[RequestPlugin] 已销毁');
+    }
 
     /**
      * 添加请求拦截器

package/dist/plugins/window.js

@@ -312,12 +312,16 @@ var WindowPluginImpl = /*#__PURE__*/function () {
     key: "initialize",
     value:
     // 初始化方法
-    function initialize() {}
+    function initialize() {
+      console.log('[WindowPlugin] 初始化完成');
+    }
 
     // 销毁方法
   }, {
     key: "destroy",
-    value: function destroy() {}
+    value: function destroy() {
+      console.log('[WindowPlugin] 已销毁');
+    }
   }]);
   return WindowPluginImpl;
 }();