@pisell/pisellos 0.0.544 → 0.0.547

package/lib/modules/Discount/index.js

@@ -108,11 +108,12 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       code,
       translate_flag: 1,
       tags: ["good_pass", "product_discount_card"],
-      available: 1,
+      // available: 1,
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1,
+      unified_status_info_flag: 1,
       ...orderId ? { order_behavior_count_order_id: orderId } : {},
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
@@ -184,7 +185,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
         usageLimitFailKey: limitFailKey
       };
     });
-    const availableLists = lists.filter((item) => !item.usageLimitFailKey);
+    const availableLists = lists.filter((item) => !item.usageLimitFailKey && item.unified_available_status !== 0);
     const currentFailDiscount = lists.find((item) => item.usageLimitFailKey);
     return {
       discountList: availableLists,

package/lib/modules/Discount/types.d.ts

@@ -155,6 +155,7 @@ export interface Discount {
     start_time?: string;
     discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
+    unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -83,7 +83,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

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

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult, ScanOrderTempOrder } from './types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -69,7 +69,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    getTempOrder(): import("./types").ScanOrderTempOrder | null;
+    getTempOrder(): ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
         service_type: 'dine_in';
@@ -77,8 +77,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     setPickupRef(buzzer: string): string;
     private ensureTempOrder;
-    addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
-    restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    addNewOrder(): Promise<ScanOrderTempOrder>;
+    restoreOrder(): Promise<ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     getDiscountList(): Discount[];
@@ -92,6 +92,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
@@ -118,7 +119,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private normalizeResourceState;
     private resolveResourceSelectType;
     private fetchResourceOccupyDetailByResourceId;
-    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';

package/lib/solution/ScanOrder/index.js

@@ -815,6 +815,49 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       combined_resource: isCombined ? combined : null
     };
   }
+  async prepareRetailAvailability(params) {
+    var _a, _b;
+    const { tempOrder, hasOrderId, resourceId, reason } = params;
+    this.enabledReservationRuleProducts = [];
+    tempOrder.bookings = [];
+    tempOrder.order_id = null;
+    delete tempOrder.relation_id;
+    delete tempOrder.table_form_id;
+    delete tempOrder.resource_id;
+    delete tempOrder.table_number;
+    tempOrder.metadata = { ...tempOrder.metadata || {} };
+    delete tempOrder.metadata.table_occupancy_duration;
+    const resourceState = {
+      mode: "idle",
+      deskmate_valid: false,
+      allowSnack: false,
+      deskmateValid: false,
+      isExclusive: false,
+      isFull: false,
+      raw: null
+    };
+    this.store.resource = resourceState;
+    (_a = this.store.order) == null ? void 0 : _a.persistTempOrder();
+    await this.addNewOrder();
+    await this.setItemRuleRuntimeConfig({
+      serviceType: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+      submissionIndex: hasOrderId ? 1 : 0,
+      historicalItems: []
+    });
+    const availabilityInfo = {
+      mode: "idle",
+      deskmate_valid: false
+    };
+    this.logMethodSuccess("checkResourceAvailable", {
+      resourceId,
+      mode: availabilityInfo.mode,
+      retailMode: true,
+      retailReason: reason,
+      persistedRelationId: tempOrder.relation_id,
+      persistedResourceId: tempOrder.resource_id
+    });
+    return availabilityInfo;
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -837,7 +880,17 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     };
     return (payload, { bookingUuid, tempOrder }) => {
       var _a, _b;
-      const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
+      const resourceId = String(tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId) ?? "").trim();
+      const hasReservationBookingContext = Boolean(
+        ruleProduct && resourceState && resourceId && (tempOrder.relation_id || resourceState.relationId) && (tempOrder.table_form_id || resourceState.tableFormId)
+      );
+      if (!hasReservationBookingContext) {
+        return {
+          ...payload,
+          bookings: [],
+          products: [...payload.products || []]
+        };
+      }
       const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
       const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
       const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
