@pisell/pisellos 3.0.78 → 3.0.79

package/lib/modules/Cart/utils/changePrice.js

@@ -60,6 +60,11 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         if (targetBundleItem.price_type === "markdown") {
           targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
         }
+        if (n.option) {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
+            return pre + new import_decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
+          }, 0)).toNumber();
+        }
         if (targetBundleItem) {
           return {
             ...n,

package/lib/modules/Date/index.d.ts

@@ -37,5 +37,5 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;
-    getResourcesListByDate(date: string): any[] | undefined;
+    getResourcesListByDate(date: string): any[];
 }

package/lib/modules/Date/index.js

@@ -64,6 +64,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
     }
   }
   setDateRange(dateRange) {
+    dateRange.forEach((item) => {
+      var _a;
+      if (!((_a = item.resource) == null ? void 0 : _a.length)) {
+        item.resource = this.getResourcesListByDate(item.date);
+      }
+    });
     this.store.dateRange = dateRange;
   }
   getDateRange() {
@@ -252,7 +258,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
   getResourcesListByDate(date) {
     var _a;
     const dateList = this.store.dateList;
-    const resourcesList = (_a = dateList.find((item) => item.date === date)) == null ? void 0 : _a.resource;
+    const resourcesList = ((_a = dateList == null ? void 0 : dateList.find((item) => item.date === date)) == null ? void 0 : _a.resource) || [];
     return resourcesList;
   }
 };

package/lib/modules/Discount/index.d.ts

@@ -22,6 +22,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -111,7 +111,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
-      order_behavior_count_customer_id: customerId || 1
+      order_behavior_count_customer_id: customerId || 1,
+      request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;

package/lib/modules/Rules/index.js

@@ -451,7 +451,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableProducts = [];
       sortedFlattenedList.forEach((flatItem) => {
-        var _a, _b;
+        var _a, _b, _c;
         const occupyingDiscountId = occupiedItems.get(flatItem._id);
         if (occupyingDiscountId !== void 0 && occupyingDiscountId !== discount.id) {
           return;
@@ -471,7 +471,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             num: flatItem.num
           };
         }
-        const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.quantity) || 1);
+        const quantity = flatItem.type === "main" ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.num) || ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1);
         const originalAmount = flatItem.type === "main" ? Number(product.price ?? 0) : Number(flatItem.original_price ?? flatItem.price ?? 0);
         const productData = {
           productId: flatItem._id,
@@ -479,7 +479,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           quantity
         };
         if (flatItem.type === "bundle") {
-          productData.parentQuantity = ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1;
+          productData.parentQuantity = ((_c = flatItem.parentProduct) == null ? void 0 : _c.quantity) || 1;
         }
         applicableProducts.push(productData);
       });

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

@@ -25,4 +25,13 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns
+   */
+    static isInScheduleByDate({ date, schedule, }: {
+        date: string;
+        schedule: any;
+    }): boolean | undefined;
 }

package/lib/modules/Schedule/index.js

@@ -38,6 +38,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_utils = require("../Date/utils");
+var import_utils2 = require("./utils");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
@@ -158,6 +159,65 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  /**
+  * 传入一个时间, 判断改时间是否在schedule 内
+  * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+  * @returns
+  */
+  static isInScheduleByDate({
+    date,
+    schedule
+  }) {
+    var _a, _b, _c, _d;
+    if (schedule.start_time && schedule.end_time) {
+      const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
+        (0, import_dayjs.default)(schedule.start_time)
+      );
+      const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
+      if (isBeforeStartTime || isAfterEndTime) {
+        return false;
+      }
+    }
+    let _schedule = {
+      ...schedule,
+      // 开始时间向前推一天
+      start_time: (0, import_dayjs.default)(date).subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
+      end_time: (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
+    };
+    if (((_b = (_a = _schedule.repeat_rule) == null ? void 0 : _a.end) == null ? void 0 : _b.type) === "never") {
+      _schedule = {
+        ..._schedule,
+        repeat_rule: {
+          ..._schedule.repeat_rule,
+          end: {
+            type: "date",
+            end_date: _schedule.end_time,
+            occurrence: null
+          }
+        }
+      };
+    }
+    if (((_d = (_c = _schedule.repeat_rule) == null ? void 0 : _c.end) == null ? void 0 : _d.type) === "date") {
+      _schedule = {
+        ..._schedule,
+        repeat_rule: {
+          ..._schedule.repeat_rule,
+          end: {
+            ..._schedule.repeat_rule.end,
+            end_date: _schedule.end_time
+          }
+        }
+      };
+    }
+    const dateRanges = (0, import_utils2.calcScheduleDateRange)({ ..._schedule });
+    for (const range of dateRanges) {
+      const startTime = (0, import_dayjs.default)(range.start);
+      const endTime = (0, import_dayjs.default)(range.end);
+      if ((0, import_dayjs.default)(date).isSameOrAfter(startTime) && (0, import_dayjs.default)(date).isSameOrBefore(endTime)) {
+        return true;
+      }
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Summary/index.d.ts

@@ -13,6 +13,7 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    getSurchargeList(): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState['summary']>;
     /**
      * 获取协议
@@ -21,4 +22,6 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
      */
     getProtocol(protocolId: string): Promise<any>;
     storeChange(): void;
+    private getTaxforUtils;
+    private getSurchargeforUtils;
 }

package/lib/modules/Summary/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/modules/Summary/index.ts
@@ -22,7 +32,9 @@ __export(Summary_exports, {
   SummaryModule: () => SummaryModule
 });
 module.exports = __toCommonJS(Summary_exports);
+var import_decimal = __toESM(require("decimal.js"));
 var import_BaseModule = require("../BaseModule");
+var import_Schedule = require("../Schedule");
 var import_utils = require("./utils");
 var SummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -50,11 +62,30 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     if (!this.shopStore) {
       throw new Error("SummaryModule 需要 shopStore 插件支持");
     }
+    this.getSurchargeList();
+  }
+  async getSurchargeList() {
+    const surchargeList = await this.request.get("/order/custom-surcharge/available/v2", {
+      channel: "online-store",
+      is_assemble_product_data: 1,
+      is_assemble_schedule_data: 1,
+      with: ["relationSchedule"]
+    });
+    this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
   }
   async getSummary(cartItems) {
-    var _a, _b;
+    var _a, _b, _c;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems);
+    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
+    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    const scheduleById = {};
+    if (Array.isArray(scheduleList)) {
+      for (let item of scheduleList) {
+        scheduleById[item.id] = item;
+      }
+    }
+    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList, scheduleById);
     this.store.summary = summary;
     return this.store.summary;
   }
