@pisell/pisellos 0.0.479 → 0.0.481

package/lib/solution/Sales/index.js

@@ -0,0 +1,416 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+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/solution/Sales/index.ts
+var Sales_exports = {};
+__export(Sales_exports, {
+  Sales: () => SalesImpl,
+  SalesImpl: () => SalesImpl,
+  default: () => Sales_default
+});
+module.exports = __toCommonJS(Sales_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_BaseModule = require("../../modules/BaseModule");
+var import_types = require("./types");
+__reExport(Sales_exports, require("./types"), module.exports);
+var SalesImpl = class extends import_BaseModule.BaseModule {
+  constructor(name, version) {
+    super(name, version);
+    this.defaultName = "sales";
+    this.defaultVersion = "1.0.0";
+    this.defaultTimelineBucketMinutes = 15;
+    this.isSolution = true;
+    this.options = {};
+    this.otherParams = {};
+  }
+  async initialize(core, options = {}) {
+    this.core = core;
+    this.options = options;
+    this.otherParams = options.otherParams || {};
+    const appPlugin = this.core.getPlugin("app");
+    this.request = appPlugin == null ? void 0 : appPlugin.getApp().request;
+    if (!this.request) {
+      throw new Error("Sales 解决方案需要 request 插件支持");
+    }
+    this.store = {
+      currentDay: (0, import_dayjs.default)().startOf("day"),
+      reservationList: []
+    };
+    await this.core.effects.emit(`${this.name}:onInited`, {});
+  }
+  // -------------------------------------------------------------------------
+  // SalesModuleAPI 实现
+  // -------------------------------------------------------------------------
+  /** 获取当前 store 快照 */
+  getState() {
+    return { ...this.store };
+  }
+  /** 获取当前选择日期 */
+  getCurrentDay() {
+    return this.store.currentDay;
+  }
+  /** 设置当前选择日期，会自动归一到当天 00:00:00 */
+  setCurrentDay(currentDay) {
+    const normalized = (0, import_dayjs.default)(currentDay).startOf("day");
+    this.store.currentDay = normalized;
+    this.core.effects.emit(import_types.SalesHooks.onCurrentDayChanged, { currentDay: normalized });
+    return normalized;
+  }
+  /** 获取当前预约列表 */
+  getReservationList() {
+    return [...this.store.reservationList];
+  }
+  /** 覆盖设置当前预约列表 */
+  setReservationList(reservationList) {
+    this.store.reservationList = reservationList;
+    this.core.effects.emit(import_types.SalesHooks.onReservationListChanged, { reservationList });
+    return reservationList;
+  }
+  /** 重置预约列表为空 */
+  resetReservationList() {
+    this.store.reservationList = [];
+    this.core.effects.emit(import_types.SalesHooks.onReservationListChanged, { reservationList: [] });
+    return [];
+  }
+  // -------------------------------------------------------------------------
+  // 生命周期
+  // -------------------------------------------------------------------------
+  async destroy() {
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    super.destroy();
+  }
+  /**
+   * 时间轴粒度（分钟）
+   * - 默认 15 分钟
+   * - 可通过 registerModule 时的 options.otherParams.timelineBucketMinutes 覆盖
+   */
+  getTimelineBucketMinutes() {
+    var _a;
+    const dynamicBucket = Number((_a = this.otherParams) == null ? void 0 : _a.timelineBucketMinutes);
+    if (!Number.isFinite(dynamicBucket) || dynamicBucket <= 0)
+      return this.defaultTimelineBucketMinutes;
+    return Math.floor(dynamicBucket);
+  }
+  /**
+   * 解析营业日统计窗口：
+   * - 当 operating_day_boundary.type === 'start_time'
+   *   使用「今天 + boundary.time」到「明天 + boundary.time」
+   * - 否则回退自然日（00:00 到次日 00:00）
+   */
+  getTimelineRangeByOperatingBoundary() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const today = (0, import_dayjs.default)();
+    const defaultStart = today.startOf("day");
+    const defaultEndExclusive = defaultStart.add(1, "day");
+    const appPlugin = this.core.getPlugin("app");
+    const coreData = (_f = (_d = (_c = (_b = (_a = appPlugin == null ? void 0 : appPlugin.getApp()) == null ? void 0 : _a.data) == null ? void 0 : _b.store) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core");
+    const operatingDayBoundary = (_g = coreData == null ? void 0 : coreData.core) == null ? void 0 : _g.operating_day_boundary;
+    if ((operatingDayBoundary == null ? void 0 : operatingDayBoundary.type) !== "start_time") {
+      return { startAt: defaultStart, endExclusiveAt: defaultEndExclusive };
+    }
+    const boundaryTime = String(operatingDayBoundary.time || "").trim();
+    const startAt = (0, import_dayjs.default)(`${today.format("YYYY-MM-DD")} ${boundaryTime}`);
+    if (!startAt.isValid()) {
+      return { startAt: defaultStart, endExclusiveAt: defaultEndExclusive };
+    }
+    return { startAt, endExclusiveAt: startAt.add(1, "day") };
+  }
+  /**
+   * 统计时间轴每个时间片的预约数量。
+   * 算法使用差分数组，复杂度 O(n + s):
+   * - n = booking 数量
+   * - s = 时间片数量
+   */
+  getTimelineHighlights(bookingList = [], startDateTime, endDateTime) {
+    const bucketMinutes = this.getTimelineBucketMinutes();
+    const bucketMs = bucketMinutes * 60 * 1e3;
+    const customStartAt = startDateTime ? (0, import_dayjs.default)(startDateTime) : (0, import_dayjs.default)("");
+    const customEndExclusiveAt = endDateTime ? (0, import_dayjs.default)(endDateTime) : (0, import_dayjs.default)("");
+    const hasValidCustomRange = customStartAt.isValid() && customEndExclusiveAt.isValid();
+    const { startAt, endExclusiveAt } = hasValidCustomRange ? { startAt: customStartAt, endExclusiveAt: customEndExclusiveAt } : this.getTimelineRangeByOperatingBoundary();
+    const startAtMs = startAt.valueOf();
+    const endExclusiveAtMs = endExclusiveAt.valueOf();
+    if (!startAt.isValid() || !endExclusiveAt.isValid() || endExclusiveAtMs <= startAtMs)
+      return [];
+    const slotCount = Math.ceil((endExclusiveAtMs - startAtMs) / bucketMs);
+    if (slotCount <= 0)
+      return [];
+    const diff = new Int32Array(slotCount + 1);
+    for (let i = 0; i < bookingList.length; i++) {
+      const booking = bookingList[i];
+      const bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+      const bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+      if (!bookingStartAt.isValid() || !bookingEndAt.isValid())
+        continue;
+      const overlapStartMs = Math.max(bookingStartAt.valueOf(), startAtMs);
+      const overlapEndExclusiveMs = Math.min(bookingEndAt.valueOf() + 1, endExclusiveAtMs);
+      if (overlapStartMs >= overlapEndExclusiveMs)
+        continue;
+      const startIdx = Math.max(0, Math.ceil((overlapStartMs - startAtMs) / bucketMs));
+      const endIdx = Math.min(
+        slotCount - 1,
+        Math.floor((overlapEndExclusiveMs - 1 - startAtMs) / bucketMs)
+      );
+      if (startIdx > endIdx)
+        continue;
+      diff[startIdx] += 1;
+      diff[endIdx + 1] -= 1;
+    }
+    const timeline = [];
+    let runningCount = 0;
+    for (let i = 0; i < slotCount; i++) {
+      runningCount += diff[i];
+      timeline.push(runningCount);
+    }
+    return timeline;
+  }
+  /** dayjs 未启用插件时，手动封装 >= 判断 */
+  isSameOrAfter(left, right) {
+    return left.isAfter(right) || left.isSame(right);
+  }
+  /** dayjs 未启用插件时，手动封装 <= 判断 */
+  isSameOrBefore(left, right) {
+    return left.isBefore(right) || left.isSame(right);
+  }
+  /**
+   * 将 booking 的日期/时间字段统一组装为 dayjs
+   * - date + time 都有：按完整时间解析
+   * - 只有一个字段：按单字段解析（兼容历史数据）
+   * - 都没有：返回 invalid
+   */
+  toBookingDateTime(date, time) {
+    if (!date && !time)
+      return (0, import_dayjs.default)("");
+    if (date && time)
+      return (0, import_dayjs.default)(`${date} ${time}`);
+    return (0, import_dayjs.default)(date || time);
+  }
+  /**
+   * 预约状态映射（面向 UI 的统一状态）
+   * 说明：locked 逻辑后续会补业务规则，这里先保留分支占位。
+   */
+  getBookingStatus(appointmentStatus) {
+    if (appointmentStatus === "started")
+      return "occupied";
+    if (appointmentStatus === "new" || appointmentStatus === "confirmed" || appointmentStatus === "arrived") {
+      return "reserved";
+    }
+    if (appointmentStatus === "locked")
+      return "locked";
+    return void 0;
+  }
+  getResourceId(resource) {
+    return resource.id ?? resource.form_record_id ?? "";
+  }
+  /**
+   * 资源下 bookings 的返回裁剪策略：
+   * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
+   * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
+   * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
+   * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+   */
+  pickBookingsForCurrentPoint(current, bookings) {
+    if (bookings.length === 0)
+      return [];
+    const currentDayStart = current.startOf("day");
+    const currentDayEnd = current.endOf("day");
+    const dayScopedBookings = bookings.filter((booking) => {
+      const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+      const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+      if (!startAt.isValid() || !endAt.isValid())
+        return false;
+      return this.isSameOrBefore(startAt, currentDayEnd) && this.isSameOrAfter(endAt, currentDayStart);
+    });
+    if (dayScopedBookings.length === 0)
+      return [];
+    const appendNextStartGroupIfNeeded = (selectedBookings) => {
+      if (selectedBookings.length === 0)
+        return selectedBookings;
+      const shouldAppendNextGroup = selectedBookings.some(
+        (booking) => booking.status === "reserved" || booking.status === "occupied"
+      );
+      if (!shouldAppendNextGroup)
+        return selectedBookings;
+      const selectedStartValues = new Set(
+        selectedBookings.map((booking) => this.toBookingDateTime(booking.start_date, booking.start_time)).filter((startAt) => startAt.isValid()).map((startAt) => startAt.valueOf())
+      );
+      const futureCandidates = dayScopedBookings.filter((booking) => {
+        const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+        if (!startAt.isValid())
+          return false;
+        return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
+      });
+      if (futureCandidates.length === 0)
+        return selectedBookings;
+      const nextStartAt = this.toBookingDateTime(
+        futureCandidates[0].start_date,
+        futureCandidates[0].start_time
+      ).valueOf();
+      const nextStartGroup = futureCandidates.filter((booking) => {
+        const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+        return startAt.isValid() && startAt.valueOf() === nextStartAt;
+      });
+      if (nextStartGroup.length === 0)
+        return selectedBookings;
+      return [...selectedBookings, ...nextStartGroup];
+    };
+    const activeBookings = dayScopedBookings.filter((booking) => {
+      const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+      const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+      if (!startAt.isValid() || !endAt.isValid())
+        return false;
+      return this.isSameOrAfter(current, startAt) && this.isSameOrBefore(current, endAt);
+    });
+    if (activeBookings.length > 0)
+      return appendNextStartGroupIfNeeded(activeBookings);
+    const timeoutOccupied = dayScopedBookings.filter(
+      (booking) => booking.status === "occupied" && booking.isTimeout
+    );
+    if (timeoutOccupied.length > 0)
+      return appendNextStartGroupIfNeeded(timeoutOccupied);
+    const upcoming = dayScopedBookings.filter((booking) => {
+      const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+      return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, "day");
+    });
+    if (upcoming.length > 0) {
+      const firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
+      const upcomingStartGroup = upcoming.filter((booking) => {
+        const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+        return startAt.valueOf() === firstStartAt;
+      });
+      return appendNextStartGroupIfNeeded(upcomingStartGroup);
+    }
+    const fallback = dayScopedBookings[dayScopedBookings.length - 1];
+    return fallback ? [fallback] : [];
+  }
+  /**
+   * 标准化单条 booking：
+   * - 过滤终态（rejected/cancelled/completed）
+   * - 注入 status / isTimeout / reserved_status
+   */
+  normalizeMatchedBooking(current, booking) {
+    const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
+    if (appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
+      return null;
+    }
+    const bookingStatus = this.getBookingStatus(appointmentStatus);
+    const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+    const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+    const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
+    const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
+    const progressPercent = (() => {
+      if (bookingStatus !== "occupied")
+        return 0;
+      if (!startAt.isValid() || !endAt.isValid())
+        return 0;
+      const totalMinutes = endAt.diff(startAt, "minute");
+      if (totalMinutes <= 0)
+        return 0;
+      const elapsedMinutes = current.diff(startAt, "minute");
+      if (elapsedMinutes <= 0)
+        return 0;
+      if (elapsedMinutes >= totalMinutes)
+        return 100;
+      return Math.floor(elapsedMinutes / totalMinutes * 100);
+    })();
+    let reservedStatus;
+    let lateTime;
+    let remainingReserveTime;
+    if (bookingStatus === "reserved" && startAt.isValid()) {
+      if (current.isBefore(startAt)) {
+        reservedStatus = "not_arrived";
+        remainingReserveTime = startAt.diff(current, "minute");
+      } else {
+        reservedStatus = "late";
+        lateTime = Math.max(current.diff(startAt, "minute"), 0);
+      }
+    }
+    return {
+      ...booking,
+      status: bookingStatus,
+      isTimeout,
+      timeoutTime,
+      progressPercent,
+      lateTime,
+      reserved_status: reservedStatus,
+      remainingReserveTime
+    };
+  }
+  async getResourceBookingList(currentTime, bookingList = []) {
+    var _a;
+    const current = (0, import_dayjs.default)(currentTime);
+    if (!current.isValid())
+      return [];
+    const resourceResponse = await this.request.get(
+      "/shop/form/resource/page",
+      { skip: 1, num: 999 },
+      // @ts-ignore
+      { osServer: true, isShopApi: true }
+    );
+    const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
+    if (!Array.isArray(resourceList) || resourceList.length === 0)
+      return [];
+    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
+      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
+      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
+      return leftStartAt - rightStartAt;
+    });
+    const bookingMap = /* @__PURE__ */ new Map();
+    normalizedBookings.forEach((booking) => {
+      if (!Array.isArray(booking.resources))
+        return;
+      booking.resources.forEach((resource) => {
+        const relationId = resource == null ? void 0 : resource.relation_id;
+        if (relationId === void 0 || relationId === null)
+          return;
+        const key = String(relationId);
+        const list = bookingMap.get(key) || [];
+        list.push(booking);
+        bookingMap.set(key, list);
+      });
+    });
+    return resourceList.map((resource) => {
+      const resourceId = this.getResourceId(resource);
+      const matchedBookings = bookingMap.get(String(resourceId)) || [];
+      const bookings = this.pickBookingsForCurrentPoint(current, matchedBookings);
+      return {
+        ...resource,
+        resource_id: resourceId,
+        bookings
+      };
+    });
+  }
+};
+var Sales_default = SalesImpl;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Sales,
+  SalesImpl,
+  ...require("./types")
+});

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

