@pisell/pisellos 2.2.172 → 2.2.173

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

@@ -190,14 +190,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
+      const scheduleCache = /* @__PURE__ */ new Map();
+      let hasLoadedScheduleList = false;
       this.quotationPriceBridge.setScheduleResolver((id) => {
         var _a2, _b, _c, _d, _e, _f;
         const scheduleId = String(id);
-        const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
-        const schedule = scheduleList.find((item) => String(item.id) === scheduleId);
-        if (schedule)
-          return schedule;
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        if (!hasLoadedScheduleList) {
+          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          for (const schedule of scheduleList) {
+            scheduleCache.set(String(schedule.id), schedule);
+          }
+          hasLoadedScheduleList = true;
+        }
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
         const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        if (schedules[0])
+          scheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
@@ -257,10 +268,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       customer_id: customerId
     });
     const productPrice = quotedPrice ?? product.price;
+    const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
     return {
       id: product.id,
       price: String(productPrice ?? 0),
-      base_price: String(product.base_price ?? product.price ?? 0),
+      base_price: String(productBasePrice),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -277,7 +289,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -302,7 +314,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = item.base_price ?? item.price ?? 0;
+        const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 0;
         return {
           id: Number(item.id),
           product_id: Number(item.product_id ?? product.id),

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

@@ -39,6 +39,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     window: WindowPlugin;
     request: RequestPlugin;
     protected currentSalesDetail: ISalesDetail | null;
+    protected discountConfigCacheKey: string | null;
+    protected hasManualDiscountSelection: boolean;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -113,23 +115,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
-    /**
-     * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
-     * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
-     *
-     * @example
-     * bookingTicket.setEnableTempOrderPersist(false);
-     * await bookingTicket.addProductToOrder(product);
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
-    /**
-     * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
-     *
-     * @example
-     * if (bookingTicket.isTempOrderPersistEnabled()) {
-     *   bookingTicket.restoreOrder();
-     * }
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     isTempOrderPersistEnabled(): boolean;
     private ensureTempOrder;
     addNewOrder(): Promise<OrderTempOrder>;

package/lib/solution/BaseSales/index.js

@@ -57,6 +57,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
     // 当前缓存中已加载的最新 SalesDetail；只读 getter 走它对外暴露详情数据。
     this.currentSalesDetail = null;
+    this.discountConfigCacheKey = null;
+    this.hasManualDiscountSelection = false;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -417,30 +419,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
   }
-  /**
-   * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
-   * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
-   *
-   * @example
-   * bookingTicket.setEnableTempOrderPersist(false);
-   * await bookingTicket.addProductToOrder(product);
-   */
+  /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   setEnableTempOrderPersist(enabled) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     this.store.order.setEnableTempOrderPersist(enabled);
   }
-  /**
-   * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
-   *
-   * @example
-   * if (bookingTicket.isTempOrderPersistEnabled()) {
-   *   bookingTicket.restoreOrder();
-   * }
-   */
+  /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   isTempOrderPersistEnabled() {
     if (!this.store.order)
-      return true;
+      return false;
     return this.store.order.isTempOrderPersistEnabled();
   }
   ensureTempOrder() {
@@ -477,6 +465,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       const tempOrder = this.store.order.restoreOrder();
       this.currentSalesDetail = null;
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
       await this.effectsEmit("onTempOrderReplaced", { tempOrder });
       if (this.syncAppDataToTempOrder(tempOrder)) {
         this.store.order.persistTempOrder();
@@ -615,7 +605,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -627,18 +617,37 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       (params == null ? void 0 : params.customerId) || tempOrder.customer_id || ((_c = tempOrder.customer) == null ? void 0 : _c.id) || ((_e = (_d = tempOrder._extend) == null ? void 0 : _d.customerSnapshot) == null ? void 0 : _e.id) || ((_g = (_f = tempOrder._extend) == null ? void 0 : _f.customerSnapshot) == null ? void 0 : _g.customer_id) || 0
     );
     const currentDiscountList = ((_h = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _h.call(discountModule)) || [];
+    const originalDiscountList = ((_i = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _i.call(discountModule)) || [];
+    const hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some((discount) => discount.isManualSelect);
+    const discountAction = (params == null ? void 0 : params.action) || (orderId ? "edit" : "create");
+    const discountConfigCacheKey = [
+      customerId,
+      discountAction,
+      Number(orderId) || 0
+    ].join(":");
     let preparedDiscountList = [];
     if (customerId && customerId !== 1) {
-      preparedDiscountList = await this.store.order.loadDiscountConfig({
-        customerId,
-        action: (params == null ? void 0 : params.action) || (orderId ? "edit" : "create"),
-        orderId: Number(orderId) || void 0,
-        apply: false
-      });
-      await ((_i = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _i.call(discountModule, preparedDiscountList));
+      if (this.discountConfigCacheKey === discountConfigCacheKey) {
+        preparedDiscountList = originalDiscountList;
+      } else {
+        preparedDiscountList = await this.store.order.loadDiscountConfig({
+          customerId,
+          action: discountAction,
+          orderId: Number(orderId) || void 0,
+          apply: false
+        });
+        this.discountConfigCacheKey = discountConfigCacheKey;
+        await ((_j = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _j.call(discountModule, preparedDiscountList));
+      }
+    }
+    if (hasManualDiscountSelection && currentDiscountList.length) {
+      return {
+        productList: tempOrder.products || [],
+        discountList: currentDiscountList
+      };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
-      preparedDiscountList || ((_j = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _j.call(discountModule)) || [],
+      preparedDiscountList || ((_k = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _k.call(discountModule)) || [],
       tempOrder.products || []
     );
     nextDiscountList = this.mergeCurrentDiscountSelectionState(
@@ -647,17 +656,39 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     );
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_k = tempOrder.holder) == null ? void 0 : _k.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: !!((_l = tempOrder.holder) == null ? void 0 : _l.type) && tempOrder.holder.type === "form",
-        orderTotalAmount: Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0)
+        isFormSubject: !!((_m = tempOrder.holder) == null ? void 0 : _m.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_n = orderStore.summary) == null ? void 0 : _n.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = result.productList;
       }
+      for (const product of tempOrder.products || []) {
+        const productUid = (_o = product.metadata) == null ? void 0 : _o.unique_identification_number;
+        const runtimeOrigin = productUid ? (_r = (_q = (_p = tempOrder._extend) == null ? void 0 : _p.productsByUid) == null ? void 0 : _q[productUid]) == null ? void 0 : _r.origin : void 0;
+        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || ((_s = product.metadata) == null ? void 0 : _s.is_manual_discount))
+          continue;
+        const totalPerUnitDiscount = (product.discount_list || []).reduce(
+          (sum, pd) => sum + Number(pd.amount || 0),
+          0
+        );
+        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const sourcePrice = ((_t = product.metadata) == null ? void 0 : _t.source_product_price) ?? (((_u = product.metadata) == null ? void 0 : _u.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+        if (product.metadata) {
+          product.metadata.main_product_selling_price = newMainSellingPrice;
+          product.metadata.price_schema_version = 2;
+        }
+        product.selling_price = (0, import_utils.composeLinePrice)({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
+      }
       if (result.discountList) {
         nextDiscountList = this.mergeHistoricalDiscountList(
           result.discountList,
@@ -668,6 +699,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         tempOrder.discount_list = nextDiscountList.filter((discount) => discount.isSelected);
       }
     }
+    const summary = await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
     await this.effectsEmit("onDiscountApplied", {
       productList: tempOrder.products || [],
@@ -681,7 +713,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -689,6 +721,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const discountModule = orderStore.discount;
     const rulesModule = orderStore.rules;
     const originalDiscountList = ((_a = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _a.call(discountModule)) || this.getDiscountList();
+    const currentDiscountList = ((_b = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
     let nextDiscountList = this.mergeHistoricalDiscountList(
       originalDiscountList || [],
       tempOrder.products || []
@@ -699,13 +732,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form",
-        orderTotalAmount: Number(((_d = orderStore.summary) == null ? void 0 : _d.total_amount) || 0)
+        isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_e = orderStore.summary) == null ? void 0 : _e.total_amount) || 0)
       }) || result;
       if (result.productList) {
         tempOrder.products = result.productList;
@@ -766,6 +799,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !params.isSelected
         } : d
       );
+      this.hasManualDiscountSelection = true;
       const tempOrder = this.store.order.ensureTempOrder();
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
@@ -798,6 +832,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
             for (const d of nextDiscountList) {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
+                d.isManualSelect = true;
               }
             }
           }

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

@@ -243,6 +243,19 @@ export interface BaseSalesProductBookingPriceSegment {
     quotation_shelf_id: number;
     source: BaseSalesProductBookingPriceSegmentSource;
 }
+export interface BaseSalesBundleProductBookingPriceResult {
+    bundle_id?: number;
+    group_id?: number;
+    bundle_group_id?: number;
+    bundle_product_id: number | null;
+    bundle_variant_id: number;
+    unit_price: string;
+    total_price: string;
+    quantity: number;
+    quotation_shelf_id: number;
+    source: BaseSalesProductBookingPriceSegmentSource;
+    segments: BaseSalesProductBookingPriceSegment[];
+}
 export interface BaseSalesProductBookingPriceResult {
     product_id: number | null;
     product_variant_id: number;
@@ -253,6 +266,7 @@ export interface BaseSalesProductBookingPriceResult {
     duration?: BaseSalesQuotationDurationConfig;
     quotation_shelf_id: number;
     segments: BaseSalesProductBookingPriceSegment[];
+    product_bundle?: BaseSalesBundleProductBookingPriceResult[];
 }
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {

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

@@ -99,6 +99,29 @@ function getFallbackPrice(params) {
 function getProductQuantity(product) {
   return toPositiveInt(product.num ?? product.quantity, 1);
 }
+function getBundleProductId(bundle) {
+  const productId = toFiniteNumber(
+    bundle.bundle_product_id ?? bundle._bundle_product_id,
+    NaN
+  );
+  if (!Number.isFinite(productId))
+    return null;
+  return productId;
+}
+function getBundleVariantId(bundle) {
+  const variantId = toFiniteNumber(
+    bundle.bundle_variant_id ?? bundle.variant_id,
+    0
+  );
+  if (!Number.isFinite(variantId) || variantId <= 0)
+    return void 0;
+  return variantId;
+}
+function getBundleFallbackPrice(bundle) {
+  return toPriceString(
+    bundle.bundle_selling_price ?? bundle.price ?? bundle.original_price ?? bundle.base_price ?? 0
+  );
+}
 function shouldSplitByDuration(duration, start, end) {
   if (!duration)
     return false;
@@ -162,37 +185,90 @@ function buildPriceSegment(params) {
     source: quotedPrice !== null ? "quotation" : "fallback"
   };
 }
-function calculateBaseSalesProductBookingPrice(params) {
+function calculatePriceForProduct(params) {
   var _a;
+  const segments = params.segments.map((segment) => buildPriceSegment({
+    quotation: params.quotation,
+    productId: params.productId,
+    variantId: params.variantId,
+    customerId: params.customerId,
+    fallbackPrice: params.fallbackPrice,
+    segment
+  }));
+  const unitPrice = segments.reduce(
+    (total, segment) => total.plus(segment.total_price),
+    new import_decimal.default(0)
+  );
+  const totalPrice = unitPrice.times(params.quantity);
+  const quotationShelfId = ((_a = segments.find((segment) => segment.quotation_shelf_id)) == null ? void 0 : _a.quotation_shelf_id) || 0;
+  return {
+    unitPrice,
+    totalPrice,
+    quotationShelfId,
+    segments
+  };
+}
+function calculateBundlePrices(params, segments) {
+  var _a;
+  const bundleList = ((_a = params.product) == null ? void 0 : _a.product_bundle) || [];
+  if (!bundleList.length)
+    return void 0;
+  return bundleList.map((bundle) => {
+    const productId = getBundleProductId(bundle);
+    const variantId = getBundleVariantId(bundle);
+    const quantity = getProductQuantity(bundle);
+    const price = calculatePriceForProduct({
+      quotation: params.quotation,
+      productId,
+      variantId,
+      customerId: params.customer_id,
+      quantity,
+      fallbackPrice: getBundleFallbackPrice(bundle),
+      segments
+    });
+    return {
+      bundle_id: bundle.bundle_id ?? bundle.id,
+      group_id: bundle.group_id,
+      bundle_group_id: bundle.bundle_group_id,
+      bundle_product_id: productId,
+      bundle_variant_id: variantId ?? 0,
+      unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+      total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
+      quantity,
+      quotation_shelf_id: price.quotationShelfId,
+      source: price.segments.some((segment) => segment.source === "quotation") ? "quotation" : "fallback",
+      segments: price.segments
+    };
+  });
+}
+function calculateBaseSalesProductBookingPrice(params) {
   const product = params.product || {};
   const productId = getProductId(product);
   const variantId = getProductVariantId(product);
   const productQuantity = getProductQuantity(product);
   const fallbackPrice = getFallbackPrice(params);
-  const segments = buildTimeSegments(params).map((segment) => buildPriceSegment({
+  const timeSegments = buildTimeSegments(params);
+  const price = calculatePriceForProduct({
     quotation: params.quotation,
     productId,
     variantId,
     customerId: params.customer_id,
+    quantity: productQuantity,
     fallbackPrice,
-    segment
-  }));
-  const unitPrice = segments.reduce(
-    (total, segment) => total.plus(segment.total_price),
-    new import_decimal.default(0)
-  );
-  const totalPrice = unitPrice.times(productQuantity);
-  const quotationShelfId = ((_a = segments.find((segment) => segment.quotation_shelf_id)) == null ? void 0 : _a.quotation_shelf_id) || 0;
+    segments: timeSegments
+  });
+  const bundlePrices = calculateBundlePrices(params, timeSegments);
   return {
     product_id: productId,
     product_variant_id: variantId ?? 0,
     customer_id: params.customer_id,
-    unit_price: unitPrice.toDecimalPlaces(2).toFixed(2),
-    total_price: totalPrice.toDecimalPlaces(2).toFixed(2),
+    unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+    total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
     quantity: productQuantity,
     duration: params.duration,
-    quotation_shelf_id: quotationShelfId,
-    segments
+    quotation_shelf_id: price.quotationShelfId,
+    segments: price.segments,
+    ...bundlePrices ? { product_bundle: bundlePrices } : {}
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -482,11 +482,17 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
   setOrderCustomer(customer) {
+    var _a;
     if (!customer) {
       this.clearOrderCustomer();
       return;
     }
+    const previousCustomerId = (_a = this.store.order.getOrderCustomer()) == null ? void 0 : _a.customer_id;
     const patch = (0, import_orderCustomer.formatOrderCustomerPatch)(customer);
+    if (Number(previousCustomerId || 0) !== Number(patch.customer_id || 0)) {
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
+    }
     this.store.order.setOrderCustomer(patch, customer);
     const next = this.buildOrderCustomerPayload();
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
@@ -510,6 +516,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   clearOrderCustomer() {
     var _a, _b;
     this.store.order.clearOrderCustomer();
+    this.discountConfigCacheKey = null;
+    this.hasManualDiscountSelection = false;
     const orderStore = this.store.order.store || {};
     const discountModule = orderStore.discount;
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));

package/package.json

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