@@ -1499,10 +1552,11 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 检测当前链接是否可用
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
-  async checkResourceAvailable(resourceId, hasOrderId) {
+  async checkResourceAvailable(resourceId, hasOrderId = false) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    const normalizedResourceId = String(resourceId ?? "").trim();
     this.logMethodStart("checkResourceAvailable", {
-      resourceId
+      resourceId: normalizedResourceId
     });
     try {
       const businessCode = String(((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? "").trim();
@@ -1556,62 +1610,66 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       const reservationLinkIds = (0, import_utils.collectLinkProductIdsFromReservationRules)(
         dineInConfig["fulfillment.enabled_resource_rules"]
       );
+      if (!normalizedResourceId || reservationLinkIds.length === 0) {
+        return await this.prepareRetailAvailability({
+          tempOrder,
+          hasOrderId,
+          resourceId: normalizedResourceId,
+          reason: !normalizedResourceId ? "missing_resource_id" : "missing_enabled_resource_rules"
+        });
+      }
       let pendingRequestEntryPax;
       let pendingRequestPaxMin;
       let pendingRequestPaxMax;
-      if (reservationLinkIds.length === 0) {
-        this.enabledReservationRuleProducts = [];
+      tempOrder.metadata = { ...tempOrder.metadata || {} };
+      delete tempOrder.metadata.table_occupancy_duration;
+      const reservationProductList = new import_ProductList.ProductList(
+        `${this.name}_reservationEnabledRules`,
+        this.defaultVersion
+      );
+      await reservationProductList.initialize(this.core, {
+        store: { list: [], selectProducts: [] },
+        otherParams: {
+          ...this.otherParams,
+          fatherModule: this.name,
+          openCache: Boolean(this.cacheId),
+          cacheId: this.cacheId
+        }
+      });
+      const scheduleDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+      const scheduleDatetime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+      const loaded = await reservationProductList.loadProducts({
+        product_ids: reservationLinkIds,
+        schedule_date: scheduleDate,
+        schedule_datetime: 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 {
-        tempOrder.metadata = { ...tempOrder.metadata || {} };
-        delete tempOrder.metadata.table_occupancy_duration;
-        const reservationProductList = new import_ProductList.ProductList(
-          `${this.name}_reservationEnabledRules`,
-          this.defaultVersion
-        );
-        await reservationProductList.initialize(this.core, {
-          store: { list: [], selectProducts: [] },
-          otherParams: {
-            ...this.otherParams,
-            fatherModule: this.name,
-            openCache: Boolean(this.cacheId),
-            cacheId: this.cacheId
-          }
-        });
-        const scheduleDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
-        const scheduleDatetime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
-        const loaded = await reservationProductList.loadProducts({
-          product_ids: reservationLinkIds,
-          schedule_date: scheduleDate,
-          schedule_datetime: scheduleDatetime,
+        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 error = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
-          this.logMethodError("loadReservationRuleProducts", error, {
-            resourceId,
-            reservationLinkIds,
-            scheduleDate,
-            scheduleDatetime,
-            cacheId: this.cacheId
-          });
-        }
       }
-      const occupyDetail = await this.fetchResourceOccupyDetailByResourceId(resourceId);
+      const occupyDetail = await this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
       const resourceSelectType = this.resolveResourceSelectType(
         (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id)
       );
@@ -1643,9 +1701,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         ...this.store.resource.requestPaxMin !== void 0 ? { requestPaxMin: this.store.resource.requestPaxMin } : {},
         ...this.store.resource.requestPaxMax !== void 0 ? { requestPaxMax: this.store.resource.requestPaxMax } : {}
       };
-      tempOrder.relation_id = resourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
+      tempOrder.relation_id = normalizedResourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
-      tempOrder.resource_id = resourceId;
+      tempOrder.resource_id = normalizedResourceId;
       (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
@@ -1685,7 +1743,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         availabilityInfo.closed_behavior = closedBehaviorValue;
       }
       this.logMethodSuccess("checkResourceAvailable", {
-        resourceId,
+        resourceId: normalizedResourceId,
         mode: availabilityInfo.mode,
         orderId: availabilityInfo.order_id,
         relationId: availabilityInfo.relation_id,
@@ -1700,7 +1758,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       return availabilityInfo;
     } catch (error) {
       this.logMethodError("checkResourceAvailable", error.message, {
-        resourceId
+        resourceId: normalizedResourceId
       });
       throw error;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.544",
+  "version": "0.0.547",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "changeset publish && npm run sync && git push",
+    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
     "example": "npx parcel-bundler examples/index.html",
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",