@pisell/pisellos 2.3.153 → 2.3.155

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

@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "normal" | "session";
 }

package/lib/solution/BaseSales/index.js

@@ -1043,7 +1043,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         customerId: params.customerId,
         channel: params.channel
       });
-      return productIds.map(productId => productId === null ? null : productsById.get(productId) || null);
+      const shouldAlignSelectedVariantPrice = handledByOsServer && this.preferAuthoritativeProductQueryPrice();
+      return productIds.map((productId, index) => {
+        const authoritativeProduct = productId === null ? null : productsById.get(productId) || null;
+        if (!shouldAlignSelectedVariantPrice || !authoritativeProduct) return authoritativeProduct;
+        const selectedProduct = selectedProducts[index];
+        const selectedVariantId = this.getSelectedProductVariantId(selectedProduct);
+        if (!selectedVariantId || this.getSelectedProductVariantId(authoritativeProduct) === selectedVariantId) {
+          return authoritativeProduct;
+        }
+
+        // OS 返回的是目录商品；已命中的智能价格不能被规格基础价覆盖。
+        const appliedFields = authoritativeProduct._dataVariant?.appliedFields;
+        if (Array.isArray(appliedFields) && ['price', 'selling_price', 'original_price', 'base_price'].some(field => appliedFields.includes(field))) {
+          return authoritativeProduct;
+        }
+        const selectedVariant = Array.isArray(authoritativeProduct.variant) ? authoritativeProduct.variant.find(variant => Number(variant?.id) === selectedVariantId) : undefined;
+        const selectedPrice = [selectedVariant?.price, selectedVariant?.selling_price, selectedVariant?.base_price, params.priceQueries[index].fallback_price, selectedProduct.price, selectedProduct.selling_price, selectedProduct.original_price].find(value => (typeof value === 'number' || typeof value === 'string' && value.trim() !== '') && Number.isFinite(Number(value)));
+
+        // 每行独立保留所选规格价格（含 0 元），避免同商品多规格共用目录对象串价。
+        return selectedPrice === undefined ? authoritativeProduct : {
+          ...authoritativeProduct,
+          price: selectedPrice
+        };
+      });
     }
     const queryPayload = this.buildPriceQueryPayload({
       ids,

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

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -347,7 +347,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -147,6 +147,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
      */
     clearSessionStorageOrderSnapshot(): void;
+    /** 在 Kiosk 拉起支付设备前补齐订单号，同一订单重试复用已分配的号码。 */
+    ensureLocalOrderNumbersForCheckout(): Promise<void>;
     /**
      * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。

package/lib/solution/UnifiedBookingSales/index.js

@@ -1691,6 +1691,42 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     this.store.order?.clearSessionStoragePersistedTempOrder?.();
   }
 
+  /** 在 Kiosk 拉起支付设备前补齐订单号，同一订单重试复用已分配的号码。 */
+  async ensureLocalOrderNumbersForCheckout() {
+    if ((0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform) !== 'kiosk') return;
+    const order = this.store.order;
+    const tempOrder = order?.getTempOrder();
+    if (!tempOrder) throw new Error('当前订单不存在，无法生成订单编号');
+    if (tempOrder.shop_order_number && tempOrder.shop_full_order_number) return;
+    const biz = this.getBookingTicketBusinessCode();
+    if (!biz) throw new Error('当前订单缺少业务类型，无法生成订单编号');
+    const idGenerator = this.appPlugin?.getApp?.()?.getPlugin?.('idGenerator');
+    if (!tempOrder.shop_order_number && typeof idGenerator?.generateShopOrderNumber !== 'function' || !tempOrder.shop_full_order_number && typeof idGenerator?.generateReceiptId !== 'function') {
+      throw new Error('订单编号生成器不可用，请重启应用后重试');
+    }
+    try {
+      if (!tempOrder.shop_order_number) {
+        tempOrder.shop_order_number = await idGenerator.generateShopOrderNumber({
+          biz
+        });
+      }
+      if (!tempOrder.shop_full_order_number) {
+        tempOrder.shop_full_order_number = await idGenerator.generateReceiptId({
+          biz
+        });
+      }
+      if (order.getTempOrder() !== tempOrder) {
+        throw new Error('当前订单已切换，请重新发起支付');
+      }
+      if (!tempOrder.shop_order_number || !tempOrder.shop_full_order_number) {
+        throw new Error('订单编号生成失败，请重试');
+      }
+    } finally {
+      // 部分生成成功时也保留号码，后续只补仍然缺失的字段。
+      if (order.getTempOrder() === tempOrder) order.persistTempOrder();
+    }
+  }
+
   /**
    * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
    * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。

package/package.json

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