@pisell/pisellos 0.0.568 → 0.10.1

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) {
@@ -81,17 +76,23 @@ var isInTimeSlotsSchedule = function isInTimeSlotsSchedule(targetDate, targetDat
     return false;
   }
   var scheduleStartDate = dayjs(schedule.start_time.split(' ')[0]);
+
+  // 检查日期是否在日程的有效范围内（包含 daily / weekly 重复规则）
   if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
+
+  // 检查是否在任一时间段内
   var _iterator2 = _createForOfIteratorHelper(schedule.time_slot),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var timeSlot = _step2.value;
-      var slotStart = dayjs("".concat(targetDateString, " ").concat(timeSlot.start_time, ":00"));
-      var slotEnd = dayjs("".concat(targetDateString, " ").concat(timeSlot.end_time, ":00"));
-      if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
+      var slotStart = "".concat(targetDateString, " ").concat(timeSlot.start_time, ":00");
+      var slotEnd = "".concat(targetDateString, " ").concat(timeSlot.end_time, ":00");
+      var slotStartDate = dayjs(slotStart);
+      var slotEndDate = dayjs(slotEnd);
+      if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
         return true;
       }
     }
@@ -119,7 +120,7 @@ var isInDesignationSchedule = function isInDesignationSchedule(targetDate, targe
       var endDateTime = "".concat(designation.end_date, " ").concat(designation.end_time, ":00");
       var startDate = dayjs(startDateTime);
       var endDate = dayjs(endDateTime);
-      if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
+      if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
         return true;
       }
     }
@@ -217,8 +218,9 @@ var isInDailyRepeat = function isInDailyRepeat(targetDate, startDate, endDate, r
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
 
-  // 每日重复：每天都在相同的时间段内有效 [start, end)
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  // 每日重复：每天都在相同的时间段内有效
+  // 例如：01:00:00 - 16:00:00，每天都是这个时间段
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 
 // 每周重复逻辑
@@ -245,7 +247,7 @@ var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate,
   var targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 
 // 日程时间段类型

package/dist/modules/Schedule/index.d.ts

@@ -9,15 +9,28 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private cacheId;
     private openCache;
     private fatherModule;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 加载当前店铺下所有 schedule
      *
      * @memberof ScheduleModule
      */
-    loadAllSchedule(): Promise<void>;
+    loadAllSchedule(options?: {
+        useCache?: boolean;
+    }): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    private syncScheduleMap;
+    getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
@@ -35,10 +48,10 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
         schedule: any;
     }): boolean;
     /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns
+   */
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;

package/dist/modules/Schedule/index.js

