@pisell/pisellos 2.2.170 → 2.2.171

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,10 +12,6 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -89,16 +89,6 @@ export function buildPriceBreakdown(params) {
   }
   return entries;
 }
-export function buildVenueResourceMetadata(params) {
-  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
-  var mapping = params.mapping,
-    rawResource = params.rawResource;
-  return {
-    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
-    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
-    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
-  };
-}
 export function buildVenueBookingEntry(params) {
   var _rawResource$form_id;
   var group = params.group,

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

@@ -24,12 +24,6 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
-    /**
-     * 查询客户列表但不写入 customerList / pagination 状态。
-     *
-     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-     */
-    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -75,7 +75,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number" && options.initialState.pageSize > 1) {
+    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number") {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = import_constants.DEFAULT_PAGE_SIZE;
@@ -152,20 +152,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.error
     );
   }
-  /**
-   * 查询客户列表但不写入 customerList / pagination 状态。
-   *
-   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-   */
-  async queryCustomerList(params = {}) {
-    const { customerList, total, page, pageSize } = await this.fetchCustomerListData(params);
-    return {
-      list: customerList,
-      total,
-      page,
-      pageSize
-    };
-  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -183,6 +169,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.total = total;
       this.store.hasMore = page * pageSize < total;
       this.store.customerList = (0, import_lodash_es.cloneDeep)(customerList);
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -202,10 +192,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loading = false;
       this.storeChange();
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
     }
   }
   /**
@@ -366,13 +352,12 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
-      const loadMoreParams = {
+      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData({
         skip: nextPage,
         num: this.store.pageSize,
         ...this.store.searchParams
         // 使用存储的搜索条件
-      };
-      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData(loadMoreParams);
+      });
       const updatedCustomerList = [...this.store.customerList, ...(0, import_lodash_es.cloneDeep)(newCustomers)];
       this.store.customerList = updatedCustomerList;
       this.store.currentPage = page;
@@ -387,6 +372,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
           hasMore: this.store.hasMore
         }
       );
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -407,10 +396,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loadingMore = false;
       this.storeChange();
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
     }
   }
   /**

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

@@ -110,8 +110,6 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
-    /** 查询客户列表但不更新列表分页状态 */
-    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -28,9 +28,11 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;
-    }): Promise<Discount[]>;
+    }): Promise<DiscountWithReason>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
+    filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
+    private checkUsageCreditsLimitWithFailKey;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/lib/modules/Discount/index.js

@@ -97,12 +97,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
-    const rawDiscountList = [
-      ...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [],
-      ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []
-    ];
     const goodPassList = this.filterEnabledDiscountList(
-      rawDiscountList
+      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
     return goodPassList;
   }
@@ -112,16 +108,17 @@ 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,
       ...orderId ? { order_behavior_count_order_id: orderId } : {},
+      unified_status_info_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
-    const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
-    return resultDiscountList;
+    const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
+    return resultDiscountWithReason;
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
@@ -167,6 +164,64 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     return true;
   }
