@pisell/pisellos 0.10.8 → 0.10.9

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

@@ -67,7 +67,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 通过 schedule 来读取商品，适用于 session 类商品
      *
@@ -87,7 +87,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         product_ids?: number[];
         category_ids?: number[];
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
      *
@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -64,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -126,7 +128,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     loadProducts(params?: ILoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 获取加时商品列表。
      *
@@ -285,6 +287,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private buildOrderCustomerPayload;
     protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
     protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息

package/lib/solution/BookingTicket/index.js

@@ -399,7 +399,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return null;
   }
-  async resolveCustomerByDiscountCustomerId(customerId) {
+  async resolveCustomerById(customerId) {
     var _a;
     const localCustomers = this.store.customer.getCustomers();
     const localCustomer = this.findCustomerById(localCustomers, customerId);
@@ -413,7 +413,23 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       num: 1
     });
     const remoteCustomer = this.findCustomerById((result == null ? void 0 : result.list) || [], customerId) || ((_a = result == null ? void 0 : result.list) == null ? void 0 : _a[0]) || null;
-    return remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null;
+    if (remoteCustomer) {
+      return this.normalizeCustomer(remoteCustomer);
+    }
+    try {
+      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
+      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
+    } catch (error) {
+      console.warn(
+        "[BookingTicket] resolveCustomerById detail request failed",
+        { customerId, error }
+      );
+      return null;
+    }
+  }
+  /** 兼容既有优惠码扫码逻辑。 */
+  resolveCustomerByDiscountCustomerId(customerId) {
+    return this.resolveCustomerById(customerId);
   }
   findCustomerById(customers = [], customerId) {
     return customers.find((customer) => {
@@ -1020,6 +1036,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   waitForOrderCustomerPromotionRefresh() {
     return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
+  async prepareProductPriceQueryContext(customerId) {
+    await Promise.resolve();
+    const normalizedCustomerId = Number(customerId || 0);
+    const refreshTask = this.orderCustomerDiscountRefreshInFlight;
+    const shouldWait = normalizedCustomerId > 1 && this.orderCustomerDiscountRefreshCustomerId === normalizedCustomerId && Boolean(refreshTask);
+    if (shouldWait && refreshTask) {
+      await refreshTask;
+    }
+  }
+  preferAuthoritativeProductQueryPrice() {
+    return true;
+  }
   /**
    * 获取客户分页信息
    * @returns 分页信息

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -277,7 +277,7 @@ function transformDetailToProductAndBooking(cacheItem, ctx) {
   return { product: productInput, booking, cacheItem: preparedCacheItem };
 }
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const other = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.other) || {};
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
@@ -304,6 +304,7 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     bundle_edit: extend == null ? void 0 : extend.bundle_edit,
     discount_reason: extend == null ? void 0 : extend.discount_reason,
     discount_list: cacheItem == null ? void 0 : cacheItem.discount_list,
+    selected_settlement_snapshot: ((_e = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _e.selected_settlement_snapshot) ?? ((_f = extend == null ? void 0 : extend.metadata) == null ? void 0 : _f.selected_settlement_snapshot),
     _extend: extend
   };
 }

package/lib/solution/ScanOrder/index.js

@@ -1708,60 +1708,23 @@ var _ScanOrderImpl = class extends import_BaseSales.BaseSalesImpl {
         schedule_datetime: scheduleDatetime,
         cacheId: this.cacheId
       });
-      if (Array.isArray(loaded)) {
-        const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
-          loaded,
-          normalizedResourceId
-        );
-        const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
-        this.enabledReservationRuleProducts = ruleProductsForResource;
-        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
-        if (occupancyMinutes !== void 0) {
-          tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-        }
-        if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
-          pendingRequestEntryPax = 1;
-          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
-          if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
-            pendingRequestPaxMin = paxBounds.min;
-          if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
-            pendingRequestPaxMax = paxBounds.max;
-        }
-      } else {
-        this.enabledReservationRuleProducts = [];
-        const error = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
-        this.logMethodError("loadReservationRuleProducts", error, {
-          resourceId: normalizedResourceId,
-          reservationLinkIds,
-          scheduleDate,
-          scheduleDatetime,
-          cacheId: this.cacheId
-        });
-        if (Array.isArray(loaded)) {
-          this.enabledReservationRuleProducts = loaded;
-          const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
-          if (occupancyMinutes !== void 0) {
-            tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-          }
-          if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
-            pendingRequestEntryPax = 1;
-            const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
-            if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
-              pendingRequestPaxMin = paxBounds.min;
-            if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
-              pendingRequestPaxMax = paxBounds.max;
-          }
-        } else {
-          this.enabledReservationRuleProducts = [];
-          const error2 = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
-          this.logMethodError("loadReservationRuleProducts", error2, {
-            resourceId,
-            reservationLinkIds,
-            scheduleDate,
-            scheduleDatetime,
-            cacheId: this.cacheId
-          });
-        }
+      const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
+        loaded,
+        normalizedResourceId
+      );
+      const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+      this.enabledReservationRuleProducts = ruleProductsForResource;
+      const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
+      if (occupancyMinutes !== void 0) {
+        tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+      }
+      if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
+        pendingRequestEntryPax = 1;
+        const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
+        if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
+          pendingRequestPaxMin = paxBounds.min;
+        if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
+          pendingRequestPaxMax = paxBounds.max;
       }
       const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
       const occupyDetail = occupyDetails[0] ?? null;

package/package.json

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