@@ -76,6 +107,34 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  getTaxforUtils(items, shopInfo, subtotal) {
+    return (0, import_utils.getTax)({ service: items, bookingDetail: null, bookingId: void 0 }, {
+      computed: {
+        productExpectAmount: subtotal,
+        shopDiscount: 0
+      },
+      isEdit: false,
+      tax_rate: shopInfo == null ? void 0 : shopInfo.tax_rate,
+      is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
+    });
+  }
+  getSurchargeforUtils(items) {
+    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
+    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    const scheduleById = {};
+    if (Array.isArray(scheduleList)) {
+      for (let item of scheduleList) {
+        scheduleById[item.id] = item;
+      }
+    }
+    const surchargeList = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: this.store.surchargeList, scheduleById });
+    const surchargeAmount = new import_decimal.default((0, import_utils.getSurchargeAmount)({ bookingDetail: null, bookingId: void 0 }, surchargeList, { isEdit: false }));
+    return {
+      surchargeList,
+      surchargeAmount: surchargeAmount.toFixed(2)
+    };
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Summary/types.d.ts

@@ -1,5 +1,6 @@
 import { CartItem } from '../Cart/types';
 export interface ISummaryState {
+    surchargeList: any[];
     summary: {
         /** 商品总价 */
         subtotal: string | number;
@@ -11,6 +12,12 @@ export interface ISummaryState {
         totalTaxFee?: string | number;
         /** 商品价格是否包含费率 */
         isPriceIncludeTax?: 0 | 1;
+        /** 附加费金额 */
+        surchargeAmount?: string | number;
+        /** 附加费列表 */
+        surcharge?: any[];
+        /** 税率 */
+        taxRate?: string | number;
         /** 定金 */
         deposit?: {
             /** 定金总价 */

package/lib/modules/Summary/utils.d.ts

@@ -1,12 +1,57 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[], scheduleById: Record<string, any>) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
+export declare const calcDiscountListDifference: (discountList: any[]) => any;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
+/**
+ * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
+ *
+ * - **折扣前税费**：`originTax`
+ * - **折扣后税费**：`tax`（会考虑 `computed.shopDiscount` 对每个商品的分摊影响）
+ * - **税率/是否含税**：优先取 `bookingDetail.tax_rate` / `bookingDetail.is_price_include_tax`，取不到再回退到 `options.tax_rate` / `options.is_price_include_tax`
+ *
+ * **副作用（会修改入参商品对象）**：
+ * - 主商品：写入 `item.original_tax_fee` / `item.tax_fee`（四舍五入保留两位）
+ * - bundle 原价子商品：写入 `bundleItem.original_tax_fee` / `bundleItem.tax_fee`
+ * - 加时商品（`relation_details`）：写入 `atItem.tax_fee`
+ * - 税费舍入差值：追加到最后一个“含税商品”的 `tax_fee_rounding_remainder` / `original_tax_fee_rounding_remainder`
+ *
+ * @param params 入参集合（RORO）
+ * @param params.service 服务商品数组（主商品）。通常是购物车商品结构（可能包含 `bundle` / `relation_details`）
+ * @param params.addons 附加商品数组（可选）。结构同商品数组
+ * @param params.bookingDetail 订单详情（编辑/详情场景用于读取后端税率配置），可选
+ * @param params.bookingId 订单/预约 ID（编辑/详情场景识别用），可选
+ * @param options 计算选项
+ * @param options.isEdit 是否处于“编辑中”。当前实现不强依赖该值（历史逻辑保留），但建议按真实状态传入
+ * @param options.computed 预计算结果（用于折扣分摊）
+ * @param options.computed.productExpectAmount 商品期望总金额（用于按比例分摊折扣）
+ * @param options.computed.shopDiscount 店铺折扣总额（用于按比例分摊到商品）
+ * @param options.tax_rate 管理端税率（百分比，如 5 表示 5%）。仅当 `bookingDetail.tax_rate` 不存在时生效
+ * @param options.is_price_include_tax 是否含税：`0` 不含税、`1` 含税。仅当 `bookingDetail.is_price_include_tax` 不存在时生效
+ * @returns 税费汇总（number，金额单位与商品价格一致，四舍五入保留两位）
+ * @returns.originTax 折扣前税费合计
+ * @returns.tax 折扣后税费合计
+ */
+export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
+    service?: any;
+    addons?: any;
+    bookingDetail?: any;
+    bookingId?: number | undefined;
+}, options: {
+    isEdit: boolean;
+    computed: Record<string, number | string>;
+    tax_rate?: number;
+    is_price_include_tax?: number;
+} & Record<string, any>) => {
+    originTax: number;
+    tax: number;
+};
 /**
  * 计算商品小计（不含其他费用）
  * @param items - 购物车商品数组
@@ -32,3 +77,61 @@ export declare const calculateDeposit: (items: CartItem[]) => {
     protocols: any[];
     hasDeposit: never;
 } | undefined;
+/**
+ * 计算订单附加费金额（订单级别合计）。
+ *
+ * - **详情未编辑**（`!options.isEdit && bookingId`）且存在后端详情时：直接返回 `bookingDetail.surcharge_fee`
+ * - **新增/编辑**时：对 `surcharge`（通常为 `getSurcharge` 的返回值）按 `item.value` 求和
+ *
+ * @param params 入参集合（RORO）
+ * @param params.bookingDetail 订单详情（详情未编辑时用于读取后端的 `surcharge_fee`），可选
+ * @param params.bookingId 订单/预约 ID（详情未编辑时生效），可选
+ * @param surcharge 附加费列表（通常来自 `getSurcharge`），元素结构至少包含 `value: number`
+ * @param options 计算选项
+ * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
+ * @returns 订单附加费金额（number，金额单位与商品价格一致）
+ */
+export declare const getSurchargeAmount: ({ bookingDetail, bookingId }: {
+    bookingDetail?: any;
+    bookingId?: number | undefined;
+}, surcharge: any[], options: any) => any;
+/**
+ * 订单附加费各项信息
+ *
+ * - **详情未编辑**（`!options.isEdit && bookingId`）时：直接返回 `bookingDetail.surcharge`（后端计算结果）
+ * - **新增/编辑**时：按 `options.surcharge_list` 逐条配置计算本次订单的附加费
+ *
+ * 规则要点：
+ * - 匹配范围包含：主商品（`service`）、原价 bundle 子商品（`item.bundle`）、加时商品（`item.relation_details`）、以及 addons（`addons.value`）
+ * - 固定附加费 `fixed`：只加一次，再按商品数量分摊（向下取整保留两位），剩余小数会以 `surcharge_rounding_remainder` 形式抹平到最后一个商品
+ * - 百分比附加费 `percentage`：按每个商品（价格 * 数量）分别计算再累加
+ * - 当 `open_product === 0`：不回写到商品，只在订单级别累加；否则会把单品附加费回写到商品
+ *
+ * **副作用（可能修改入参商品对象）**：
+ * - 当 `open_product !== 0` 时：写入 `item.surcharge_fee`（单品单数量附加费，保留两位、向下取整）
+ * - 写入 `item.relation_surcharge_ids`（关联到的 surcharge 配置 id 列表）
+ * - 写入 `item.surcharge_rounding_remainder`（用于抹平固定附加费/总额舍入差）
+ *
+ * @param params 入参集合（RORO）
+ * @param params.service 服务商品数组（主商品）。元素可能包含 `bundle` / `relation_details`
+ * @param params.addons 附加商品容器。当前实现读取 `addons.value` 作为商品数组（所以通常传 `{ value: CartItem[] }`）
+ * @param params.bookingDetail 订单详情（详情未编辑时用于直接取后端的 surcharge 列表），可选
+ * @param params.bookingId 订单/预约 ID（详情未编辑时生效），可选
+ * @param options 计算选项
+ * @param options.isEdit 是否处于“编辑中”。`false` 且存在 `bookingId` 时会走详情直取逻辑
+ * @param options.surcharge_list 附加费配置列表（后端下发）。缺失/为空则返回空数组
+ * @param options.isInScheduleByDate 判断日期是否落在某个 schedule 内的方法（通常来自 ScheduleModule）
+ * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
+ * @returns 附加费列表（仅返回金额 > 0 的项）
+ */
+export declare const getSurcharge: ({ service, addons, bookingDetail, bookingId }: {
+    service: any;
+    addons: any;
+    bookingDetail?: any;
+    bookingId?: number | undefined;
+}, options: {
+    isEdit: boolean;
+    isInScheduleByDate: any;
+    surcharge_list?: any[];
+    scheduleById?: Record<string, any>;
+} & Record<string, any>) => any;