@pisell/pisellos 0.10.28 → 0.10.30

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

@@ -110,9 +110,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private loadQuotationForPriceQuery;
     private getPriceQueryProductId;
     /**
-   * Change Time / customer reprice 必须沿用商品列表的渠道口径。
-   * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
-   */
+     * Change Time / customer reprice 必须沿用商品列表的渠道口径。
+     * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
+     */
     private getPriceQueryChannel;
     /**
      * /product/query 的智能定价评估只读取 strategy_context；

package/lib/solution/BaseSales/index.js

@@ -678,9 +678,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
 
   /**
-  * Change Time / customer reprice 必须沿用商品列表的渠道口径。
-  * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
-  */
+   * Change Time / customer reprice 必须沿用商品列表的渠道口径。
+   * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
+   */
   getPriceQueryChannel(channel) {
     const strategyContext = this.otherParams?.strategy_context && typeof this.otherParams.strategy_context === 'object' ? this.otherParams.strategy_context : {};
     const value = channel ?? strategyContext.channel ?? this.otherParams?.channel ?? this.otherParams?.platform;
@@ -1588,6 +1588,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
       // this.store.resource = null;
       const tempOrder = this.store.order.restoreOrder();
+      // 先补齐店铺级订单字段，再通知监听方，避免发布带空税区/币种的中间快照。
+      const appDataChanged = this.syncAppDataToTempOrder(tempOrder);
       this.currentSalesDetail = null;
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
@@ -1600,7 +1602,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       await this.effectsEmit('onTempOrderReplaced', {
         tempOrder
       });
-      if (this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled()) {
+      if (appDataChanged && this.isTempOrderPersistEnabled()) {
         this.store.order.persistTempOrder();
         await this.store.order.saveDraft();
       }
@@ -3529,13 +3531,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return Array.isArray(configs) && configs.length > 0;
   }
   shouldRecalculateProductBookingPricesForContextChange(params) {
-    const scopeInfo = this.getQuotationCustomerScopeInfo();
-    const scopedCustomerIds = new Set(scopeInfo.customerIds.map(id => String(id)));
     const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
     const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
     if (this.isCustomerUserPriceQuery() || this.hasSmartPricingStrategies()) {
       return previousCustomerId !== nextCustomerId;
     }
+    const scopeInfo = this.getQuotationCustomerScopeInfo();
+    const scopedCustomerIds = new Set(scopeInfo.customerIds.map(id => String(id)));
     const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
     const nextInScope = nextCustomerId ? scopedCustomerIds.has(nextCustomerId) : false;
     let shouldRecalculate = false;
@@ -3557,14 +3559,6 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const currentOrderCustomerId = this.getCurrentOrderCustomerId();
     const resolvedChannels = paramsList.map(params => this.getPriceQueryChannel(params.channel));
     const authoritativeProducts = paramsList.map(() => null);
-    const preparedCustomerKeys = new Set();
-    await Promise.all(paramsList.map(async params => {
-      const customerId = params.customer_id ?? currentOrderCustomerId;
-      const customerKey = this.normalizePriceContextCustomerId(customerId) || '';
-      if (preparedCustomerKeys.has(customerKey)) return;
-      preparedCustomerKeys.add(customerKey);
-      await this.prepareProductPriceQueryContext(customerId);
-    }));
     const groups = new Map();
     paramsList.forEach((params, index) => {
       const schedule = this.getPriceQuerySchedule(params);
@@ -3581,6 +3575,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       groups.set(groupKey, group);
     });
     await Promise.all(Array.from(groups.values()).map(async group => {
+      await this.prepareProductPriceQueryContext(group.customerId);
       const priceQueries = group.indices.map(index => paramsList[index]);
       const resolvedProducts = await this.resolveProductsForPriceQuery({
         priceQueries,

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -14,6 +14,7 @@
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 import type { BaseSalesOrderProduct } from '../types';
+import type { OrderMetaList } from '../../../modules/Order/types';
 export interface ISalesDetailHeader {
     order_id: number | string | null;
     order_number?: string;
@@ -47,6 +48,7 @@ export interface ISalesDetailHeader {
     schedule_date?: string;
     created_at?: string;
     updated_at?: string | number;
+    order_meta_list?: OrderMetaList;
     metadata?: Record<string, any> | null;
     total_amount?: string | number;
     [key: string]: any;

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

@@ -22,7 +22,7 @@ var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollec
  */
 
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
-const HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
+const HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'order_meta_list', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
   const header = {
     order_id: raw?.order_id ?? null

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

@@ -229,9 +229,10 @@ function transformBaseProductToOrderProduct(params) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
   // 从源头补充商品多语言标题
+  const productTitleI18n = sourceProduct?.title_i18n || {};
   const productTitle = {
-    ...(sourceProduct?.title_i18n || {}),
-    original: sourceProduct?.original_title || sourceProduct?.title || ''
+    ...productTitleI18n,
+    original: productTitleI18n.original || sourceProduct?.original_title || sourceProduct?.title || ''
   };
   return {
     product_id: productId,

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 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -105,6 +105,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/lib/solution/Sales/index.js

@@ -507,6 +507,53 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  sortUnpaidBookings(bookings, currentBookings) {
+    const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
+    return [...bookings].sort((left, right) => {
+      const leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+      const rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+      if (leftIndex !== undefined || rightIndex !== undefined) {
+        if (leftIndex === undefined) return 1;
+        if (rightIndex === undefined) return -1;
+        return leftIndex - rightIndex;
+      }
+      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
+      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
+      return rightStartAt - leftStartAt;
+    });
+  }
+
+  /**
+   * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+   * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+   */
+  buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+    const legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+      includeAllFuture: true
+    });
+    const allBookings = this.sortMatchedBookings(unpaidBookingList.map(booking => {
+      const normalized = this.normalizeMatchedBooking(current, deviceCurrent, booking, {
+        includeCompleted: true
+      });
+      if (normalized) return normalized;
+      const appointmentStatus = this.getBookingAppointmentStatus(booking);
+      const status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+      return {
+        ...booking,
+        status,
+        isTimeout: false,
+        timeoutTime: undefined,
+        progressPercent: undefined,
+        lateTime: undefined,
+        reserved_status: undefined,
+        remainingReserveTime: undefined
+      };
+    }));
+    const legacyOrderIds = new Set(legacyPrioritizedBookings.map(booking => String(booking.order.order_id)));
+    return this.sortUnpaidBookings([...legacyPrioritizedBookings, ...allBookings.filter(booking => !legacyOrderIds.has(String(booking.order.order_id)))], currentBookings);
+  }
+
   /**
    * 资源下 bookings 的返回裁剪策略：
    * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -846,9 +893,7 @@ class SalesImpl extends _BaseModule.BaseModule {
         remainingReserveTime: undefined
       };
     });
-    const unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-      includeAllFuture: true
-    });
+    const unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
     const orderCount = this.countBookingOrders(statsBookingList);
     const bookingCount = statsBookingList.length;
     const compeleteBookingCount = this.countCompletedBookings(statsBookingList);

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

@@ -123,8 +123,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/lib/solution/UnifiedBookingSales/index.js

@@ -1017,6 +1017,7 @@ const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cu
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
 'missing_resource']);
+const POS_NO_RESOURCE_ID = 0;
 function matchesForcedSelectionGroup(selection, group) {
   const hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
   const hasFormId = selection.formId !== undefined && selection.formId !== null;
@@ -1097,6 +1098,19 @@ function buildPosForcedAvailabilityAssignments(params) {
       return;
     }
     selectedResourceIds.forEach(resourceId => {
+      if (sameAvailabilityId(resourceId, POS_NO_RESOURCE_ID)) {
+        assignments.push({
+          productId: product.id,
+          resourceId: POS_NO_RESOURCE_ID,
+          formId: group.formId ?? selection.formId,
+          startAt: candidate.bookingStartAt || candidate.startAt,
+          endAt: candidate.bookingEndAt || candidate.endAt,
+          capacityRequired: Math.max(1, partySize),
+          scheduleId: candidate.primaryScheduleRef?.scheduleId,
+          timeSlotId: candidate.primaryScheduleRef?.timeSlotId
+        });
+        return;
+      }
       const resource = resources.find(item => sameAvailabilityId(item.id, resourceId));
       const belongsToGroup = Boolean(resource && !(group.formId !== undefined && resource.formId !== undefined && !sameAvailabilityId(group.formId, resource.formId)) && !(group.resourceIds?.length && !group.resourceIds.some(id => sameAvailabilityId(id, resourceId))));
       if (!resource || !belongsToGroup) {
@@ -1508,12 +1522,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
 
   /**
-   * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-   * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+   * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+   * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
    */
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
-    return typeof configured === 'boolean' ? configured : false;
+    if (configured === true) return true;
+    const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
+    return platform !== 'h5' && platform !== 'kiosk';
   }
 
   /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/package.json

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