@pisell/pisellos 2.3.18 → 2.3.19

package/dist/solution/BookingTicket/index.d.ts

@@ -441,7 +441,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

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

@@ -84,7 +84,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         unavailableReasonKey?: string | null;
         scannedDiscountList?: Discount[];
     }>;
-    applyDiscount(): void;
+    applyDiscount(options?: {
+        reapplyBookingDiscountProductUids?: string[];
+    }): void;
     /**
      * 注入促销评估器。
      *

package/lib/modules/Order/index.js

@@ -107,7 +107,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const discountMap = /* @__PURE__ */ new Map();
     for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -137,6 +137,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
           existed.balance = String(Number(existed.balance || 0) + amount);
+          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
+            existed.limited_relation_product_data = {
+              ...existed.limited_relation_product_data || {},
+              product_ids: [...productIds, product.product_id]
+            };
+          }
           existed.applicableProductDetails = [
             ...existed.applicableProductDetails || [],
             detail
@@ -153,9 +160,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -185,8 +192,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -539,7 +546,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
-  applyDiscount() {
+  applyDiscount(options) {
     var _a, _b, _c, _d;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
@@ -560,6 +567,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       holders,
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
       orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0)
+    }, {
+      reapplyBookingDiscountProductUids: options == null ? void 0 : options.reapplyBookingDiscountProductUids
     });
     if (result == null ? void 0 : result.productList) {
       const previousProductsByUid = (0, import_utils.indexOrderProductsByUid)(tempOrder.products);
@@ -2974,7 +2983,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   applyOrderProductUpdateToTempOrder(tempOrder, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const {
       product_id,
       product_variant_id,
@@ -3128,12 +3137,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.products[productIndex],
       (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
     );
+    return (_r = tempOrder.products[productIndex].metadata) == null ? void 0 : _r.unique_identification_number;
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
-    this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
     await this.applyPromotion();
-    this.applyDiscount();
+    this.applyDiscount({
+      reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : void 0
+    });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();

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

@@ -340,6 +340,19 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
+    /**
+     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { discount_list: [] },
+     *   booking: { duration: 2 },
+     *   allow_booking_discount_reapply: true,
+     * });
+     */
+    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -1,8 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -45,12 +44,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: {
-        isSelected?: boolean;
-        discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
-        scan?: boolean;
-    }): DiscountResult;
+    }, options?: RulesCalcDiscountOptions): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券

package/lib/modules/Rules/index.js

@@ -209,6 +209,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     const resolveIsFormSubject = (product) => typeof isFormSubject === "function" ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
+    const reapplyBookingDiscountProductUids = new Set(
+      ((options == null ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter((uid) => uid !== void 0 && uid !== null && uid !== "").map(String)
+    );
+    const getOriginProductUid = (originProduct) => {
+      var _a2;
+      const uid = ((_a2 = originProduct == null ? void 0 : originProduct.metadata) == null ? void 0 : _a2.unique_identification_number) ?? (originProduct == null ? void 0 : originProduct.unique_identification_number);
+      if (uid === void 0 || uid === null || uid === "")
+        return void 0;
+      return String(uid);
+    };
+    const shouldReapplyBookingDiscount = (originProduct, selectedDiscount) => {
+      if (!selectedDiscount)
+        return false;
+      const uid = getOriginProductUid(originProduct);
+      if (!uid || !reapplyBookingDiscountProductUids.has(uid))
+        return false;
+      const discountType = selectedDiscount.tag || selectedDiscount.type;
+      return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
+    };
+    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+      var _a2;
+      if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
+        return void 0;
+      const discountType = (selectedDiscount == null ? void 0 : selectedDiscount.tag) || (selectedDiscount == null ? void 0 : selectedDiscount.type);
+      if (discountType !== "discount_card" && discountType !== "product_discount_card") {
+        return void 0;
+      }
+      const percent = Number((_a2 = selectedDiscount.discount) == null ? void 0 : _a2.percent);
+      return Number.isFinite(percent) ? percent : void 0;
+    };
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -232,9 +262,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       });
     }