+  // 过滤启用且可用的优惠券，并返回校验失败原因
+  filterEnabledDiscountListWithReason(discountList) {
+    let lists = discountList.filter((discount) => discount.limit_status === "enable").filter((discount) => {
+      const remaining = new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
+      return remaining;
+    }).map((discount) => {
+      const limitFailKey = this.checkUsageCreditsLimitWithFailKey(discount);
+      return {
+        ...discount,
+        usageLimitFailKey: limitFailKey
+      };
+    });
+    const availableLists = lists.filter((item) => !item.usageLimitFailKey && item.unified_available_status !== 0);
+    const currentFailDiscount = lists.find((item) => item.usageLimitFailKey);
+    return {
+      discountList: availableLists,
+      unavailableReasonKey: currentFailDiscount == null ? void 0 : currentFailDiscount.usageLimitFailKey
+    };
+  }
+  // 检查使用次数限制，并返回校验失败原因
+  checkUsageCreditsLimitWithFailKey(discount) {
+    if (!discount.extension_data || discount.extension_data.length === 0) {
+      return null;
+    }
+    const usageCreditsData = discount.extension_data.find(
+      (data) => data.field_key === "usage_credits"
+    );
+    if (!usageCreditsData) {
+      return null;
+    }
+    const value = usageCreditsData.value;
+    if (value.total_credits && value.total_credits > 0) {
+      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
+        return "total_credits";
+      }
+    }
+    if (value.per_user_limit && value.per_user_limit > 0) {
+      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
+        return "per_user_limit";
+      }
+    }
+    if (value.max_per_day && value.max_per_day > 0) {
+      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
+        return "max_per_day";
+      }
+    }
+    if (value.max_per_week && value.max_per_week > 0) {
+      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
+        return "max_per_week";
+      }
+    }
+    if (value.max_per_month && value.max_per_month > 0) {
+      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
+        return "max_per_month";
+      }
+    }
+    return null;
+  }
   // 根据productIds去重
   uniqueByProductId(discountList) {
     return (0, import_utils.uniqueById)(discountList, "product_id");

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

@@ -63,6 +63,11 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
+export type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
+export interface DiscountWithReason {
+    discountList: Discount[];
+    unavailableReasonKey: DiscountFilterRejectKey | null;
+}
 interface ExtensionData {
     id: number;
     shop_id: number;
@@ -135,7 +140,6 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
-    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;
@@ -148,6 +152,8 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    usageLimitFailKey?: string | null;
+    unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -1,11 +1,12 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateProductInOrderParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderScanCodeResult, ReplaceTempOrderOptions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
+import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -42,12 +43,16 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private createDefaultRulesHooks;
     loadDiscountConfig(params: {
         customerId: number;
-        action?: 'create' | 'edit';
-        orderId?: number;
-        apply?: boolean;
-    }): Promise<Discount[]>;
+        action?: 'create';
+    }): Promise<void>;
     getDiscountList(): Discount[];
-    scanCode(code: string, customerId?: number): Promise<OrderScanCodeResult>;
+    scanCode(code: string, customerId?: number): Promise<{
+        isAvailable: boolean;
+        discountList: Discount[];
+        type: 'server' | 'clientCalc';
+        unavailableReason?: UnavailableReason;
+        unavailableReasonKey?: string | null;
+    }>;
     applyDiscount(): void;
     initTempOrder(params: {
         cacheId?: string;
@@ -66,7 +71,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getLocalOrderByOrderNumber(orderNumber: string): Promise<Record<string, any> | null>;
     getLocalOrderByExternalSaleNumber(externalSaleNumber: string): Promise<Record<string, any> | null>;
     saveDraft(): Promise<void>;
-    private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
     private calculatePaymentTotal;
@@ -76,7 +80,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;
     getTempOrder(): OrderTempOrder | null;
-    replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
     getOrderIdentity(): OrderIdentitySnapshot | null;
     getOrderSyncState(): OrderSyncState;
     getOrderAmountSnapshot(): OrderAmountSnapshot | null;
@@ -87,27 +90,20 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
-    private getBookingUniqueIdentificationNumber;
-    private findBookingIndexByUniqueIdentificationNumber;
-    private removeLinkedBookingsForProduct;
     private getSalesSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
     }): Promise<OrderSummary | null>;
     getOrderSummary(): Promise<OrderSummary>;
     updateTempOrderNote(note: string): string;
-    updateTempOrderNote(note: string, sync: true): Promise<string>;
-    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
-    syncTempOrderNoteToRemote(orderId: number | string, note: string): Promise<string>;
     getTempOrderNote(): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
-    private buildTempOrderCustomer;
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
     updateTempOrderCustomer(customer: UpdateTempOrderCustomerInput): OrderSnapshot['customer'];
@@ -152,15 +148,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
-    updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
-    updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
-    updateOrderBooking(params: UpdateOrderBookingParams): any[];
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;
     removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
-    /**
-     * 仅清空购物车行（products / bookings / discount_list），不重置整单。
-     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
-     */
-    clearOrderCartLines(): Promise<OrderTempOrder>;
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -232,9 +221,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
-    private normalizeTempOrderForRuntime;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
 }
-export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { UpdateProductInOrderParams } from './types';