@pisell/pisellos 2.1.151 → 2.1.152

package/lib/solution/ShopDiscount/index.js

@@ -57,7 +57,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: void 0,
-      orderTotalAmount: 0
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -195,9 +195,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
-  setOriginTotalAmount(amount) {
-    this.store.orderTotalAmount = amount;
-  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -205,6 +202,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     var _a;
@@ -217,7 +217,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       {
         productList,
         discountList: this.getDiscountList(),
-        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
         isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
@@ -282,7 +281,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async scanCode(code, customerId) {
     var _a, _b, _c;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+      const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId, orderId: this.store.orderId })) || { discountList: [], unavailableReasonKey: null };
+      const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
@@ -298,7 +298,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           type: "server",
           isAvailable: false,
           productList: this.store.productList || [],
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          unavailableReasonKey
         };
       }
       const withScanList = resultDiscountList.map((item) => {
@@ -325,7 +326,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
-        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
         isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
@@ -394,7 +394,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
+          var _a3, _b, _c, _d, _e;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -403,12 +403,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
             if (index !== -1) {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
-                metadata: {
-                  ...discount.metadata || {},
-                  num: (((_b = (_a3 = editModeDiscountList == null ? void 0 : editModeDiscountList[index]) == null ? void 0 : _a3.metadata) == null ? void 0 : _b.num) || 1) + (((_c = discount.metadata) == null ? void 0 : _c.num) || 1)
-                },
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -416,20 +412,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
-                metadata: {
-                  ...discount.metadata || {},
-                  num: ((_e = discount.metadata) == null ? void 0 : _e.num) || 1
-                },
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.product_discount_difference) || 0).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
                 isAvailable: true,
-                id: ((_g = discount.discount) == null ? void 0 : _g.resource_id) || discount.id,
-                format_title: ((_h = discount.discount) == null ? void 0 : _h.title) || discount.format_title,
+                id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
+                format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_i = discount.discount) == null ? void 0 : _i.product_id) || discount.product_id
+                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
               });
             }
           }
@@ -517,14 +509,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
-        action: "create",
+        action: orderId ? "edit" : "create",
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
@@ -546,7 +540,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         `${this.name}:onLoadDiscountList`,
-        newDiscountList
+        filteredDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

package/lib/solution/ShopDiscount/types.d.ts

@@ -23,7 +23,6 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;
@@ -36,6 +35,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/solution/ShopDiscount/utils.js