@@ -0,0 +1,67 @@
+import dayjs from 'dayjs';
+import type { OrderData } from '../../server/modules/order/types';
+import type { BookingData } from '../../server/modules/order/types';
+import type { ResourceData, ResourceId } from '../../server/modules/resource/types';
+export declare enum SalesHooks {
+    onInited = "sales:onInited",
+    onDestroy = "sales:onDestroy",
+    onCurrentDayChanged = "sales:onCurrentDayChanged",
+    onReservationListChanged = "sales:onReservationListChanged"
+}
+/**
+ * 预订记录类型（暂用 OrderData 占位）
+ *
+ * TODO(Rolo): 等领导提供 reservationList 的目标结构后，
+ * 将 Server/Order 原始数据转换为真正的 Reservation DTO，
+ * 当前不要直接把 OrderData 当作最终 UI 数据结构。
+ */
+export type Reservation = OrderData;
+export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
+export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
+export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
+    status: SalesBookingStatus;
+    isTimeout: boolean;
+    timeoutTime?: number;
+    progressPercent?: number;
+    lateTime?: number;
+    remainingReserveTime?: number;
+    reserved_status: SalesReservedStatus;
+}
+export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
+    resource_id: ResourceId;
+    bookings: SalesResourceMatchedBooking[];
+}
+export type SalesTimelineHighlights = number[];
+/**
+ * Sales 解决方案状态
+ *
+ * - currentDay: 当前选择的日期，默认当天 00:00:00
+ * - reservationList: currentDay 对应的预约列表（数据来源于 Server/Order，转换逻辑待补）
+ */
+export interface SalesState {
+    /** 当前选择的日期，默认当天 00:00:00 */
+    currentDay: dayjs.Dayjs;
+    /** 当前日期对应的预约列表 */
+    reservationList: Reservation[];
+}
+/**
+ * Sales 解决方案最小 API 面
+ */
+export interface SalesModuleAPI {
+    /** 获取当前 store 快照 */
+    getState: () => SalesState;
+    /** 获取当前选择日期 */
+    getCurrentDay: () => dayjs.Dayjs;
+    /** 设置当前选择日期，会自动归一到当天 00:00:00 */
+    setCurrentDay: (currentDay: dayjs.ConfigType) => dayjs.Dayjs;
+    /** 获取当前预约列表 */
+    getReservationList: () => Reservation[];
+    /** 覆盖设置当前预约列表 */
+    setReservationList: (reservationList: Reservation[]) => Reservation[];
+    /** 重置预约列表为空 */
+    resetReservationList: () => Reservation[];
+    /** 获取资源维度的预约占用列表 */
+    getResourceBookingList: (currentTime: string, bookingList: BookingData[]) => Promise<SalesResourceBookingItem[]>;
+    /** 获取时间轴每个时间片的预约数量 */
+    getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
+}