-    const filteredDiscountList = addModeDiscount.filter((discount) => {
-      return !discount.isManualSelect;
-    });
     const hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options == null ? void 0 : options.discountId) || Boolean((_a = options == null ? void 0 : options.selectedList) == null ? void 0 : _a.length) || Boolean(options == null ? void 0 : options.scan);
     if (!hasDiscountInput) {
       return {
@@ -242,6 +269,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    const canUseEditModeDiscountForReapply = (discount) => {
+      const discountType = discount.tag || discount.type;
+      return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
+    };
+    const filteredDiscountList = [
+      ...addModeDiscount.filter((discount) => !discount.isManualSelect),
+      ...editModeDiscount.filter(canUseEditModeDiscountForReapply)
+    ];
     const flattenProductsWithBundle = (productList2) => {
       const flattened = [];
       productList2.forEach((originProduct) => {
@@ -737,9 +772,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
         const discountType = discount.tag || discount.type;
+        const currentOriginUid = getOriginProductUid(originProduct);
+        const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
+        if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
+          const uid = currentOriginUid;
+          if (!uid || !reapplyBookingDiscountProductUids.has(uid))
+            return false;
+          if (!discount.isSelected)
+            return false;
+        }
         if (["good_pass", "discount_card", "product_discount_card"].includes(
           discountType
-        )) {
+        ) && !isReapplyEditModeDiscountForProduct) {
           if (discount.config === void 0 || !((_a3 = discount == null ? void 0 : discount.config) == null ? void 0 : _a3.isAvailable)) {
             return false;
           }
@@ -955,7 +999,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
+      const shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
         return;
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
@@ -1011,10 +1056,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let productDiscountDifference;
           let discountedOptions = product.options;
           let optionDiscountAmount = 0;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
           } else {
             mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1049,7 +1100,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.price,
               product_id: originProduct.id || originProduct.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             // 前端使用的num数量，为了计算优惠金额

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

@@ -1,4 +1,5 @@
 import { Discount } from '../Discount/types';
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare enum UnavailableReason {
     TimeLimit = "time_limit",
     ProductNotApplicable = "product_not_applicable",
@@ -23,6 +24,14 @@ export interface DiscountResult {
     discountList: any[];
 }
 export type RulesFormSubject = boolean | ((product: any) => boolean);
+export interface RulesCalcDiscountOptions {
+    isSelected?: boolean;
+    discountId?: number;
+    selectedList?: SetDiscountSelectedParams[];
+    scan?: boolean;
+    /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
+    reapplyBookingDiscountProductUids?: string[];
+}
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -34,7 +43,7 @@ export interface RulesModuleAPI {
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }) => DiscountResult;
+    }, options?: RulesCalcDiscountOptions) => DiscountResult;
 }
 type ProductDetail = {
     isClient?: boolean;

package/lib/server/modules/order/index.js

@@ -308,12 +308,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   updateCreateStore() {
-    var _a;
     const appPlugin = this.core.getPlugin("app");
     const app = appPlugin == null ? void 0 : appPlugin.getApp();
     if (app) {
       const coreData = app.data.store.getStore().getDataByModel("core");
-      if (!((_a = this.store.createdAtQuery) == null ? void 0 : _a.sales_time_between) && (coreData == null ? void 0 : coreData.core)) {
+      if (coreData == null ? void 0 : coreData.core) {
         const today = (0, import_dayjs.default)();
         if (coreData == null ? void 0 : coreData.core.operating_day_boundary) {
           const operatingDayBoundary = coreData.core.operating_day_boundary;

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

@@ -49,6 +49,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queuedAutoPaymentSync;
     private autoPaymentSyncFlushing;
     private autoPaymentSyncTimer;
+    private salesDetailLoadInFlight;
+    private serverOrderChangeUnsubscribe;
+    private serverOrderChangeHydrateInFlight;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -69,6 +72,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
+    private isCurrentSalesOrderRecord;
+    private syncCurrentSalesDetailFromServerOrderChange;
+    private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;

package/lib/solution/BaseSales/index.js

@@ -45,6 +45,7 @@ __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
 var import_transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var import_quotationPrice = require("./utils/quotationPrice");
+var SERVER_ORDER_CHANGED_EVENT = "order:onOrdersChanged";
 function isBaseSalesManualProductDiscountProduct(product) {
   var _a, _b;
   return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
@@ -82,6 +83,18 @@ function getBaseSalesUniqueArrayMetadataKey(key) {
     return "unique_payment_number";
   return null;
 }
+function isSameBaseSalesOrderRecord(left, right) {
+  if (!left || !right || typeof left !== "object" || typeof right !== "object")
+    return false;
+  const leftIdentities = new Set(
+    [left.order_id, left.id, left.external_sale_number, left.order_number].filter((value) => value !== void 0 && value !== null && value !== "").map(String)
+  );
+  if (leftIdentities.size === 0)
+    return false;
+  return [right.order_id, right.id, right.external_sale_number, right.order_number].some(
+    (value) => value !== void 0 && value !== null && value !== "" && leftIdentities.has(String(value))
+  );
+}
 function getBaseSalesMetadataUid(item, metadataKey) {
   var _a;
   const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
@@ -159,6 +172,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.queuedAutoPaymentSync = false;
     this.autoPaymentSyncFlushing = false;
     this.autoPaymentSyncTimer = null;
+    this.salesDetailLoadInFlight = false;
+    this.serverOrderChangeUnsubscribe = null;
+    this.serverOrderChangeHydrateInFlight = null;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -223,6 +239,53 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  isCurrentSalesOrderRecord(order) {
+    var _a, _b;
+    const currentTempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
+    const currentRecords = [
+      currentTempOrder,
+      this.currentSalesDetail
+    ].filter(Boolean);
+    return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
+  }
+  async syncCurrentSalesDetailFromServerOrderChange(payload) {
+    const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload == null ? void 0 : payload.changedOrders) ? payload.changedOrders : (payload == null ? void 0 : payload.data) && typeof payload.data === "object" ? [payload.data] : [];
+    if (this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
+      return;
+    const changedOrder = changedOrders.find(
+      (order) => this.isCurrentSalesOrderRecord(order)
+    );
+    if (!changedOrder)
+      return;
+    if (!this.store.order)
+      return;
+    this.serverOrderChangeHydrateInFlight = (async () => {
+      const sales = await this.store.order.hydrateTempOrderFromRecord(changedOrder, {
+        recalcOnHydrate: false
+      });
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+    })();
+    try {
+      await this.serverOrderChangeHydrateInFlight;
+    } finally {
+      this.serverOrderChangeHydrateInFlight = null;
+    }
+  }
+  registerServerOrderChangeSync() {
+    var _a, _b;
+    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
+    const effects = (_b = this.core) == null ? void 0 : _b.effects;
+    if (!effects || typeof effects.on !== "function")
+      return;
+    this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, (payload) => {
+      void this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
+        this.logError("sync sales detail from server order change failed", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    });
+  }
   hydrateOrderPaymentNames(payments) {
     if (!payments.length)
       return [];
@@ -637,9 +700,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       );
     }
     await this.getPaymentMethodsAsync();
+    this.registerServerOrderChangeSync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
+    var _a;
+    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
+    this.serverOrderChangeUnsubscribe = null;
     Object.keys(this.store).forEach((key) => {
       if (this.reusedSharedSubModuleNames.has(key))
         return;
@@ -666,30 +733,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async loadSalesDetail(orderIdOrParams) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
-    const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    const preloadedSalesDetail = params.preloadedSalesDetail;
-    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
-    if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
-      throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
-    }
-    const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
-      lookup,
-      forceRemote: params.forceRemote
-    });
-    if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
-      const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
-      throw new Error(message);
-    }
-    const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
-    const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-    const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
-    const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-      recalcOnHydrate: false
-    });
-    this.currentSalesDetail = sales;
-    await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
-    return sales;
+    this.salesDetailLoadInFlight = true;
+    try {
+      const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
+      const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
+      const preloadedSalesDetail = params.preloadedSalesDetail;
+      const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
+      if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
+        throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
+      }
+      const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
+        lookup,
+        forceRemote: params.forceRemote
+      });
+      if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
+        const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
+        throw new Error(message);
+      }
+      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
+      const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
+      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+        recalcOnHydrate: false
+      });
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+      return sales;
+    } finally {
+      this.salesDetailLoadInFlight = false;
+    }
   }
   /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
   getSalesOrder() {

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

@@ -441,7 +441,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",