@pisell/pisellos 2.1.174 → 2.1.176

package/lib/modules/Discount/index.js

@@ -36,8 +36,6 @@ var import_utils = require("../../solution/ShopDiscount/utils");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_decimal = __toESM(require("decimal.js"));
-var import_entitlementPass = require("./entitlementPass");
-var import_availability = require("./availability");
 var DiscountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -94,34 +92,23 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return this.store.originalDiscountList || [];
   }
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
       params
     );
-    if (!params.with_entitlement_pass) {
-      return this.filterEnabledDiscountList([
-        ...((_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) || []
-      ].filter((item) => !(0, import_entitlementPass.isEntitlementPass)(item)));
-    }
-    const entitlementPassList = ((_c = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _c.entitlement_pass_list) || [];
-    const ids = new Set(entitlementPassList.map((item) => String(item.id)));
-    const rawDiscountList = [
-      ...entitlementPassList,
-      ...(((_d = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _d.good_pass_list) || []).filter((item) => !ids.has(String(item.id))),
-      ...(((_e = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _e.discount_card_list) || []).filter((item) => !ids.has(String(item.id)))
-    ];
-    await this.setOriginalDiscountList(rawDiscountList);
-    const goodPassList = this.filterEnabledDiscountList(rawDiscountList);
+    const goodPassList = this.filterEnabledDiscountList(
+      [...((_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;
   }
-  async batchSearch(code, customerIdOrOptions) {
-    var _a, _b;
-    const { customerId, orderId, withEntitlementPass } = typeof customerIdOrOptions === "number" ? { customerId: customerIdOrOptions, orderId: void 0, withEntitlementPass: false } : customerIdOrOptions || {};
-    const params = {
+  async batchSearch(code, options) {
+    const { customerId, orderId } = options || {};
+    const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
+      tags: ["good_pass", "product_discount_card"],
+      // available: 1,
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
@@ -129,45 +116,9 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       ...orderId ? { order_behavior_count_order_id: orderId } : {},
       unified_status_info_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-    };
-    if (!withEntitlementPass) {
-      const result2 = await this.request.get(`/machinecode/batch-search`, {
-        ...params,
-        tags: ["good_pass", "product_discount_card"]
-      });
-      return this.filterEnabledDiscountListWithReason(((result2 == null ? void 0 : result2.data) || []).filter((item) => !(0, import_entitlementPass.isEntitlementPass)(item)));
-    }
-    const search = (query) => this.request.get(`/machinecode/batch-search`, query).then(
-      (value) => ({ status: "fulfilled", value }),
-      (reason) => ({ status: "rejected", reason })
-    );
-    const [legacy, entitlement] = await Promise.all([
-      search({
-        ...params,
-        tags: ["good_pass", "product_discount_card"]
-      }),
-      search({
-        ...params,
-        tags: ["entitlement_pass"],
-        with_franchisor_data: 1,
-        unified_status_info_flag: 1,
-        with: [...params.with, "franchiseeWalletPass:shop_id,source_shop_id,product_id,use"]
-      })
-    ]);
-    const entitlementList = (entitlement.status === "fulfilled" ? ((_a = entitlement.value) == null ? void 0 : _a.data) || [] : []).filter(import_entitlementPass.isEntitlementPass);
-    const legacyList = legacy.status === "fulfilled" ? ((_b = legacy.value) == null ? void 0 : _b.data) || [] : [];
-    const ids = new Set(entitlementList.map((item) => String(item.id)));
-    const result = this.filterEnabledDiscountListWithReason([
-      ...entitlementList,
-      ...legacyList.filter((item) => !(0, import_entitlementPass.isEntitlementPass)(item) && !ids.has(String(item.id)))
-    ]);
-    if (!result.discountList.length) {
-      if (legacy.status === "rejected")
-        throw legacy.reason;
-      if (entitlement.status === "rejected")
-        throw entitlement.reason;
-    }
-    return result;
+    });
+    const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
+    return resultDiscountWithReason;
   }
   async batchSearchByProductIds(productIds) {
     const result = await this.request.get(`/machinecode/batch-search`, {
@@ -180,7 +131,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => (0, import_entitlementPass.isEntitlementPass)(discount) ? !(0, import_availability.getDiscountLifecycleReason)(discount) : discount.limit_status === "enable" && 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) && this.checkUsageCreditsLimit(discount)
+      (discount) => discount.limit_status === "enable" && 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) && this.checkUsageCreditsLimit(discount)
     );
   }
   // 检查使用次数限制
@@ -224,8 +175,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   // 过滤启用且可用的优惠券，并返回校验失败原因
   filterEnabledDiscountListWithReason(discountList) {
-    const entitlementPasses = discountList.filter((item) => (0, import_entitlementPass.isEntitlementPass)(item) && !(0, import_availability.getDiscountLifecycleReason)(item));
-    let lists = discountList.filter((item) => !(0, import_entitlementPass.isEntitlementPass)(item)).filter((discount) => discount.limit_status === "enable").filter((discount) => {
+    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) => {
@@ -238,8 +188,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const availableLists = lists.filter((item) => !item.usageLimitFailKey && item.unified_available_status !== 0);
     const currentFailDiscount = lists.find((item) => item.usageLimitFailKey);
     return {
-      discountList: [...entitlementPasses.map((item) => ({ ...item, usageLimitFailKey: (0, import_availability.getDiscountUsageLimitFailKey)(item) })), ...availableLists],
-      unavailableReasonKey: (currentFailDiscount == null ? void 0 : currentFailDiscount.usageLimitFailKey) || discountList.filter(import_entitlementPass.isEntitlementPass).map(import_availability.getDiscountLifecycleReason).find(Boolean) || null
+      discountList: availableLists,
+      unavailableReasonKey: currentFailDiscount == null ? void 0 : currentFailDiscount.usageLimitFailKey
     };
   }
   // 检查使用次数限制，并返回校验失败原因

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

@@ -45,8 +45,6 @@ interface ApplicableProductDetails {
     num: number;
     metadata?: {
         product_discount_difference?: number;
-        num?: number;
-        custom_product_bundle_map_id?: string;
     };
     discount?: {
         fixed_amount?: number;
@@ -65,17 +63,10 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
-export type IncludedUses = {
-    type: 'limited';
-    value: number;
-} | {
-    type: 'unlimited';
-    value: null;
-};
 export type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
 export interface DiscountWithReason {
     discountList: Discount[];
-    unavailableReasonKey: DiscountFilterRejectKey | string | null;
+    unavailableReasonKey: DiscountFilterRejectKey | null;
 }
 interface ExtensionData {
     id: number;
@@ -102,39 +93,19 @@ export interface Discount {
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance?: string | number | null;
+    balance: string;
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
-        included_uses?: IncludedUses;
-        discount_calculation_mode?: 'item_level' | 'order_level';
-        holder?: {
+        discount_calculation_mode: 'item_level' | 'order_level';
+        holder: {
             type: "customer" | "custom";
         };
     };
     product: Product;
-    type?: 'product' | 'good_pass' | 'entitlement_pass' | 'discount_card' | 'product_discount_card';
-    shop_id?: number;
-    customer_id?: number | string | null;
-    holder?: {
-        holder_type?: string;
-        holder_id?: number | string | Array<number | string>;
-        [key: string]: any;
-    };
-    config?: {
-        isAvailable?: boolean;
-        maxUsagePerOrder?: number;
-        [key: string]: any;
-    };
-    reason?: string;
-    reasonCode?: string;
-    is_franchisor_pass?: number;
-    franchisee_wallet_pass?: {
-        use?: string;
-    };
-    committedAppliedProductDetails?: ApplicableProductDetails[];
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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

@@ -33,6 +33,7 @@ export interface OpenDataConfig {
     'sale.sale_number_prefix'?: string | null;
     'sale.enabled_item_rules'?: number[];
     'fulfillment.enable_pickup'?: boolean;
+    'fulfillment.handover_mode'?: string[] | null;
     'fulfillment.overdue_reminder'?: boolean;
     'fulfillment.manual_input_type'?: string;
     'fulfillment.enable_auto_complete'?: boolean;

package/lib/modules/ProductList/index.js

@@ -70,6 +70,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
       console.error(error);
     }
     const _platform = (_c = (_b = this.core) == null ? void 0 : _b.context) == null ? void 0 : _c.platform;
+    const channelMap = {
+      online_store: "online-store",
+      scan_to_order: "online-store",
+      scan_to_order_2: "online-store",
+      scan_to_order_3: "online-store"
+    };
+    const saleChannel = channelMap[(_d = this.otherParams) == null ? void 0 : _d.channel] || ((_e = this.otherParams) == null ? void 0 : _e.channel);
     const productsData = await this.request.post(
       `/product/query`,
       {
@@ -96,7 +103,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        application_code: _platform === "shop" ? ((_d = this.otherParams) == null ? void 0 : _d.channel) === "online_store" ? "online-store" : (_e = this.otherParams) == null ? void 0 : _e.channel : "online-store",
+        application_code: _platform === "shop" ? saleChannel : "online-store",
         with_schedule,
         schedule_datetime,
         is_eject: 1

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

@@ -8,26 +8,17 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     protected defaultVersion: string;
     private store;
     private hooks;
-    private entitlementPassEnabled;
-    private defaultWalletPassEvaluator?;
-    setEntitlementPassEnabled(enabled: boolean): void;
-    private getWalletPassEvaluator;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    private normalizeHolderRecordIds;
-    /**
-     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
-     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
-     */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
         holders: {
-            form_record_id: number | string;
+            form_record_id: number;
         }[];
         isFormSubject: boolean;
     }): {
@@ -35,7 +26,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
-        evaluatedDiscountList?: Discount[];
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
@@ -43,7 +33,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         holders: {
-            form_record_id: number | string;
+            form_record_id: number;
         }[];
         isFormSubject: boolean;
     }, options?: {