package/lib/solution/Sales/types.js

@@ -0,0 +1,35 @@
+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/solution/Sales/types.ts
+var types_exports = {};
+__export(types_exports, {
+  SalesHooks: () => SalesHooks
+});
+module.exports = __toCommonJS(types_exports);
+var SalesHooks = /* @__PURE__ */ ((SalesHooks2) => {
+  SalesHooks2["onInited"] = "sales:onInited";
+  SalesHooks2["onDestroy"] = "sales:onDestroy";
+  SalesHooks2["onCurrentDayChanged"] = "sales:onCurrentDayChanged";
+  SalesHooks2["onReservationListChanged"] = "sales:onReservationListChanged";
+  return SalesHooks2;
+})(SalesHooks || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SalesHooks
+});

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

@@ -30,6 +30,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
+    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       filteredDiscountList: [],
       orderTotalAmount: 0,
       holders: [],
-      bookingSubject: void 0
+      bookingSubject: void 0,
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -205,6 +206,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     var _a;
@@ -247,6 +251,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       selectionMap.set(operation.discountId, operation.isSelected);
     });
     const newDiscountList = discountList.map((discount) => {
+      if (discount.isEditMode)
+        return discount;
       if (selectionMap.has(discount.id)) {
         const targetIsSelected = selectionMap.get(discount.id);
         return {
@@ -282,7 +288,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async scanCode(code, customerId) {
     var _a, _b, _c;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId, orderId: this.store.orderId })) || [];
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
@@ -325,9 +331,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
-        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
-        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
+        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form",
+        orderTotalAmount: this.store.orderTotalAmount || 0
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -517,14 +523,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
-        action: "create",
+        action: orderId ? "update" : "create",
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

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

@@ -36,6 +36,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;
@@ -44,4 +45,9 @@ export interface SetDiscountSelectedParams {
         discountId: number;
         isSelected: boolean;
     }[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
+    orderId?: number;
 }

package/lib/solution/ShopDiscount/utils.d.ts

@@ -2,6 +2,15 @@ import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格

package/lib/solution/ShopDiscount/utils.js

@@ -56,18 +56,14 @@ var isAllNormalProduct = (items) => {
 };
 var getDiscountAmount = (discount, total, price) => {
   var _a;
-  let discountedPrice = 0;
   if (discount.tag === "good_pass") {
-    discountedPrice = new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
-  } else {
-    const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
-    if (isFixedAmount) {
-      discountedPrice = Math.max(new import_decimal.default(price).minus(new import_decimal.default((discount.amount ?? discount.par_value) || 0)).toNumber(), 0);
-    } else {
-      discountedPrice = new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
-    }
+    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
+  }
+  const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
+  if (isFixedAmount) {
+    return Math.max(new import_decimal.default(price).minus(new import_decimal.default((discount.amount ?? discount.par_value) || 0)).toNumber(), 0);
   }
-  return discountedPrice;
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
 };
 var getDiscountListAmountTotal = (discount) => {
   return discount.reduce((acc, cur) => {

package/lib/solution/index.d.ts

@@ -2,5 +2,6 @@ export * from './BuyTickets';
 export * from './BookingByStep';
 export * from './BookingTicket';
 export * from './ShopDiscount';
-export * from './Checkout';
 export * from './RegisterAndLogin';
+export * from './Checkout';
+export * from './Sales';