@@ -56,18 +56,14 @@ var isAllNormalProduct = (items) => {
 };
 var getDiscountAmount = (discount, total, price) => {
   var _a;
-  let discountedPrice = 0;
   if (discount.tag === "good_pass") {
-    discountedPrice = new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
-  } else {
-    const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
-    if (isFixedAmount) {
-      discountedPrice = Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
-    } else {
-      discountedPrice = new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
-    }
+    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
+  }
+  const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
+  if (isFixedAmount) {
+    return Math.max(new import_decimal.default(price).minus(new import_decimal.default((discount.amount ?? discount.par_value) || 0)).toNumber(), 0);
   }
-  return discountedPrice;
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
 };
 var getDiscountListAmountTotal = (discount) => {
   return discount.reduce((acc, cur) => {

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

@@ -0,0 +1,200 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
+import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
+import type { ProductData } from '../../modules/Product/types';
+import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { StrategyConfig } from '../../model/strategy/type';
+export * from './types';
+interface VenueBookingItemRuleRuntimeConfig {
+    strategyConfigs?: StrategyConfig[];
+    pax?: Partial<PaxInfo>;
+    historicalItems?: CartItemSummary[];
+    serviceType?: string;
+    submissionIndex?: number;
+    custom?: Record<string, any>;
+}
+export declare class VenueBookingImpl extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    private initializeOptions;
+    private store;
+    private otherParams;
+    private cacheId;
+    private window;
+    private request;
+    private baseSlotConfig;
+    private itemRuleEvaluator;
+    private itemRuleConfigs;
+    private itemRuleConfigsPromise;
+    private itemRulePrefillApplied;
+    private itemRuleRuntimeConfig;
+    private resourceProductMap;
+    private loginEffectDisposers;
+    private customerLoginRefreshInFlight;
+    private customerLoginRefreshIdInFlight;
+    private loadAllProductsInFlight;
+    private productsLoaded;
+    private loadOpenDataConfigInFlight;
+    private static readonly OPEN_DATA_CACHE_TTL;
+    private getLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
+    private serializeError;
+    private addVenueBookingLog;
+    private logMethodStart;
+    private logMethodSuccess;
+    private logMethodError;
+    addLog(params: VenueBookingAddLogParams): Promise<void>;
+    constructor(name?: string, version?: string);
+    private normalizeCustomerId;
+    private resolveCustomerIdFromLoginPayload;
+    private clearLoginEffectListeners;
+    private registerLoginEffect;
+    private registerCustomerLoginListeners;
+    private refreshOrderMarketingAfterLogin;
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    destroy(): Promise<void>;
+    retryInit(): Promise<void>;
+    refresh(): Promise<void>;
+    getStatus(): import("./types").VenueBookingStatus;
+    getEntryContext(): import("./types").VenueBookingEntryContext | null;
+    getItemRuleQuantityLimits(): QuantityLimitResult[];
+    getCartValidationPassed(): boolean | null;
+    getCartValidation(): {
+        passed: boolean | null;
+        failures: QuantityCheckResult[];
+    };
+    loadAllProducts(): Promise<{
+        venueProducts: ProductData[];
+        addonProducts: ProductData[];
+    }>;
+    private _doLoadAllProducts;
+    loadVenueProducts(): Promise<ProductData[]>;
+    loadAddonProducts(): Promise<ProductData[]>;
+    getVenueProducts(): ProductData[];
+    getAddonProductsList(): ProductData[];
+    loadQuotations(params?: {
+        channel?: string;
+    }): Promise<void>;
+    fetchResourceAvailability(params: {
+        startDate: string;
+        endDate: string;
+    }): Promise<void>;
+    private getOperatingHoursScheduleIds;
+    private resolveSlotConfigForDate;
+    private syncOperatingHoursToSlotConfig;
+    getDateRangeSummary(params: {
+        startDate: string;
+        endDate: string;
+    }): VenueDateSummaryItem[];
+    getTimeSlotGrid(date: string): VenueTimeSlotGrid;
+    /**
+     * 切换单个时段的选中状态（选中/取消）。
+     * 内部自动处理连续时段的合并与拆分，订单是唯一真相源。
+     *
+     * slot.productId 指定当前操作针对的是该 resourceId 下的哪一个商品。
+     * 同一资源下不同 productId 之间互相隔离，不会相互合并。
+     */
+    toggleSlot(slot: VenueSlotSelection): Promise<ScanOrderOrderProduct[]>;
+    /**
+     * 获取某资源当前选中的所有独立时段（从订单中解析）。
+     * 不传 productId 时返回该资源下所有商品的选中时段；传了则精确匹配。
+     */
+    getSelectedSlotsForResource(resourceId: number | string, productId?: number): VenueSlotSelection[];
+    /** getSelectedSlotsForResource 的 (resourceId, productId) 精确版，内部使用。 */
+    private getSelectedSlotsForResourceProduct;
+    /**
+     * 判断某个时段是否已选中。
+     * 不传 productId 时：只要该资源下任一商品在 startTime 被选中即返回 true；传了则精确匹配。
+     */
+    isSlotSelected(resourceId: number | string, startTime: string, productId?: number): boolean;
+    /**
+     * 判断指定 (resourceId, productId, startTime) 格子是否应因其它已选项而被禁用。
+     * 规则：
+     * 1) 同一 resourceId 下若已选了另一个 productId 的同 startTime → 禁用
+     * 2) 当前 resource 是组合资源：若其任一 child resource 在 startTime 被选中 → 禁用
+     * 3) 当前 resource 是某些组合资源的 child：若该组合资源在 startTime 被选中 → 禁用
+     * 4) 两个组合资源的 child 集合有交集，且对方在该 startTime 被选中 → 禁用
+     */
+    isSlotDisabledBySelection(params: {
+        resourceId: number | string;
+        productId: number;
+        startTime: string;
+    }): boolean;
+    /**
+     * 获取所有已选时段（按资源分组）。每个 slot 上带 productId，便于 UI 做 per-product 判定。
+     */
+    getAllSelectedSlots(): Map<number | string, VenueSlotSelection[]>;
+    /**
+     * 对指定 (resourceId, productId) 的订单商品进行 reconcile：
+     * 清除旧商品 → 合并连续时段 → 重新写入。
+     * 同一场地下不同商品互不干扰，各自单独 reconcile。
+     */
+    private reconcileOrderForResourceProduct;
+    /** 给定一个父 rawResource，返回其 combined_resource.resource_ids 对应的子 rawResource 列表。 */
+    private getCombinedChildRawResources;
+    setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
+    getSlotConfig(): VenueBookingSlotConfig;
+    loadSchedules(): Promise<void>;
+    private injectScheduleResolverToQuotation;
+    getScheduleListByIds(ids: number[]): import("../../modules/Schedule/types").ScheduleItem[];
+    getTempOrder(): import("./types").ScanOrderTempOrder | null;
+    updateTempOrderNote(note: string): string;
+    updateTempOrderContactsInfo(contactsInfo: any[]): any[];
+    private ensureTempOrder;
+    onCustomerLogin(params: {
+        customerId: number;
+    }): Promise<void>;
+    private recalculateOrderPricesFromQuotation;
+    scanCode(code: string, customerId?: number): Promise<{
+        isAvailable: boolean;
+        discountList: import("../../modules/Discount").Discount[];
+        type: "server" | "clientCalc";
+        unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;
+        unavailableReasonKey?: string | null | undefined;
+    }>;
+    /** 获取当前折扣列表（包装 order.getDiscountList） */
+    getDiscountList(): import("../../modules/Discount").Discount[];
+    /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<import("../../modules/Discount").Discount[]>;
+    addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    getOrderProducts(): ScanOrderOrderProduct[];
+    getSummary(): Promise<import("./types").ScanOrderSummary>;
+    submitOrder<T = any>(): Promise<T>;
+    addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
+    removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
+    getProductList(): Promise<ProductData[]>;
+    private loadOpenDataConfig;
+    private loadRuntimeConfigs;
+    private fetchItemRuleConfigsByModelIds;
+    private buildPrefillProductSourceMap;
+    private getItemRuleRuntimeConfig;
+    private ensureItemRuleConfigsLoaded;
+    private refreshItemRuleQuantityLimits;
+    private applyPrefillByItemRule;
+    applyItemRulePrefill(): Promise<void>;
+    private evaluateCartValidationByItemRule;
+    private validateBeforeSubmitByItemRule;
+    private refreshCartValidationPassed;
+    setItemRuleRuntimeConfig(config?: VenueBookingItemRuleRuntimeConfig): Promise<void>;
+    getOtherParams(): Record<string, any>;
+    private static readonly UI_STATE_KEY_PREFIX;
+    private getUIStateBucketKey;
+    private readUIStateBucket;
+    private writeUIStateBucket;
+    setUIState(key: string, value: any): void;
+    getUIState<T = any>(key: string): T | undefined;
+    deleteUIState(key: string): void;
+    checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+}