@pisell/pisellos 2.3.152 → 2.3.154

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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 时仍可回退到本地同步模式。
@@ -276,6 +278,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private assertAvailabilityCommitWriteCAS;
     private findProductLineByUid;
     private findLinkedBooking;
+    removeBookingProductsOutsideStartDate(startDate: unknown): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /** Revalidates against the latest landed occupancy cache, then mutates exactly one product line. */
     commitAvailabilitySelection(contextId: string, params: ContextualCommitAvailabilitySelectionParams): Promise<UnifiedBookingSalesCommitAvailabilitySelectionResult>;
 }

package/lib/solution/UnifiedBookingSales/index.js

@@ -32,6 +32,7 @@ exports.normalizeProductForAvailability = normalizeProductForAvailability;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodashEs = require("lodash-es");
 var _modules = require("../../modules");
+var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _utils = require("../../modules/BookingContext/utils");
 var _cacheItemToBookingInput = require("../../modules/BookingContext/utils/cacheItemToBookingInput");
 var _OpenData = require("../../modules/OpenData");
@@ -866,6 +867,20 @@ function collectAvailabilityResourceIds(products, explicitResourceIds = []) {
 function getProductLineUid(product) {
   return String(product?.metadata?.unique_identification_number ?? product?.unique_identification_number ?? '');
 }
+function getVisibleCalendarDate(value) {
+  if (typeof value !== 'string') return null;
+  const raw = value.trim();
+  try {
+    if (/^\d{4}-\d{2}-\d{2}$/.test(raw)) {
+      (0, _localClock.parseLocalDate)(raw);
+    } else {
+      (0, _localClock.parseLocalDateTime)(raw);
+    }
+    return raw.slice(0, 10);
+  } catch (_error) {
+    return null;
+  }
+}
 function buildAvailabilityLineIdentity(product) {
   return {
     product_id: product.product_id,
@@ -1676,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 时仍可回退到本地同步模式。
@@ -3351,6 +3402,24 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const bookingUid = String(product.booking_uid ?? product.metadata?.booking_uid ?? '');
     return (this.getTempOrder()?.bookings || []).find(booking => bookingUid && getBookingUid(booking) === bookingUid || productUid && String(booking.product_uid ?? '') === productUid);
   }
+  async removeBookingProductsOutsideStartDate(startDate) {
+    const products = this.getTempOrder()?.products || [];
+    if (this.otherParams?.enforceSingleBookingStartDate !== true) {
+      return products;
+    }
+    const targetDate = getVisibleCalendarDate(startDate);
+    if (!targetDate) return products;
+    const identities = products.flatMap(product => {
+      if (!getProductLineUid(product) || product?.metadata?.product_add_schedule_time != null) {
+        return [];
+      }
+      const booking = this.findLinkedBooking(product);
+      if (!booking || (0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return [];
+      const bookingDate = getVisibleCalendarDate(booking.start_date);
+      return bookingDate && bookingDate !== targetDate ? [buildAvailabilityLineIdentity(product)] : [];
+    });
+    return identities.length ? this.removeProductsFromOrder(identities) : products;
+  }
 
   /** Revalidates against the latest landed occupancy cache, then mutates exactly one product line. */
   async commitAvailabilitySelection(contextId, params) {
@@ -3761,6 +3830,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
             allow_booking_discount_reapply: params.allowBookingDiscountReapply
           } : {})
         });
+        await this.removeBookingProductsOutsideStartDate(booking.start_date);
         productLineUid = params.productLineUid;
         bookingUid = existingBookingUid;
         productLineUids = [productLineUid];
@@ -3769,7 +3839,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         const beforeProductLineUids = new Set((this.getTempOrder()?.products || []).map(line => getProductLineUid(line)).filter(Boolean));
         const beforeBookingUids = new Set((this.getTempOrder()?.bookings || []).map(item => getBookingUid(item)).filter(Boolean));
         availabilityCommitGuard?.();
-        const products = await this.addProductToOrder(transformed, booking, params.salesNotes?.length || availabilityCommitGuard ? {
+        let products = await this.addProductToOrder(transformed, booking, params.salesNotes?.length || availabilityCommitGuard ? {
           ...(params.salesNotes?.length ? {
             salesNotes: params.salesNotes
           } : {}),
@@ -3778,6 +3848,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
             availabilityCommitTargetGuard
           } : {})
         } : undefined);
+        products = await this.removeBookingProductsOutsideStartDate(booking.start_date);
         guardedCommitPublished = hasCommitGuard;
         const addedLines = products.filter(line => sameAvailabilityId(line.product_id ?? line.id, refreshedCandidate.productId) && line.metadata?.availability_candidate_key === refreshedCandidate.key && !beforeProductLineUids.has(getProductLineUid(line)));
         productLineUids = addedLines.map(line => getProductLineUid(line)).filter(Boolean);

package/package.json

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