@pisell/pisellos 2.3.43 → 2.3.45

package/lib/modules/SalesSummary/index.js

@@ -53,6 +53,9 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
     this.surchargeListModuleName = ((_c = this.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
+    if (!this.appPlugin) {
+      throw new Error("SalesSummaryModule 需要 app 插件支持");
+    }
     if (!this.request) {
       throw new Error("SalesSummaryModule 需要 request 插件支持");
     }
@@ -106,14 +109,12 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
   }
   getAppData(key) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
+    var _a, _b, _c, _d, _e, _f;
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
     if (typeof getData === "function")
       return getData(key);
-    const app = (_d = (_c = this.appPlugin) == null ? void 0 : _c.getApp) == null ? void 0 : _d.call(_c);
-    if (!app)
-      return void 0;
-    const coreData = (_h = (_f = (_e = app == null ? void 0 : app.models) == null ? void 0 : _e.getStore) == null ? void 0 : (_g = _f.call(_e)).getDataByModel) == null ? void 0 : _h.call(_g, "core", "core");
+    const app = this.appPlugin.getApp();
+    const coreData = (_f = (_d = (_c = app == null ? void 0 : app.models) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core", "core");
     return coreData == null ? void 0 : coreData[key];
   }
   getTaxConfig() {

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

@@ -11,12 +11,10 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
-    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/lib/modules/ScanOrderLogger/index.js

@@ -60,7 +60,6 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
-    this.window = core.getPlugin("window") || void 0;
     const provider = ((_a = options.otherParams) == null ? void 0 : _a.provider) || "feishu";
     const providerConfig = ((_b = options.otherParams) == null ? void 0 : _b.providerConfig) || {};
     const context = ((_c = options.otherParams) == null ? void 0 : _c.context) || {};
@@ -102,25 +101,14 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
-  getCurrentHost() {
-    var _a, _b;
-    const host = (_b = (_a = this.window) == null ? void 0 : _a.location) == null ? void 0 : _b.host;
-    if (typeof host === "string" && host.length > 0)
-      return host;
-    return void 0;
-  }
   buildRecord(params) {
-    const host = this.getCurrentHost();
     return {
       level: params.level || "info",
       title: params.title,
       timestamp: params.timestamp || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
       payload: params.payload || {},
       extra: params.extra || {},
-      context: {
-        ...this.store.context || {},
-        ...host ? { host } : {}
-      }
+      context: this.store.context || {}
     };
   }
   async addLog(params) {

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

@@ -112,29 +112,20 @@ async function flushQueue() {
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     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 (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
     if (throttleMs <= 0) {
       try {
         await postToFeishu(webhook, buildFeishuBody([payload.record]));

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

@@ -2,7 +2,6 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
-    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

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

@@ -24,9 +24,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      *
      * @memberof ScheduleModule
      */
-    loadAllSchedule(options?: {
-        useCache?: boolean;
-    }): Promise<void>;
+    loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
     private syncScheduleMap;
     getScheduleList(): ScheduleItem[];

package/lib/modules/Schedule/index.js

@@ -95,12 +95,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
    *
    * @memberof ScheduleModule
    */
-  async loadAllSchedule(options = {}) {
+  async loadAllSchedule() {
     var _a;
     const scheduleList = await this.request.get(
       `/schedule`,
       { num: 999 },
-      { useCache: options.useCache ?? true }
+      { useCache: true }
     );
     this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
@@ -126,6 +126,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
+    var _a, _b, _c;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -143,20 +144,17 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         channel
       }
     );
-    const responseData = res.data || {};
-    const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
-    const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
-    this.setAvailabilityScheduleDateList(dateList);
-    this.setOtherProductsIds(otherProductIds);
-    if (!dateList.length && !otherProductIds.length || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    this.setAvailabilityScheduleDateList(res.data.date_list);
+    this.setOtherProductsIds(res.data.other_product_ids || []);
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    if (otherProductIds.length) {
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
       dates.forEach((n) => {
         n.status = "available";
       });
     } else {
-      dateList.forEach((n) => {
+      res.data.date_list.forEach((n) => {
         const index = dates.findIndex((m) => m.date === n.date);
         if (index !== -1) {
           dates[index].status = "available";

package/lib/modules/Summary/utils.js

@@ -437,31 +437,11 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
-var getDiscountAmount = (discounts) => {
-  return (discounts || []).reduce((total, discount) => {
-    return total.add(new import_decimal.default(discount.amount || 0));
-  }, new import_decimal.default(0)).toNumber();
-};
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b;
   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)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);

package/lib/modules/index.d.ts

@@ -18,5 +18,3 @@ export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
 export * from './BookingContext';
-export * from './Holder';
-export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -36,8 +36,6 @@ __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
 __reExport(modules_exports, require("./BookingContext"), module.exports);
-__reExport(modules_exports, require("./Holder"), module.exports);
-__reExport(modules_exports, require("./ResourcePlanner"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -59,7 +57,5 @@ __reExport(modules_exports, require("./ResourcePlanner"), module.exports);
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
   ...require("./OpenData"),
-  ...require("./BookingContext"),
-  ...require("./Holder"),
-  ...require("./ResourcePlanner")
+  ...require("./BookingContext")
 });

package/lib/plugins/window.d.ts

@@ -16,7 +16,6 @@ export interface WindowPlugin extends Plugin {
     history: History;
     interaction?: any;
     getWalletPassEvaluator?: () => WalletPassEvaluator;
-    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/server/index.d.ts

@@ -49,10 +49,6 @@ declare class Server {
     private productQuerySubscribers;
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     private productQueryScheduleTimers;
-    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
-    private menuScheduleRefreshInFlight;
-    private lastMenuScheduleRefreshAt;
-    private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -266,16 +262,6 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
-    /**
-     * ProductList callers such as standalone retail pages do not always have a selected schedule.
-     * In that case query against the current local time so menu availability can still be evaluated.
-     */
-    private resolveProductQueryScheduleContext;
-    /**
-     * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
-     * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
-     */
-    private refreshMenuScheduleCacheAfterEmptyResult;
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
      * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。

package/lib/server/index.js

@@ -82,10 +82,6 @@ var Server = class {
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
-    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
-    this.menuScheduleRefreshInFlight = null;
-    this.lastMenuScheduleRefreshAt = 0;
-    this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS = 30 * 1e3;
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -219,11 +215,7 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, customer_id, ids, extension_type, strategy_context } = data;
-      const { schedule_date, schedule_datetime } = this.resolveProductQueryScheduleContext({
-        schedule_date: data.schedule_date,
-        schedule_datetime: data.schedule_datetime
-      });
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, strategy_context } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -2285,43 +2277,6 @@ var Server = class {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }
   }
-  /**
-   * ProductList callers such as standalone retail pages do not always have a selected schedule.
-   * In that case query against the current local time so menu availability can still be evaluated.
-   */
-  resolveProductQueryScheduleContext(params) {
-    const now = (0, import_dayjs.default)();
-    const schedule_datetime = typeof params.schedule_datetime === "string" && params.schedule_datetime.trim() ? params.schedule_datetime : now.format("YYYY-MM-DD HH:mm:ss");
-    const schedule_date = typeof params.schedule_date === "string" && params.schedule_date.trim() ? params.schedule_date : (0, import_dayjs.default)(schedule_datetime).isValid() ? (0, import_dayjs.default)(schedule_datetime).format("YYYY-MM-DD") : now.format("YYYY-MM-DD");
-    return { schedule_date, schedule_datetime };
-  }
-  /**
-   * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
-   * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
-   */
-  async refreshMenuScheduleCacheAfterEmptyResult() {
-    if (!this.menu || !this.schedule)
-      return false;
-    const now = Date.now();
-    if (now - this.lastMenuScheduleRefreshAt < this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS) {
-      return false;
-    }
-    if (!this.menuScheduleRefreshInFlight) {
-      this.lastMenuScheduleRefreshAt = now;
-      this.menuScheduleRefreshInFlight = Promise.all([
-        this.menu.loadMenuList(),
-        this.schedule.loadAllSchedule()
-      ]).then(() => void 0).catch((error) => {
-        this.logWarning("刷新菜单/日程缓存失败，继续使用现有缓存", {
-          error: error instanceof Error ? error.message : String(error)
-        });
-      }).finally(() => {
-        this.menuScheduleRefreshInFlight = null;
-      });
-    }
-    await this.menuScheduleRefreshInFlight;
-    return true;
-  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -3824,22 +3779,10 @@ var Server = class {
           data: (normalized == null ? void 0 : normalized.data) ?? null
         };
       }
-      const response = this.withSyncedOrderIdInCheckoutResponse(
+      return this.withSyncedOrderIdInCheckoutResponse(
         syncResult.normalizedResponse,
         syncResult.syncedOrder
       );
-      const syncedOrder = syncResult.syncedOrder;
-      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData: syncResult.checkoutData,
-          order: syncedOrder,
-          response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
-          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-          isManualPrint: true
-        });
-      }
-      return response;
     } catch (error) {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError) {
@@ -5129,16 +5072,13 @@ var Server = class {
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
       const tMenu = performance.now();
-      const getActiveMenus = () => this.menu.getMenuByIds(menu_list_ids).filter((menu) => {
+      const menuList = this.menu.getMenuByIds(menu_list_ids);
+      activeMenuList = menuList.filter((menu) => {
         var _a;
         return ((_a = this.schedule) == null ? void 0 : _a.getDateIsInSchedule(schedule_datetime, menu.schedule)) || false;
       });
-      activeMenuList = getActiveMenus();
-      if (!activeMenuList.length && await this.refreshMenuScheduleCacheAfterEmptyResult()) {
-        activeMenuList = getActiveMenus();
-      }
       (0, import_product.perfMark)("computeQuery.filterActiveMenu", performance.now() - tMenu, {
-        totalMenu: menu_list_ids.length,
+        totalMenu: menuList.length,
         activeMenu: activeMenuList.length
       });
     }

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

@@ -280,13 +280,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
-    /**
-     * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
-     * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
-     */
-    protected shouldUseCheckoutSyncTask(): boolean;
-    /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
-    protected getDefaultCheckoutSmallTicketDataFlag(): number | undefined;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;

package/lib/solution/BaseSales/index.js

@@ -1008,7 +1008,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1019,9 +1019,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.request = core.getPlugin("request");
     this.appPlugin = core.getPlugin("app");
     if (!this.appPlugin) {
+      throw new Error("Checkout 解决方案需要 app 插件支持");
     }
-    const app = (_c = (_b = this.appPlugin) == null ? void 0 : _b.getApp) == null ? void 0 : _c.call(_b);
-    this.logger = app == null ? void 0 : app.logger;
+    const app = this.appPlugin.getApp();
+    this.logger = app.logger;
     const targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
@@ -1046,7 +1047,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
       await this.store.schedule.loadAllSchedule();
     }
-    if (this.store.order && typeof ((_d = this.otherParams) == null ? void 0 : _d.enableTempOrderPersist) === "boolean") {
+    if (this.store.order && typeof ((_b = this.otherParams) == null ? void 0 : _b.enableTempOrderPersist) === "boolean") {
       this.store.order.setEnableTempOrderPersist(
         this.otherParams.enableTempOrderPersist
       );
@@ -1719,6 +1720,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       return {
         isAvailable: raw.isAvailable,
+        ...raw.isAccepted !== void 0 ? { isAccepted: raw.isAccepted } : {},
         type: raw.type,
         unavailableReason: raw.unavailableReason,
         scannedDiscountList: raw.scannedDiscountList
@@ -1899,7 +1901,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params == null ? void 0 : params.paymentStatus);
-    const smallTicketDataFlag = (params == null ? void 0 : params.smallTicketDataFlag) ?? this.getDefaultCheckoutSmallTicketDataFlag();
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
@@ -1909,11 +1910,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       request_unique_idempotency_token: this.store.order.generateIdempotencyToken(),
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
-      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
       ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
-    return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
+    return this.store.order.submitTempOrder(submitParams);
   }
   async saveSalesOrderDraft(params) {
     var _a, _b, _c, _d;
@@ -1935,35 +1936,20 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params == null ? void 0 : params.paymentStatus);
-    const smallTicketDataFlag = (params == null ? void 0 : params.smallTicketDataFlag) ?? this.getDefaultCheckoutSmallTicketDataFlag();
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
       businessCode: ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: this.getSubmitOrderSalesChannel(),
       type: (_d = this.otherParams) == null ? void 0 : _d.type,
-      request_unique_idempotency_token: this.store.order.generateIdempotencyToken(),
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
-      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
       ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
   }
-  /**
-   * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
-   * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
-   */
-  shouldUseCheckoutSyncTask() {
-    var _a;
-    const configured = (_a = this.otherParams) == null ? void 0 : _a.checkoutSyncTaskEnabled;
-    return typeof configured === "boolean" ? configured : true;
-  }
-  /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
-  getDefaultCheckoutSmallTicketDataFlag() {
-    return void 0;
-  }
   async printLocalOrderReceipt(lookup) {
     var _a, _b, _c, _d, _e, _f, _g;
     if (!this.store.order) {
@@ -2023,7 +2009,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
     const syncParams = {
       ...params,
-      checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask(),
       ...businessCode !== void 0 ? { businessCode } : {},
       ...channel !== void 0 ? { channel } : {}
     };

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

@@ -439,8 +439,10 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
+    isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
     scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -132,14 +132,15 @@ function transformBaseProductToOrderProduct(params) {
     ...callbackOrigin || {}
   };
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
+  const catalogSourcePrice = (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price);
   const sourceProductPrice = toPriceString(
-    payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
+    hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice,
     "0.00"
   );
   const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
       ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item

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

@@ -10,7 +10,6 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
-import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -127,20 +126,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
-    /**
-     * 获取 holder 表单 map
-     */
-    getHolderFormMap(): import("../../modules").HolderFormMap;
-    /**
-     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
-     */
-    refreshAllHolderFormRecords(params?: {
-        customer_id?: number;
-    }): Promise<import("../../modules").HolderFormMap>;
-    /**
-     * 添加表单记录
-     */
-    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
@@ -317,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
+    getTimeSlotByAllResources(resources_code: string): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;