@pisell/pisellos 0.0.544 → 0.0.547

package/dist/modules/Discount/index.js

@@ -189,11 +189,12 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 code: 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
+                order_behavior_count_customer_id: customerId || 1,
+                unified_status_info_flag: 1
               }, orderId ? {
                 order_behavior_count_order_id: orderId
               } : {}), {}, {
@@ -330,7 +331,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
 
       // 可用的列表
       var availableLists = lists.filter(function (item) {
-        return !item.usageLimitFailKey;
+        return !item.usageLimitFailKey && item.unified_available_status !== 0;
       });
       // 不可用数据
       var currentFailDiscount = lists.find(function (item) {

package/dist/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/dist/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/dist/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/dist/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/dist/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';