@pisell/pisellos 2.1.177 → 2.1.179

package/lib/modules/Discount/index.js

@@ -36,6 +36,8 @@ 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);
@@ -92,23 +94,34 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return this.store.originalDiscountList || [];
   }
   async loadPrepareConfig(params) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
       params
     );
-    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) || []]
-    ) || [];
+    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);
     return goodPassList;
   }
-  async batchSearch(code, options) {
-    const { customerId, orderId } = options || {};
-    const result = await this.request.get(`/machinecode/batch-search`, {
+  async batchSearch(code, customerIdOrOptions) {
+    var _a, _b;
+    const { customerId, orderId, withEntitlementPass } = typeof customerIdOrOptions === "number" ? { customerId: customerIdOrOptions, orderId: void 0, withEntitlementPass: false } : customerIdOrOptions || {};
+    const params = {
       code,
       translate_flag: 1,
-      tags: ["good_pass", "product_discount_card"],
-      // available: 1,
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
@@ -116,9 +129,45 @@ 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
-    });
-    const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
-    return resultDiscountWithReason;
+    };
+    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;
   }
   async batchSearchByProductIds(productIds) {
     const result = await this.request.get(`/machinecode/batch-search`, {
@@ -131,7 +180,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (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) => (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)
     );
   }
   // 检查使用次数限制
@@ -175,7 +224,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   // 过滤启用且可用的优惠券，并返回校验失败原因
   filterEnabledDiscountListWithReason(discountList) {
-    let lists = discountList.filter((discount) => discount.limit_status === "enable").filter((discount) => {
+    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) => {
       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) => {
@@ -188,8 +238,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: availableLists,
-      unavailableReasonKey: currentFailDiscount == null ? void 0 : currentFailDiscount.usageLimitFailKey
+      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
     };
   }
   // 检查使用次数限制，并返回校验失败原因

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

@@ -45,6 +45,8 @@ interface ApplicableProductDetails {
     num: number;
     metadata?: {
         product_discount_difference?: number;
+        num?: number;
+        custom_product_bundle_map_id?: string;
     };
     discount?: {
         fixed_amount?: number;
@@ -63,10 +65,17 @@ 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 | null;
+    unavailableReasonKey: DiscountFilterRejectKey | string | null;
 }
 interface ExtensionData {
     id: number;
@@ -93,19 +102,39 @@ export interface Discount {
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance: string;
+    balance?: string | number | null;
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
-        discount_calculation_mode: 'item_level' | 'order_level';
-        holder: {
+        included_uses?: IncludedUses;
+        discount_calculation_mode?: 'item_level' | 'order_level';
+        holder?: {
             type: "customer" | "custom";
         };
     };
     product: Product;
-    type: "product" | 'good_pass';
+    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[];
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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

@@ -0,0 +1,8 @@
+import type { RulesParamsHooks } from './types';
+export declare function isEntitlementRuntimeLine(product: any, mappedProduct?: any): boolean;
+/** 仅同步本次多次卡行的数量与价格，沿用 Rules 的主商品、套餐计算结果。 */
+export declare function rebuildEntitlementLine(origin: any, bundle: any[], hooks: RulesParamsHooks, count?: number): any;
+/** 重算只还原本次多次卡；套餐和多 Holder 按父商品份数计算，不再合并商品行。 */
+export declare function prepareEntitlementLines(products: any[], hooks: RulesParamsHooks, canUseEntitlement: (product: any) => boolean): any[];
+/** 客户端钩子可能保留原 _id，只给新增的重复行补标识，保留拆分结果。 */
+export declare function finalizeEntitlementLines(products: any[], hooks: RulesParamsHooks): any[];

package/lib/modules/Rules/entitlementLines.js

@@ -0,0 +1,158 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Rules/entitlementLines.ts
+var entitlementLines_exports = {};
+__export(entitlementLines_exports, {
+  finalizeEntitlementLines: () => finalizeEntitlementLines,
+  isEntitlementRuntimeLine: () => isEntitlementRuntimeLine,
+  prepareEntitlementLines: () => prepareEntitlementLines,
+  rebuildEntitlementLine: () => rebuildEntitlementLine
+});
+module.exports = __toCommonJS(entitlementLines_exports);
+var import_lodash_es = require("lodash-es");
+var import_decimal = __toESM(require("decimal.js"));
+var import_entitlementPass = require("../Discount/entitlementPass");
+var import_entitlementState = require("../Discount/entitlementState");
+var SOURCE = "entitlement_source_identity";
+function isManualDiscount(data) {
+  var _a;
+  return data.isManualDiscount ?? (data.total != data.origin_total && (data.bundle || []).every((item) => {
+    var _a2;
+    return !((_a2 = item.discount_list) == null ? void 0 : _a2.length);
+  }) && (!((_a = data.discount_list) == null ? void 0 : _a.length) || data.discount_list.every((item) => item.type === "product")));
+}
+function isEntitlementRuntimeLine(product, mappedProduct) {
+  var _a;
+  return ((_a = product.metadata) == null ? void 0 : _a[SOURCE]) != null && !(0, import_entitlementState.isPersistedEntitlementLine)(product, mappedProduct) && !isManualDiscount(mappedProduct ?? product);
+}
+function rebuildEntitlementLine(origin, bundle, hooks, count) {
+  const data = hooks.getProduct(origin);
+  const quantity = count ?? data.quantity ?? data.num ?? 1;
+  const discounts = (data.discount_list || []).map(
+    (item) => {
+      var _a;
+      return (0, import_entitlementPass.isEntitlementPass)(item) && !((_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) ? { ...item, _num: quantity, metadata: { ...item.metadata, num: quantity } } : item;
+    }
+  );
+  const mainDiscount = discounts.filter((item) => {
+    var _a;
+    return !((_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
+  }).reduce((sum, item) => sum.plus(item.amount || 0), new import_decimal.default(0));
+  const originalPrice = new import_decimal.default(data.original_price ?? data.price ?? 0);
+  const sourceSellingPrice = originalPrice.minus(mainDiscount).toNumber();
+  const optionPrice = (data.options || []).reduce((sum, item) => sum.plus(new import_decimal.default(item.price || 0).times(item.num || 0)), new import_decimal.default(0));
+  const bundleTotal = bundle.reduce((sum, item) => sum.plus(new import_decimal.default(item.price || 0).times(item.num || 1)), new import_decimal.default(0));
+  const bundleOriginalTotal = bundle.reduce((sum, item) => sum.plus(new import_decimal.default(item.original_price ?? item.price ?? 0).times(item.num || 1)), new import_decimal.default(0));
+  return hooks.setProduct(origin, {
+    quantity,
+    discount_list: discounts,
+    bundle,
+    price: sourceSellingPrice,
+    main_product_selling_price: sourceSellingPrice,
+    total: new import_decimal.default(sourceSellingPrice).plus(optionPrice).plus(bundleTotal).toNumber(),
+    origin_total: originalPrice.plus(optionPrice).plus(bundleOriginalTotal).toNumber()
+  });
+}
+function setLineIdentity(row, id) {
+  row._id = id;
+  row.metadata = { ...row.metadata, unique_identification_number: id };
+  if (row._extend)
+    row._extend.unique_identification_number = id;
+  return row;
+}
+function prepareEntitlementLines(products, hooks, canUseEntitlement) {
+  return products.flatMap((original) => {
+    var _a, _b, _c, _d;
+    const data = hooks.getProduct(original);
+    if ((0, import_entitlementState.isPersistedEntitlementLine)(original, data) || isManualDiscount(data))
+      return [original];
+    const applicable = canUseEntitlement(original);
+    if (!((_a = original.metadata) == null ? void 0 : _a[SOURCE]) && !(0, import_entitlementState.hasEntitlementDiscount)(data) && !applicable)
+      return [original];
+    const origin = (0, import_lodash_es.cloneDeep)(original);
+    origin.metadata = { ...origin.metadata, [SOURCE]: ((_b = origin.metadata) == null ? void 0 : _b[SOURCE]) ?? data._id };
+    const bundle = (data.bundle || []).map((item) => {
+      var _a2;
+      const entitlement = (item.discount_list || []).find(import_entitlementPass.isEntitlementPass);
+      if (!entitlement)
+        return item;
+      const discounts = (item.discount_list || []).filter((discount) => !(0, import_entitlementPass.isEntitlementPass)(discount));
+      const originalPrice = item.original_price ?? ((_a2 = entitlement.discount) == null ? void 0 : _a2.original_amount) ?? item.product_price ?? item.price ?? 0;
+      const amount = discounts.reduce((sum, discount) => sum.plus(discount.amount || 0), new import_decimal.default(0));
+      const price = new import_decimal.default(originalPrice).minus(amount.div(item.num || 1)).toNumber();
+      return { ...item, original_price: originalPrice, price, bundle_selling_price: price, discount_list: discounts };
+    });
+    const mainEntitlement = (_c = data.discount_list) == null ? void 0 : _c.find(import_entitlementPass.isEntitlementPass);
+    const restored = hooks.setProduct(origin, {
+      original_price: data.original_price ?? ((_d = mainEntitlement == null ? void 0 : mainEntitlement.discount) == null ? void 0 : _d.original_amount) ?? data.price,
+      discount_list: (data.discount_list || []).filter((item) => !(0, import_entitlementPass.isEntitlementPass)(item)),
+      bundle
+    });
+    const row = rebuildEntitlementLine(restored, bundle, hooks);
+    const count = Math.max(1, Math.floor(Number(data.quantity || data.num || 1)));
+    if (!applicable || count <= 1 || !bundle.length && !Array.isArray(data.holder_id))
+      return [row];
+    return Array.from({ length: count }, (_, index) => {
+      var _a2, _b2;
+      const unit = (0, import_lodash_es.cloneDeep)(row);
+      for (const source of [unit, unit._extend]) {
+        if (Array.isArray(source == null ? void 0 : source.holder_id))
+          source.holder_id = source.holder_id.slice(index, index + 1);
+      }
+      if (Array.isArray((_b2 = (_a2 = unit._origin) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form_record)) {
+        const records = unit._origin.holder.form_record;
+        if (records.length > 1)
+          unit._origin.holder.form_record = records.slice(index, index + 1);
+      }
+      return setLineIdentity(rebuildEntitlementLine(unit, hooks.getProduct(unit).bundle || [], hooks, 1), `${data._id}:entitlement-unit:${index}`);
+    });
+  });
+}
+function finalizeEntitlementLines(products, hooks) {
+  const runtime = (item) => isEntitlementRuntimeLine(item, hooks.getProduct(item));
+  const seen = new Set(products.filter((item) => !runtime(item)).map((item) => String(item._id)));
+  return products.map((origin, index) => {
+    if (!runtime(origin))
+      return origin;
+    const base = String(origin._id ?? hooks.getProduct(origin)._id);
+    let id = base;
+    let ordinal = index;
+    while (seen.has(id))
+      id = `${base}:entitlement-split:${ordinal++}`;
+    seen.add(id);
+    return id === String(origin._id) ? origin : setLineIdentity((0, import_lodash_es.cloneDeep)(origin), id);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  finalizeEntitlementLines,
+  isEntitlementRuntimeLine,
+  prepareEntitlementLines,
+  rebuildEntitlementLine
+});

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

@@ -8,17 +8,26 @@ 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;
+            form_record_id: number | string;
         }[];
         isFormSubject: boolean;
     }): {
@@ -26,6 +35,7 @@ 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;
@@ -33,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         holders: {
-            form_record_id: number;
+            form_record_id: number | string;
         }[];
         isFormSubject: boolean;
     }, options?: {