@pisell/pisellos 0.10.4 → 0.10.5

package/lib/modules/Order/utils.js

@@ -1203,7 +1203,6 @@ function productRequiresFormSubject(tempOrder, product) {
 }
 function resolveIsFormSubject(tempOrder, product) {
   var _a;
-  debugger;
   if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
     return true;
   if (product)

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

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

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -282,7 +283,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -445,7 +447,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/solution/BookingTicket/index.js

@@ -56,6 +56,7 @@ var import_utils = require("../../modules/Order/utils");
 __reExport(BookingTicket_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
+var USER_PLATFORM = ["pc", "h5"];
 function resolveBookingUidForAddTime(booking) {
   var _a;
   const uid = (_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.unique_identification_number;
@@ -135,6 +136,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.addTimeProductsCatalog = [];
     this.orderCustomerDiscountRefreshInFlight = null;
     this.orderCustomerDiscountRefreshCustomerId = null;
+    this.orderCustomerPromotionRefreshInFlight = null;
     this.loadOpenDataConfigInFlight = null;
   }
   /**
@@ -352,7 +354,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const scannedList = raw.scannedDiscountList || [];
     const extractedCustomerId = this.getDiscountCustomerId(scannedList);
     const hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
-    if (!hasOrderCustomer && extractedCustomerId) {
+    const isUserPlatform = USER_PLATFORM.includes(this.otherParams.platform);
+    if (!hasOrderCustomer && extractedCustomerId && !isUserPlatform) {
       await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
     }
     if (raw.isAvailable) {
@@ -899,9 +902,21 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const next = this.buildOrderCustomerPayload();
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
-    void this.store.order.applyPromotion().catch((error) => {
-      console.error("[BookingTicket] applyPromotion after customer change failed", error);
-    });
+    const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
+    this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;
+    void promotionRefreshTask.then(
+      () => {
+        if (this.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask)
+          return;
+        this.orderCustomerPromotionRefreshInFlight = null;
+      },
+      (error) => {
+        console.error("[BookingTicket] applyPromotion after customer change failed", error);
+        if (this.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask)
+          return;
+        this.orderCustomerPromotionRefreshInFlight = null;
+      }
+    );
   }
   /**
    * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
@@ -971,12 +986,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   refreshDiscountConfigAfterOrderCustomerChange(customerId) {
     if (!customerId || customerId === 1)
-      return;
+      return Promise.resolve();
     if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
-      return;
+      return this.orderCustomerDiscountRefreshInFlight;
     }
     const previousRefresh = this.orderCustomerDiscountRefreshInFlight;
     const refreshTask = (async () => {
+      var _a, _b, _c, _d;
       if (previousRefresh) {
         await previousRefresh.catch(() => void 0);
       }
@@ -984,7 +1000,10 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       if (!currentCustomer || Number(currentCustomer.customer_id) !== customerId) {
         return;
       }
-      await this.loadDiscountConfig({ customerId });
+      const tempOrder = (_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a);
+      const orderId = (tempOrder == null ? void 0 : tempOrder.order_id) || ((_d = (_c = this.getOrderIdentity) == null ? void 0 : _c.call(this)) == null ? void 0 : _d.orderId);
+      const action = !orderId || String(orderId).startsWith("local_order") ? "create" : "edit";
+      await this.loadDiscountConfig({ customerId, action });
     })();
     this.orderCustomerDiscountRefreshInFlight = refreshTask;
     this.orderCustomerDiscountRefreshCustomerId = customerId;
@@ -996,6 +1015,10 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       this.orderCustomerDiscountRefreshInFlight = null;
       this.orderCustomerDiscountRefreshCustomerId = null;
     });
+    return refreshTask;
+  }
+  waitForOrderCustomerPromotionRefresh() {
+    return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
   /**
    * 获取客户分页信息

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

@@ -75,6 +75,12 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected getRegisteredModuleNames(): readonly string[];
     protected createSubModule(moduleName: string): Module | null;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    syncAuthenticatedOrderCustomer(): Promise<boolean>;
+    private isAuthenticatedCustomerUserPlatform;
+    private resolveDiscountOrderIdentity;
+    private resolveDiscountAction;
+    private resetCachedCustomerDiscountState;
+    private refreshLegacySessionCustomerDiscounts;
     /**
      * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
      * business/channel target so a reused solution instance cannot leak another entry's menus.

package/lib/solution/UnifiedBookingSales/index.js

@@ -141,6 +141,28 @@ function toNumberId(value) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : String(value);
 }
+function toCustomerId(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 1 ? parsed : null;
+}
+function resolveTempOrderCustomerId(tempOrder) {
+  var _a, _b, _c, _d, _e;
+  return toCustomerId(
+    (tempOrder == null ? void 0 : tempOrder.customer_id) || ((_a = tempOrder == null ? void 0 : tempOrder.customer) == null ? void 0 : _a.id) || ((_c = (_b = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _b.customerSnapshot) == null ? void 0 : _c.id) || ((_e = (_d = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _d.customerSnapshot) == null ? void 0 : _e.customer_id)
+  );
+}
+function isLocalOrderId(orderId) {
+  return typeof orderId === "string" && orderId.startsWith("local_order");
+}
+function isCustomerBoundDiscount(discount) {
+  const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
+  return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
+}
+function filterCustomerBoundDiscounts(discountList) {
+  if (!Array.isArray(discountList))
+    return [];
+  return discountList.filter((discount) => !isCustomerBoundDiscount(discount));
+}
 function resolveProductKind(product) {
   var _a, _b, _c;
   if (product.duration)
@@ -482,33 +504,108 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
     return super.createSubModule(moduleName);
   }
   async addNewOrder() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d;
     const sessionRecord = this.isSessionStoragePersistEnabled() ? (_b = (_a = this.store.order) == null ? void 0 : _a.consumeSessionStorageRestore) == null ? void 0 : _b.call(_a) : null;
-    if (!sessionRecord)
-      return super.addNewOrder();
-    await this.loadSalesDetail({
-      preloadedSalesDetail: sessionRecord,
-      hydrateSource: "sessionStorage"
-    });
+    if (sessionRecord) {
+      await this.loadSalesDetail({
+        preloadedSalesDetail: sessionRecord,
+        hydrateSource: "sessionStorage"
+      });
+    }
     const tempOrder = await super.addNewOrder();
-    (_c = this.store.order) == null ? void 0 : _c.persistTempOrder();
-    const customerId = Number(
-      tempOrder.customer_id || ((_d = tempOrder.customer) == null ? void 0 : _d.id) || ((_f = (_e = tempOrder._extend) == null ? void 0 : _e.customerSnapshot) == null ? void 0 : _f.id) || ((_h = (_g = tempOrder._extend) == null ? void 0 : _g.customerSnapshot) == null ? void 0 : _h.customer_id) || 0
-    );
-    if (customerId > 1) {
+    if (sessionRecord) {
+      (_c = this.store.order) == null ? void 0 : _c.persistTempOrder();
+    }
+    if (this.isAuthenticatedCustomerUserPlatform()) {
       try {
-        await this.loadDiscountConfig({
-          customerId,
-          action: tempOrder.order_id ? "edit" : "create"
-        });
+        const didSyncAuthenticatedCustomer = await this.syncAuthenticatedOrderCustomer();
+        if (!didSyncAuthenticatedCustomer && sessionRecord) {
+          await this.refreshLegacySessionCustomerDiscounts(tempOrder);
+        }
+      } catch (error) {
+        console.warn(
+          "[UnifiedBookingSales] Failed to sync authenticated order customer after addNewOrder",
+          error
+        );
+      }
+    } else if (sessionRecord) {
+      try {
+        await this.refreshLegacySessionCustomerDiscounts(tempOrder);
       } catch (error) {
         console.warn(
-          "[UnifiedBookingSales] Failed to refresh discounts after session restore",
+          "[UnifiedBookingSales] Failed to refresh cached customer discounts after addNewOrder",
           error
         );
       }
     }
-    return ((_i = this.store.order) == null ? void 0 : _i.getTempOrder()) || tempOrder;
+    return ((_d = this.store.order) == null ? void 0 : _d.getTempOrder()) || tempOrder;
+  }
+  async syncAuthenticatedOrderCustomer() {
+    var _a, _b, _c, _d, _e, _f;
+    if (!this.isAuthenticatedCustomerUserPlatform())
+      return false;
+    const authenticatedCustomer = (_d = (_c = (_b = (_a = this.core) == null ? void 0 : _a.getPlugin) == null ? void 0 : _b.call(_a, "user")) == null ? void 0 : _c.get) == null ? void 0 : _d.call(_c);
+    const authenticatedCustomerId = toCustomerId(authenticatedCustomer == null ? void 0 : authenticatedCustomer.id);
+    if (!authenticatedCustomerId)
+      return false;
+    const tempOrder = this.getTempOrder();
+    const cachedCustomerId = resolveTempOrderCustomerId(tempOrder);
+    if (cachedCustomerId !== null && cachedCustomerId !== authenticatedCustomerId) {
+      await this.resetCachedCustomerDiscountState();
+    }
+    (_f = (_e = this.store.customer) == null ? void 0 : _e.setSelectedCustomer) == null ? void 0 : _f.call(_e, authenticatedCustomer);
+    this.setOrderCustomer(authenticatedCustomer);
+    await Promise.all([
+      this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId),
+      this.waitForOrderCustomerPromotionRefresh()
+    ]);
+    return true;
+  }
+  isAuthenticatedCustomerUserPlatform() {
+    var _a;
+    const platform = String(((_a = this.otherParams) == null ? void 0 : _a.platform) || "").toLowerCase();
+    return platform === "pc" || platform === "h5";
+  }
+  resolveDiscountOrderIdentity(tempOrder) {
+    var _a, _b, _c;
+    return (tempOrder == null ? void 0 : tempOrder.order_id) || ((_c = (_b = (_a = this.store.order) == null ? void 0 : _a.getOrderIdentity) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.orderId) || null;
+  }
+  resolveDiscountAction(orderId) {
+    if (!orderId || isLocalOrderId(orderId))
+      return "create";
+    return "edit";
+  }
+  async resetCachedCustomerDiscountState() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    (_b = (_a = this.store.order) == null ? void 0 : _a.clearOrderCustomer) == null ? void 0 : _b.call(_a);
+    (_d = (_c = this.store.customer) == null ? void 0 : _c.setSelectedCustomer) == null ? void 0 : _d.call(_c, null);
+    this.discountConfigCacheKey = null;
+    this.hasManualDiscountSelection = false;
+    const orderStore = ((_e = this.store.order) == null ? void 0 : _e.store) || {};
+    const discountModule = orderStore.discount;
+    const filteredOriginalDiscounts = filterCustomerBoundDiscounts(
+      ((_f = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _f.call(discountModule)) || []
+    );
+    const filteredCurrentDiscounts = filterCustomerBoundDiscounts(
+      ((_g = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _g.call(discountModule)) || []
+    );
+    await ((_h = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _h.call(discountModule, filteredOriginalDiscounts));
+    await ((_i = discountModule == null ? void 0 : discountModule.setDiscountList) == null ? void 0 : _i.call(discountModule, filteredCurrentDiscounts));
+    (_k = (_j = this.store.order) == null ? void 0 : _j.applyDiscount) == null ? void 0 : _k.call(_j);
+    await ((_m = (_l = this.store.order) == null ? void 0 : _l.recalculateSummary) == null ? void 0 : _m.call(_l, { createIfMissing: true }));
+    (_o = (_n = this.store.order) == null ? void 0 : _n.persistTempOrder) == null ? void 0 : _o.call(_n);
+  }
+  async refreshLegacySessionCustomerDiscounts(tempOrder) {
+    const customerId = resolveTempOrderCustomerId(tempOrder);
+    if (!customerId)
+      return void 0;
+    const loadDiscountConfig = super.loadDiscountConfig.bind(this);
+    return await loadDiscountConfig({
+      customerId,
+      action: this.resolveDiscountAction(
+        this.resolveDiscountOrderIdentity(tempOrder)
+      )
+    });
   }
   /**
    * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact

package/package.json

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