@pisell/pisellos 2.1.151 → 2.1.152

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -0,0 +1,157 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/providers/feishu.ts
+var feishu_exports = {};
+__export(feishu_exports, {
+  feishuLoggerProvider: () => feishuLoggerProvider
+});
+module.exports = __toCommonJS(feishu_exports);
+var DEFAULT_THROTTLE_MS = 3e3;
+var pendingQueue = [];
+var flushTimer = null;
+var cachedProviderConfig;
+function safeStringify(value) {
+  if (value === void 0 || value === null)
+    return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
+    return String(value);
+  }
+  try {
+    return JSON.stringify(value);
+  } catch (error) {
+    return `[unserializable: ${String(error)}]`;
+  }
+}
+function isWebhookUsable(webhook) {
+  if (!webhook)
+    return false;
+  if (webhook.includes("REPLACE_ME"))
+    return false;
+  return true;
+}
+function buildRecordSegments(record) {
+  const context = record.context || {};
+  return [
+    [{ tag: "text", text: `[${record.level}] ${record.timestamp} ${record.title}
+` }],
+    [{ tag: "text", text: `缓存标识: ${safeStringify(context.cacheId)}
+` }],
+    [{ tag: "text", text: `日志来源: ${safeStringify(context)}
+` }],
+    [{ tag: "text", text: `日志内容: ${safeStringify(record.payload)}
+` }],
+    [{ tag: "text", text: `扩展信息: ${safeStringify(record.extra)}
+` }],
+    [{ tag: "text", text: "------\n" }]
+  ];
+}
+function buildFeishuBody(records) {
+  const title = records.length === 1 ? records[0].title : `ScanOrder 日志批量 (${records.length} 条)`;
+  const content = [];
+  records.forEach((record) => {
+    buildRecordSegments(record).forEach((segment) => content.push(segment));
+  });
+  return JSON.stringify({
+    msg_type: "post",
+    content: JSON.stringify({
+      post: {
+        zh_cn: {
+          title,
+          content
+        }
+      }
+    })
+  });
+}
+async function postToFeishu(webhook, body) {
+  await fetch(webhook, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body
+  });
+}
+async function flushQueue() {
+  var _a;
+  flushTimer = null;
+  if (!pendingQueue.length)
+    return;
+  const records = pendingQueue.splice(0, pendingQueue.length);
+  const webhook = (_a = cachedProviderConfig == null ? void 0 : cachedProviderConfig.feishu) == null ? void 0 : _a.webhook;
+  if (!isWebhookUsable(webhook)) {
+    return;
+  }
+  if (typeof fetch !== "function") {
+    console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志批量上报");
+    return;
+  }
+  try {
+    await postToFeishu(webhook, buildFeishuBody(records));
+  } catch (error) {
+    console.warn("[ScanOrderLogger] Feishu 批量上报失败", error);
+  }
+}
+var feishuLoggerProvider = {
+  async send(payload) {
+    var _a, _b, _c, _d, _e, _f;
+    cachedProviderConfig = payload.providerConfig;
+    const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
+    const errorHook = (_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.errorHook;
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    if (payload.record.level === "error" && isWebhookUsable(errorHook)) {
+      try {
+        await postToFeishu(errorHook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu errorHook 上报失败", error);
+      }
+      return;
+    }
+    if (!webhook) {
+      console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
+      return;
+    }
+    if (!isWebhookUsable(webhook))
+      return;
+    const throttleMs = ((_f = (_e = payload.providerConfig) == null ? void 0 : _e.feishu) == null ? void 0 : _f.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    if (throttleMs <= 0) {
+      try {
+        await postToFeishu(webhook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu 日志上报失败", error);
+      }
+      return;
+    }
+    pendingQueue.push(payload.record);
+    if (!flushTimer) {
+      flushTimer = setTimeout(() => {
+        void flushQueue();
+      }, throttleMs);
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  feishuLoggerProvider
+});

package/lib/modules/ScanOrderLogger/providers/grafana.d.ts

@@ -0,0 +1,2 @@
+import { ScanOrderLoggerProvider } from '../types';
+export declare const grafanaLoggerProvider: ScanOrderLoggerProvider;

package/lib/modules/ScanOrderLogger/providers/grafana.js

@@ -0,0 +1,52 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/providers/grafana.ts
+var grafana_exports = {};
+__export(grafana_exports, {
+  grafanaLoggerProvider: () => grafanaLoggerProvider
+});
+module.exports = __toCommonJS(grafana_exports);
+var grafanaLoggerProvider = {
+  async send(payload) {
+    var _a, _b, _c, _d;
+    const endpoint = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.grafana) == null ? void 0 : _b.endpoint;
+    if (!endpoint) {
+      console.warn("[ScanOrderLogger] Grafana endpoint 未配置，跳过日志上报");
+      return;
+    }
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Grafana 日志上报");
+      return;
+    }
+    await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...((_d = (_c = payload.providerConfig) == null ? void 0 : _c.grafana) == null ? void 0 : _d.headers) || {}
+      },
+      body: JSON.stringify({
+        record: payload.record
+      })
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  grafanaLoggerProvider
+});

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

@@ -0,0 +1,53 @@
+export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
+export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
+export interface ScanOrderLoggerProviderFeishuConfig {
+    webhook?: string;
+    errorHook?: string;
+    /**
+     * 节流窗口毫秒数，默认 3000ms
+     * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送
+     * - <=0：关闭节流，保持每条日志立即单独发送
+     */
+    throttleMs?: number;
+}
+export interface ScanOrderLoggerProviderGrafanaConfig {
+    endpoint?: string;
+    headers?: Record<string, string>;
+}
+export interface ScanOrderLoggerProviderConfig {
+    feishu?: ScanOrderLoggerProviderFeishuConfig;
+    grafana?: ScanOrderLoggerProviderGrafanaConfig;
+}
+export interface ScanOrderLoggerContext {
+    cacheId?: string;
+    solutionName?: string;
+    moduleName?: string;
+    [key: string]: any;
+}
+export interface ScanOrderLogInput {
+    level?: ScanOrderLogLevel;
+    title: string;
+    payload?: Record<string, any>;
+    extra?: Record<string, any>;
+    timestamp?: string;
+}
+export interface ScanOrderLogRecord {
+    level: ScanOrderLogLevel;
+    title: string;
+    timestamp: string;
+    payload: Record<string, any>;
+    extra: Record<string, any>;
+    context: ScanOrderLoggerContext;
+}
+export interface ScanOrderLoggerDispatchPayload {
+    record: ScanOrderLogRecord;
+    providerConfig?: ScanOrderLoggerProviderConfig;
+}
+export interface ScanOrderLoggerProvider {
+    send: (payload: ScanOrderLoggerDispatchPayload) => Promise<void>;
+}
+export interface ScanOrderLoggerState {
+    provider: ScanOrderLoggerProviderType;
+    providerConfig: ScanOrderLoggerProviderConfig;
+    context: ScanOrderLoggerContext;
+}

package/lib/modules/ScanOrderLogger/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -70,7 +70,7 @@ var isInStandardSchedule = (targetDate, targetDateString, targetTimeString, sche
   }
   const startDate = (0, import_dayjs.default)(schedule.start_time);
   const endDate = (0, import_dayjs.default)(schedule.end_time);
-  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
+  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate);
   if (schedule.repeat_type === "none") {
     return isInBasicRange;
   }
@@ -80,16 +80,14 @@ var isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, sch
   if (!schedule.start_time) {
     return false;
   }
-  const scheduleDate = schedule.start_time.split(" ")[0];
-  if (targetDateString !== scheduleDate) {
+  const scheduleStartDate = (0, import_dayjs.default)(schedule.start_time.split(" ")[0]);
+  if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
   for (const timeSlot of schedule.time_slot) {
-    const slotStart = `${scheduleDate} ${timeSlot.start_time}:00`;
-    const slotEnd = `${scheduleDate} ${timeSlot.end_time}:00`;
-    const slotStartDate = (0, import_dayjs.default)(slotStart);
-    const slotEndDate = (0, import_dayjs.default)(slotEnd);
-    if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
+    const slotStart = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.start_time}:00`);
+    const slotEnd = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.end_time}:00`);
+    if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
       return true;
     }
   }
