@pisell/pisellos 2.2.277 → 2.2.279

package/lib/solution/BaseSales/index.js

@@ -73,8 +73,11 @@ function isRejectedSalesSubmitResult(result) {
   return candidates.some((candidate) => {
     if (!candidate || typeof candidate !== "object")
       return false;
-    const responseCode = Number(candidate.code ?? candidate.statusCode);
-    if (Number.isFinite(responseCode) && responseCode >= 400)
+    if (candidate.code !== void 0 && candidate.code !== 200 && candidate.code !== "200") {
+      return true;
+    }
+    const statusCode = Number(candidate.statusCode);
+    if (Number.isFinite(statusCode) && statusCode >= 400)
       return true;
     if (candidate.status === false || candidate.success === false || candidate.result === false) {
       return true;
@@ -84,9 +87,9 @@ function isRejectedSalesSubmitResult(result) {
     );
   });
 }
-function getSalesSubmitErrorMessage(result) {
+function getSalesSubmitErrorMessage(result, fallbackMessage) {
   var _a, _b;
-  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || "Wallet 支付确认失败";
+  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || fallbackMessage;
 }
 function toWalletFundValue(value) {
   try {
@@ -588,7 +591,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
+  async hydrateLatestLoadedSalesDetail(record, loadSequence, hydrateSource) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
     const hydrateTask = async () => {
@@ -598,9 +601,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
+      const sales = await this.store.order.hydrateTempOrderFromRecord(
+        record,
+        hydrateSource === "sessionStorage" ? { recalcOnHydrate: true, source: "sessionStorage" } : { recalcOnHydrate: false }
+      );
       hydratedSales = sales;
       if (loadSequence !== this.salesDetailLoadSequence)
         return;
@@ -924,12 +928,18 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * const params = this.buildSubModuleOtherParams();
    * this.core.registerModule(orderModule, { otherParams: params });
    */
-  buildSubModuleOtherParams() {
+  isSessionStoragePersistEnabled() {
+    return Boolean(this.cacheId);
+  }
+  shouldUseSessionStorageForSubModule(_moduleName) {
+    return this.isSessionStoragePersistEnabled();
+  }
+  buildSubModuleOtherParams(moduleName) {
     return {
       ...this.otherParams,
       salesSummaryModuleName: `${this.name}_salesSummary`,
       fatherModule: this.name,
-      openCache: this.cacheId ? true : false,
+      openCache: this.shouldUseSessionStorageForSubModule(moduleName),
       cacheId: this.cacheId
     };
   }
@@ -940,7 +950,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * await this.syncOtherParamsToSubModules({ channel: 'pos' });
    */
   async syncOtherParamsToSubModules(changedParams, { cover = false } = {}) {
-    const nextSubModuleOtherParams = this.buildSubModuleOtherParams();
     await Promise.all(
       Object.entries(this.store).map(async ([moduleName, subModule]) => {
         if (this.reusedSharedSubModuleNames.has(moduleName)) {
@@ -950,6 +959,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         if (!targetModule || typeof targetModule.updateOtherParams !== "function") {
           return;
         }
+        const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
         await targetModule.updateOtherParams(nextSubModuleOtherParams, {
           changedParams,
           cover
@@ -962,14 +972,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * sessionStorage 损坏时静默忽略，按空状态注册。
    */
   readSessionCacheData() {
-    if (!this.cacheId || !this.window)
+    const cacheId = this.cacheId;
+    if (!cacheId || !this.isSessionStoragePersistEnabled() || !this.window) {
       return {};
+    }
     try {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (!sessionData)
         return {};
       const data = JSON.parse(sessionData);
-      return data && data[this.cacheId] || {};
+      return data && data[cacheId] || {};
     } catch {
       return {};
     }
@@ -1041,7 +1053,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1052,10 +1064,9 @@ 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 = this.appPlugin.getApp();
-    this.logger = app.logger;
+    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 targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
@@ -1072,15 +1083,15 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const hooks = this.getSubModuleHooks(step);
       this.store[step] = targetModule;
       this.core.registerModule(targetModule, {
-        initialState: (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {},
+        initialState: this.shouldUseSessionStorageForSubModule(step) ? (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {} : {},
         ...hooks ? { hooks } : {},
-        otherParams: this.buildSubModuleOtherParams()
+        otherParams: this.buildSubModuleOtherParams(step)
       });
     });
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
       await this.store.schedule.loadAllSchedule();
     }
-    if (this.store.order && typeof ((_b = this.otherParams) == null ? void 0 : _b.enableTempOrderPersist) === "boolean") {
+    if (this.store.order && typeof ((_d = this.otherParams) == null ? void 0 : _d.enableTempOrderPersist) === "boolean") {
       this.store.order.setEnableTempOrderPersist(
         this.otherParams.enableTempOrderPersist
       );
@@ -1141,17 +1152,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
-        preloadedSalesDetail ?? loadedRecord.data
-      );
+      const loadedSalesDetail = preloadedSalesDetail ?? loadedRecord.data;
+      const shouldFilterPendingPayments = params.hydrateSource !== "sessionStorage";
+      const remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
       const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
-      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+      const record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
+      return await this.hydrateLatestLoadedSalesDetail(
+        record,
+        loadSequence,
+        params.hydrateSource
+      );
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
         0,
@@ -1934,6 +1949,7 @@ 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,
@@ -1943,11 +1959,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 } : {},
-      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...smallTicketDataFlag !== void 0 ? { 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.submitTempOrder(submitParams);
+    return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
   }
   async saveSalesOrderDraft(params) {
     var _a, _b, _c, _d;
@@ -1969,20 +1985,35 @@ 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 } : {},
-      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...smallTicketDataFlag !== void 0 ? { 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) {
@@ -2042,6 +2073,7 @@ 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 } : {}
     };
@@ -2786,7 +2818,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         confirmPendingVoucherPayments: true
       });
       if (isRejectedSalesSubmitResult(submitResult)) {
-        throw new Error(getSalesSubmitErrorMessage(submitResult));
+        throw new Error(
+          getSalesSubmitErrorMessage(submitResult, "Wallet 支付确认失败")
+        );
       }
     } catch (error) {
       this.store.order.setOrderPayments(beforePayments);
@@ -2889,6 +2923,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(
@@ -2999,6 +3038,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(

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

@@ -366,11 +366,29 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function hasGoodPassDiscount(product) {
+  var _a, _b;
+  const productBundle = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
+  const extendedBundle = Array.isArray((_b = (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) ? product._extend.other.bundle : [];
+  const discountLists = [
+    product == null ? void 0 : product.discount_list,
+    ...productBundle.map((item) => item == null ? void 0 : item.discount_list),
+    ...extendedBundle.map((item) => item == null ? void 0 : item.discount_list)
+  ];
+  return discountLists.some(
+    (discountList) => Array.isArray(discountList) && discountList.some(
+      (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
+    )
+  );
+}
 function getPromotionLineMergeBoundary(product) {
   var _a, _b;
   if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
+  if (hasGoodPassDiscount(product)) {
+    return `good-pass:${getOrderProductUid(product)}`;
+  }
   if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;
   }

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

@@ -230,6 +230,7 @@ function transformBaseProductToOrderProduct(params) {
     },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {},
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
     original_price: lineOriginalPrice,

package/lib/solution/BaseSales/utils.js

@@ -60,33 +60,44 @@ function createEmptySummary() {
   };
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
-    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
+      option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+      num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
   const normalizedBundles = bundleArr.map((item) => ({
     bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
     product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).sort((p, q) => {
     if (p.bundle_id !== q.bundle_id)
       return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id)
       return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -10,6 +10,7 @@ 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;
@@ -126,6 +127,20 @@ 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[]>;
@@ -302,7 +317,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

@@ -89,6 +89,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const moduleArr = [
       "accountList",
+      "holder",
       "cart",
       "schedule",
       "summary",
@@ -379,6 +380,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return this.store.accountList.fetchHolderAccounts(params);
   }
+  /**
+   * 获取 holder 表单 map
+   */
+  getHolderFormMap() {
+    return this.store.holder.getHolderFormMap();
+  }
+  /**
+   * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
+   */
+  async refreshAllHolderFormRecords(params) {
+    return this.store.holder.refreshAllFormRecords({
+      customer_id: params == null ? void 0 : params.customer_id,
+      useCache: false
+    });
+  }
+  /**
+   * 添加表单记录
+   */
+  appendFormRecord(params) {
+    return this.store.holder.appendFormRecord(params);
+  }
   // 设置日期范围,注入到日期模块中
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
@@ -486,6 +508,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
         this.updateQuotationPriceAndCart(date);
+        try {
+          const customerId = Number(accountInfo.id);
+          await this.refreshAllHolderFormRecords({
+            customer_id: customerId
+          });
+        } catch (error) {
+          console.error("[BookingByStep] 登录后刷新 holder 表单失败", error);
+        }
       }
     } else {
       throw new Error(`没有找到${accountId}账户`);
@@ -512,10 +542,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交订单
   async submitOrder(extraData) {
+    var _a;
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a;
+      var _a2;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -525,7 +556,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return { ...newResourcesItem };
         });
         const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
+        if (!((_a2 = item._origin) == null ? void 0 : _a2.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -543,6 +574,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         cartItems: newCartItems,
         type,
         platform: this.platform,
+        business_code: (_a = this.otherParams) == null ? void 0 : _a.business_code,
         extraData
       }
     });
@@ -628,6 +660,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         account = activeAccount;
       }
     }
+    try {
+      this.store.holder.ensureFormByProduct({
+        product: productData,
+        shop_id: (productData == null ? void 0 : productData.shop_id) || "",
+        useCache: true
+      });
+    } catch (error) {
+      console.error("[BookingByStep] 加载 holder 表单失败", error);
+    }
     const flag = this.store.cart.mergeCartItemByRowKey({
       rowKey,
       quantity,
@@ -1150,7 +1191,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
         const totalCapacity = (countMap[n.id] || []).reduce(
           (sum, item) => {
-            const hasOverlap = !(0, import_dayjs.default)(item.time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
+            const hasOverlap = (0, import_dayjs.default)(item.time.start_at).isBefore((0, import_dayjs.default)(timeSlots.end_at)) && (0, import_dayjs.default)(item.time.end_at).isAfter((0, import_dayjs.default)(timeSlots.start_at));
             return hasOverlap ? sum + item.pax : sum;
           },
           0
@@ -1232,9 +1273,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (item._origin.start_time && !(timeSlots == null ? void 0 : timeSlots.start_time)) {
+        const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
+        if (hasOriginTimeSlot) {
           recordTimeSlots = {
             start_time: item._origin.start_time,
             end_time: item._origin.end_time,
@@ -1246,13 +1288,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const currentResourceConfig = (_c = (_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.find(
             (n) => n.code === resources_code
           );
-          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_d = item._productOrigin) == null ? void 0 : _d.duration) && !hasFlexibleProduct) {
-            let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10,
-              "minutes"
-            );
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_d = item._productOrigin) == null ? void 0 : _d.duration) && !hasFlexibleProduct && !hasOriginTimeSlot) {
+            const recordEndAt = recordTimeSlots.end_at ? (0, import_dayjs.default)(recordTimeSlots.end_at) : (0, import_dayjs.default)(`${item.start_date} ${recordTimeSlots.end_time}`);
+            let start_at = recordEndAt;
             let end_at = start_at.add(
-              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.value) || 10,
+              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10,
               "minutes"
             );
             recordTimeSlots = {
@@ -1306,7 +1346,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_j = (_i = item._productOrigin) == null ? void 0 : _i.product_resource) == null ? void 0 : _j.resources) || []
+            ((_h = (_g = item._productOrigin) == null ? void 0 : _g.product_resource) == null ? void 0 : _h.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1354,11 +1394,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_k = productResources.find(
+          const targetRenderList = (_i = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _k.renderList;
+          )) == null ? void 0 : _i.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_l = item._origin.resources) == null ? void 0 : _l.some(
+            if ((_j = item._origin.resources) == null ? void 0 : _j.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1366,7 +1406,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;
@@ -1403,7 +1445,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 = [];
@@ -1561,7 +1603,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, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 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

@@ -81,6 +81,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "holder":
+      return new import_modules.HolderModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

package/lib/solution/BookingByStep/utils/capacity.js

@@ -49,8 +49,27 @@ var formatDefaultCapacitys = ({
       const id = d.bundle_product_id;
       const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id || item2.product_id === variantId
+        (item2) => item2.product_id == id || item2.product_id == variantId
       );
+      if (!item && (window == null ? void 0 : window.sendWarningLog)) {
+        window.sendWarningLog({
+          title: "未找到套餐 capacity 配置",
+          content: [
+            {
+              key: "product_id",
+              value: id
+            },
+            {
+              key: "variant_id",
+              value: variantId
+            },
+            {
+              key: "package",
+              value: JSON.stringify((capacity == null ? void 0 : capacity.package) || [])
+            }
+          ]
+        });
+      }
       return {
         id,
         value: item ? d.num || 0 : 0,