@@ -44,6 +44,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "hasLoadedScheduleList", false);
     return _this;
   }
   _createClass(ScheduleModule, [{
@@ -70,10 +71,14 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               this.store = options === null || options === void 0 ? void 0 : options.store;
               if (options.initialState) {
                 this.store.scheduleList = options.initialState.scheduleList;
+                this.syncScheduleMap();
                 this.store.availabilityDateList = options.initialState.availabilityDateList;
+                this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
               } else {
                 this.store.scheduleList = [];
+                this.store.map = new Map();
                 this.store.availabilityDateList = [];
+                this.hasLoadedScheduleList = false;
               }
               if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
@@ -93,6 +98,22 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      var _otherParams$openCach;
+      var otherParams = params || {};
+      this.openCache = (_otherParams$openCach = otherParams.openCache) !== null && _otherParams$openCach !== void 0 ? _otherParams$openCach : false;
+      this.cacheId = otherParams.cacheId;
+      this.fatherModule = otherParams.fatherModule;
+    }
+
     /**
      * 加载当前店铺下所有 schedule
      *
@@ -102,21 +123,24 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadAllSchedule",
     value: (function () {
       var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _scheduleList$data;
-        var scheduleList;
+        var _options$useCache, _scheduleList$data;
+        var options,
+          scheduleList,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+              _context2.next = 3;
               return this.request.get("/schedule", {
                 num: 999
               }, {
-                useCache: true
+                useCache: (_options$useCache = options.useCache) !== null && _options$useCache !== void 0 ? _options$useCache : true
               });
-            case 2:
+            case 3:
               scheduleList = _context2.sent;
               this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -131,13 +155,31 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "setScheduleList",
     value: function setScheduleList(list) {
       this.store.scheduleList = list;
+      this.syncScheduleMap();
+      this.hasLoadedScheduleList = true;
+    }
+  }, {
+    key: "syncScheduleMap",
+    value: function syncScheduleMap() {
+      this.store.map = new Map((this.store.scheduleList || []).map(function (schedule) {
+        return [Number(schedule.id), schedule];
+      }));
+    }
+  }, {
+    key: "getScheduleList",
+    value: function getScheduleList() {
+      return this.store.scheduleList || [];
+    }
+  }, {
+    key: "isScheduleListLoaded",
+    value: function isScheduleListLoaded() {
+      return this.hasLoadedScheduleList;
     }
   }, {
     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 startDate, endDate, custom_page_id, channel, dates, res, responseData, dateList, otherProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -165,22 +207,25 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 8:
               res = _context3.sent;
-              this.setAvailabilityScheduleDateList(res.data.date_list);
-              this.setOtherProductsIds(res.data.other_product_ids || []);
+              responseData = res.data || {};
+              dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+              otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+              this.setAvailabilityScheduleDateList(dateList);
+              this.setOtherProductsIds(otherProductIds);
               // 如果没有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'))) {
-                _context3.next = 13;
+              if (!(!dateList.length && !otherProductIds.length || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+                _context3.next = 16;
                 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) {
+            case 16:
+              if (otherProductIds.length) {
                 // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
                 dates.forEach(function (n) {
                   n.status = 'available';
                 });
               } else {
-                res.data.date_list.forEach(function (n) {
+                dateList.forEach(function (n) {
                   var index = dates.findIndex(function (m) {
                     return m.date === n.date;
                   });
@@ -191,7 +236,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               }
               dates = disableDatesBeforeOneDay(dates);
               return _context3.abrupt("return", dates);
-            case 16:
+            case 19:
             case "end":
               return _context3.stop();
           }
@@ -205,9 +250,21 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return (this.store.scheduleList || []).filter(function (n) {
-        return ids.includes(n.id);
+      var _this2 = this,
+        _this$store$scheduleL;
+      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));
+        }).filter(Boolean);
+      }
+      var list = (_this$store$scheduleL = this.store.scheduleList) === null || _this$store$scheduleL === void 0 ? void 0 : _this$store$scheduleL.filter(function (n) {
+        return idSet.has(String(n.id));
       });
+      return list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",
@@ -243,7 +300,6 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
     }
-
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
@@ -256,12 +312,11 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
         schedule = _ref2.schedule;
       return getDateIsInSchedule(date, [schedule]);
     }
-
     /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
+    * 传入一个时间, 判断改时间是否在schedule 内
+    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+    * @returns
+    */
   }], [{
     key: "isInScheduleByDate",
     value: function isInScheduleByDate(_ref3) {

package/dist/modules/Schedule/types.d.ts

@@ -25,6 +25,8 @@ export interface LoadScheduleAvailableDateParams {
     channel?: string;
 }
 export interface ScheduleModuleAPI {
+    getScheduleList: () => ScheduleItem[];
+    isScheduleListLoaded: () => boolean;
 }
 export type ScheduleItem = {
     /** 颜色 */

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

@@ -113,14 +113,14 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSummary",
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(cartItems) {
-        var _this$shopStore$get;
+        var _this$shopStore$get, _this$store$surcharge;
         var shopInfo, scheduleModule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
               scheduleModule = this.core.getModule('appointmentBooking_schedule');
-              needScheduleIds = (this.store.surchargeList || []).map(function (item) {
+              needScheduleIds = (_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
               }).flat();
               scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
@@ -208,9 +208,10 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
+      var _this$store$surcharge2;
       // const surchargeList = this.store.surchargeList;
       var scheduleModule = this.core.getModule('appointmentBooking_schedule');
-      var needScheduleIds = (this.store.surchargeList || []).map(function (item) {
+      var needScheduleIds = (_this$store$surcharge2 = this.store.surchargeList) === null || _this$store$surcharge2 === void 0 ? void 0 : _this$store$surcharge2.map(function (item) {
         return item.available_schedule_ids;
       }).flat();
       var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);

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/modules/SurchargeList/index.d.ts

@@ -0,0 +1,18 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { SurchargeListItem, SurchargeListModuleAPI, SurchargeListQuery } from './types';
+export * from './types';
+export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    private loadingPromises;
+    private requestVersion;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    private loadSurchargeList;
+}