@@ -104,7 +102,7 @@ var isInDesignationSchedule = (targetDate, targetDateString, targetTimeString, s
     const endDateTime = `${designation.end_date} ${designation.end_time}:00`;
     const startDate = (0, import_dayjs.default)(startDateTime);
     const endDate = (0, import_dayjs.default)(endDateTime);
-    if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
+    if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
       return true;
     }
   }
@@ -158,7 +156,7 @@ var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetDayOfWeek = targetDate.day();
@@ -175,7 +173,7 @@ var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 var getScheduleStartEndTimePoints = (date, scheduleList) => {
   if (!date || !scheduleList || scheduleList.length === 0) {

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

@@ -46,7 +46,7 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 };
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
-export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => {};
+export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => ScheduleAllMap;
 /**
  * @title: 格式化日程数据
  * @description:

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

@@ -6,8 +6,6 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
-        /** 最终原始价格 不包含折扣卡商品券折扣 */
-        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

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

@@ -7,8 +7,8 @@ export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], i
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
-export declare const calcDiscountListDifference: (discountList: any[]) => any;
-export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
+export declare const calcDiscountListDifference: (discountList: any[]) => number;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => number;
 /**
  * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
  *
@@ -58,12 +58,6 @@ export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
-/**
- * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
- * @param items - 购物车商品数组
- * @returns 商品总价字符串，保留2位小数
- */
-export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:
@@ -100,7 +94,7 @@ export declare const calculateDeposit: (items: CartItem[]) => {
 export declare const getSurchargeAmount: ({ bookingDetail, bookingId }: {
     bookingDetail?: any;
     bookingId?: number | undefined;
-}, surcharge: any[], options: any) => any;
+}, surcharge: any[], options: any) => number;
 /**
  * 订单附加费各项信息
  *

package/lib/modules/Summary/utils.js

@@ -31,7 +31,6 @@ var utils_exports = {};
 __export(utils_exports, {
   calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
-  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -47,7 +46,6 @@ var import_utils = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
-  const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
   const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById });
   const surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
@@ -61,12 +59,10 @@ var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList,
     is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
   });
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
-  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
-    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     taxRate: shopInfo == null ? void 0 : shopInfo.tax_rate,
     totalTaxFee: tax,
@@ -91,8 +87,8 @@ var getBundleDiscountList = (bundle) => {
 var calcDiscountListDifference = (discountList) => {
   return discountList.reduce((pre, cur) => {
     var _a;
-    return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
-  }, 0);
+    return pre.plus(((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+  }, new import_decimal.default(0)).toNumber();
 };
 var getProductDiscountProductDiscountDifference = (item) => {
   var _a, _b, _c, _d;
@@ -364,16 +360,6 @@ var calculateSubtotal = (items) => {
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
-var calculateOriginSubtotal = (items) => {
-  if (!(items == null ? void 0 : items.length)) {
-    return "0.00";
-  }
-  const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.summaryOriginTotal || 0);
-    return sum.plus(cartItemTotalPrice);
-  }, new import_decimal.default(0));
-  return subtotal.toFixed(2);
-};
 var calculateTaxFee = (shopInfo, items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
@@ -422,8 +408,8 @@ var getSurchargeAmount = ({ bookingDetail, bookingId }, surcharge, options) => {
   if (!Array.isArray(surcharge))
     return 0;
   return surcharge.reduce((total, item) => {
-    return total + (item.value || 0);
-  }, 0);
+    return total.plus(item.value || 0);
+  }, new import_decimal.default(0)).toNumber();
 };
 var getBundleItemIsOriginalPrice = (item) => {
   return (item == null ? void 0 : item.price_type) === "markup" && (item == null ? void 0 : item.price_type_ext) === "product_price";
@@ -443,18 +429,24 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f;
-  let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
-    var _a2;
-    return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-  })) || [];
-  const mainProductDiscountAmount = getDiscountAmount(discount);
-  total = total.minus(mainProductDiscountAmount);
-  if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
-    total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
-      return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
-    }, new import_decimal.default(0)));
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  let total = new import_decimal.default(
+    (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
+  );
+  const hasMainProductPrice = (item == null ? void 0 : item.main_product_selling_price) != null || ((_c = item == null ? void 0 : item.metadata) == null ? void 0 : _c.main_product_selling_price) != null || ((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.main_product_original_price) != null;
+  if (!hasMainProductPrice) {
+    total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.main_product_selling_price) ?? item.price ?? 0);
+    const discount = ((_g = (_f = item == null ? void 0 : item._origin) == null ? void 0 : _f.product) == null ? void 0 : _g.discount_list) || ((_j = (_i = (_h = item == null ? void 0 : item._originData) == null ? void 0 : _h.product) == null ? void 0 : _i.discount_list) == null ? void 0 : _j.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    })) || [];
+    const mainProductDiscountAmount = getDiscountAmount(discount);
+    total = total.minus(mainProductDiscountAmount);
+    if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
+      total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
+        return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
+      }, new import_decimal.default(0)));
+    }
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -799,7 +791,6 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   calculateDeposit,
-  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

package/lib/modules/index.d.ts

@@ -11,4 +11,8 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
+export * from './SalesSummary';
 export * from './Schedule';
+export * from './Quotation';
+export * from './ScanOrderLogger';
+export * from './OpenData';

package/lib/modules/index.js

@@ -29,7 +29,11 @@ __reExport(modules_exports, require("./Payment"), module.exports);
 __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
+__reExport(modules_exports, require("./SalesSummary"), module.exports);
 __reExport(modules_exports, require("./Schedule"), module.exports);
+__reExport(modules_exports, require("./Quotation"), module.exports);
+__reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
+__reExport(modules_exports, require("./OpenData"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -45,5 +49,9 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Resource"),
   ...require("./Step"),
   ...require("./Summary"),
-  ...require("./Schedule")
+  ...require("./SalesSummary"),
+  ...require("./Schedule"),
+  ...require("./Quotation"),
+  ...require("./ScanOrderLogger"),
+  ...require("./OpenData")
 });

package/lib/plugins/window.d.ts

@@ -1,4 +1,3 @@
-import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -15,7 +14,6 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
-    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/solution/BookingByStep/index.d.ts

@@ -144,7 +144,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
-        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
@@ -302,7 +301,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;

package/lib/solution/BookingByStep/index.js

@@ -1235,7 +1235,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
         const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
         if (hasOriginTimeSlot) {
@@ -1368,7 +1368,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap
+              countMap: selectResourcesMap,
+              targetDate: (_k = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _k.date,
+              durationMinutes: ((_l = item == null ? void 0 : item.duration) == null ? void 0 : _l.value) || ((_n = (_m = item == null ? void 0 : item._productOrigin) == null ? void 0 : _m.duration) == null ? void 0 : _n.value) || 10
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
@@ -1405,7 +1407,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code) {
+  getTimeSlotByAllResources(resources_code, split = 10) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1563,7 +1565,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split: 10,
+      split,
       resourcesUseableMap,
       capacity: maxCapacity,
       cut_off_time: maxCutOffTime,

package/lib/solution/BookingByStep/types.d.ts

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -14,6 +14,8 @@ export interface BookingByStepState {
     currentProduct?: ProductData;
     currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
+    salesSummary?: SalesSummaryModule;
+    scanOrderLogger?: ScanOrderLoggerModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/lib/solution/BookingByStep/types.js

@@ -36,6 +36,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "salesSummary":
+      return new import_modules.SalesSummaryModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     case "step":
       return new import_modules.StepModule(
         `${solutionName}_${name || moduleName}`,
@@ -71,6 +76,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "scanOrderLogger":
+      return new import_modules.ScanOrderLoggerModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }