@pisell/pisellos 0.0.571 → 0.0.572

package/dist/modules/Payment/types.d.ts

@@ -629,12 +629,12 @@ export declare enum PaymentHooks {
     OnOrderAmountChanged = "payment:onOrderAmountChanged",
     OnPaymentSyncError = "payment:onPaymentSyncError",
     OnPaymentSyncSuccess = "payment:onPaymentSyncSuccess",
-    OnWalletRecommendListUpdated = 0,
-    OnWalletRecommendListCleared = 0,
-    OnUserIdentificationCodesUpdated = 0,
-    OnUserIdentificationCodesCleared = 0,
-    OnWalletCacheCleared = 0,
-    OnSearchIdentificationCodeCompleted = 0
+    OnWalletRecommendListUpdated = "wallet:onWalletRecommendListUpdated",
+    OnWalletRecommendListCleared = "wallet:onWalletRecommendListCleared",
+    OnUserIdentificationCodesUpdated = "wallet:onUserIdentificationCodesUpdated",
+    OnUserIdentificationCodesCleared = "wallet:onUserIdentificationCodesCleared",
+    OnWalletCacheCleared = "wallet:onWalletCacheCleared",
+    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted"
 }
 /**
  * 钱包推荐扣款请求参数
@@ -797,7 +797,7 @@ export interface SearchIdentificationCodeResponse {
 /**
  * 搜索识别码结果类型
  */
-export declare type SearchIdentificationCodeResult = {
+export type SearchIdentificationCodeResult = {
     type: 'walletCode';
     data: SearchIdentificationCodeItem[];
 } | {

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/modules/ResourcePlanner/types.d.ts

@@ -1,7 +1,7 @@
-export declare type ResourcePlannerMode = 'appointment' | 'scan_order' | 'venue_grid';
-export declare type ResourcePlannerProductKind = 'normal' | 'duration' | 'session' | 'venue_slot';
-export declare type ResourcePlannerResourceType = 'single' | 'multiple' | 'capacity';
-export declare type ResourcePlannerStatus = 'available' | 'limited' | 'full' | 'conflict' | 'unavailable' | 'past';
+export type ResourcePlannerMode = 'appointment' | 'scan_order' | 'venue_grid';
+export type ResourcePlannerProductKind = 'normal' | 'duration' | 'session' | 'venue_slot';
+export type ResourcePlannerResourceType = 'single' | 'multiple' | 'capacity';
+export type ResourcePlannerStatus = 'available' | 'limited' | 'full' | 'conflict' | 'unavailable' | 'past';
 export interface ResourcePlannerTimeRange {
     start_at: string;
     end_at: string;

package/dist/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/dist/modules/Rules/entitlementLines.js

@@ -0,0 +1,159 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { cloneDeep } from 'lodash-es';
+import Decimal from 'decimal.js';
+import { isEntitlementPass } from "../Discount/entitlementPass";
+import { hasEntitlementDiscount, isPersistedEntitlementLine } from "../Discount/entitlementState";
+var SOURCE = 'entitlement_source_identity';
+function isManualDiscount(data) {
+  var _data$isManualDiscoun, _data$discount_list;
+  return (_data$isManualDiscoun = data.isManualDiscount) !== null && _data$isManualDiscoun !== void 0 ? _data$isManualDiscoun : data.total != data.origin_total && (data.bundle || []).every(function (item) {
+    var _item$discount_list;
+    return !((_item$discount_list = item.discount_list) !== null && _item$discount_list !== void 0 && _item$discount_list.length);
+  }) && (!((_data$discount_list = data.discount_list) !== null && _data$discount_list !== void 0 && _data$discount_list.length) || data.discount_list.every(function (item) {
+    return item.type === 'product';
+  }));
+}
+export function isEntitlementRuntimeLine(product, mappedProduct) {
+  var _product$metadata;
+  return ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata[SOURCE]) != null && !isPersistedEntitlementLine(product, mappedProduct) && !isManualDiscount(mappedProduct !== null && mappedProduct !== void 0 ? mappedProduct : product);
+}
+
+/** 仅同步本次多次卡行的数量与价格，沿用 Rules 的主商品、套餐计算结果。 */
+export function rebuildEntitlementLine(origin, bundle, hooks, count) {
+  var _ref, _ref2, _ref4, _data$original_price;
+  var data = hooks.getProduct(origin);
+  var quantity = (_ref = (_ref2 = count !== null && count !== void 0 ? count : data.quantity) !== null && _ref2 !== void 0 ? _ref2 : data.num) !== null && _ref !== void 0 ? _ref : 1;
+  var discounts = (data.discount_list || []).map(function (item) {
+    var _item$metadata;
+    return isEntitlementPass(item) && !((_item$metadata = item.metadata) !== null && _item$metadata !== void 0 && _item$metadata.custom_product_bundle_map_id) ? _objectSpread(_objectSpread({}, item), {}, {
+      _num: quantity,
+      metadata: _objectSpread(_objectSpread({}, item.metadata), {}, {
+        num: quantity
+      })
+    }) : item;
+  });
+  var mainDiscount = discounts.filter(function (item) {
+    var _item$metadata2;
+    return !((_item$metadata2 = item.metadata) !== null && _item$metadata2 !== void 0 && _item$metadata2.custom_product_bundle_map_id);
+  }).reduce(function (sum, item) {
+    var _ref3, _item$metadata$mainPr, _item$metadata3;
+    return sum.plus((_ref3 = (_item$metadata$mainPr = (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.mainProductDiscountAmount) !== null && _item$metadata$mainPr !== void 0 ? _item$metadata$mainPr : item.amount) !== null && _ref3 !== void 0 ? _ref3 : 0);
+  }, new Decimal(0));
+  var originalPrice = new Decimal((_ref4 = (_data$original_price = data.original_price) !== null && _data$original_price !== void 0 ? _data$original_price : data.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+  var sourceSellingPrice = originalPrice.minus(mainDiscount).toNumber();
+  var optionPrice = (data.options || []).reduce(function (sum, item) {
+    var _ref5, _item$price, _ref6, _item$num;
+    return sum.plus(new Decimal((_ref5 = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : item.add_price) !== null && _ref5 !== void 0 ? _ref5 : 0).times((_ref6 = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.quantity) !== null && _ref6 !== void 0 ? _ref6 : 1));
+  }, new Decimal(0));
+  var bundleTotal = bundle.reduce(function (sum, item) {
+    return sum.plus(new Decimal(item.price || 0).times(item.num || 1));
+  }, new Decimal(0));
+  var bundleOriginalTotal = bundle.reduce(function (sum, item) {
+    var _ref7, _item$original_price;
+    return sum.plus(new Decimal((_ref7 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0).times(item.num || 1));
+  }, new Decimal(0));
+  return hooks.setProduct(origin, {
+    quantity: quantity,
+    discount_list: discounts,
+    bundle: bundle,
+    price: sourceSellingPrice,
+    main_product_selling_price: sourceSellingPrice,
+    total: new Decimal(sourceSellingPrice).plus(optionPrice).plus(bundleTotal).toNumber(),
+    origin_total: originalPrice.plus(optionPrice).plus(bundleOriginalTotal).toNumber()
+  });
+}
+function setLineIdentity(row, id) {
+  row._id = id;
+  row.metadata = _objectSpread(_objectSpread({}, row.metadata), {}, {
+    unique_identification_number: id
+  });
+  if (row._extend) row._extend.unique_identification_number = id;
+  return row;
+}
+
+/** 重算只还原本次多次卡；套餐和多 Holder 按父商品份数计算，不再合并商品行。 */
+export function prepareEntitlementLines(products, hooks, canUseEntitlement) {
+  return products.flatMap(function (original) {
+    var _original$metadata, _origin$metadata$SOUR, _origin$metadata, _data$discount_list2, _ref11, _data$original_price2, _mainEntitlement$disc;
+    var data = hooks.getProduct(original);
+    if (isPersistedEntitlementLine(original, data) || isManualDiscount(data)) return [original];
+    var applicable = canUseEntitlement(original);
+    if (!((_original$metadata = original.metadata) !== null && _original$metadata !== void 0 && _original$metadata[SOURCE]) && !hasEntitlementDiscount(data) && !applicable) return [original];
+    var origin = cloneDeep(original);
+    origin.metadata = _objectSpread(_objectSpread({}, origin.metadata), {}, _defineProperty({}, SOURCE, (_origin$metadata$SOUR = (_origin$metadata = origin.metadata) === null || _origin$metadata === void 0 ? void 0 : _origin$metadata[SOURCE]) !== null && _origin$metadata$SOUR !== void 0 ? _origin$metadata$SOUR : data._id));
+    var bundle = (data.bundle || []).map(function (item) {
+      var _ref8, _ref9, _ref10, _item$original_price2, _entitlement$discount;
+      var entitlement = (item.discount_list || []).find(isEntitlementPass);
+      if (!entitlement) return item;
+      var discounts = (item.discount_list || []).filter(function (discount) {
+        return !isEntitlementPass(discount);
+      });
+      var originalPrice = (_ref8 = (_ref9 = (_ref10 = (_item$original_price2 = item.original_price) !== null && _item$original_price2 !== void 0 ? _item$original_price2 : (_entitlement$discount = entitlement.discount) === null || _entitlement$discount === void 0 ? void 0 : _entitlement$discount.original_amount) !== null && _ref10 !== void 0 ? _ref10 : item.product_price) !== null && _ref9 !== void 0 ? _ref9 : item.price) !== null && _ref8 !== void 0 ? _ref8 : 0;
+      var amount = discounts.reduce(function (sum, discount) {
+        return sum.plus(discount.amount || 0);
+      }, new Decimal(0));
+      var price = new Decimal(originalPrice).minus(amount.div(item.num || 1)).toNumber();
+      return _objectSpread(_objectSpread({}, item), {}, {
+        original_price: originalPrice,
+        price: price,
+        bundle_selling_price: price,
+        discount_list: discounts
+      });
+    });
+    var mainEntitlement = (_data$discount_list2 = data.discount_list) === null || _data$discount_list2 === void 0 ? void 0 : _data$discount_list2.find(isEntitlementPass);
+    var restored = hooks.setProduct(origin, {
+      original_price: (_ref11 = (_data$original_price2 = data.original_price) !== null && _data$original_price2 !== void 0 ? _data$original_price2 : mainEntitlement === null || mainEntitlement === void 0 || (_mainEntitlement$disc = mainEntitlement.discount) === null || _mainEntitlement$disc === void 0 ? void 0 : _mainEntitlement$disc.original_amount) !== null && _ref11 !== void 0 ? _ref11 : data.price,
+      discount_list: (data.discount_list || []).filter(function (item) {
+        return !isEntitlementPass(item);
+      }),
+      bundle: bundle
+    });
+    var row = rebuildEntitlementLine(restored, bundle, hooks);
+    var 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
+    }, function (_, index) {
+      var _unit$_origin;
+      var unit = cloneDeep(row);
+      // booking 使用 _extend.holder_id，appointmentBooking 使用购物车 Holder。
+      for (var _i = 0, _arr = [unit, unit._extend]; _i < _arr.length; _i++) {
+        var source = _arr[_i];
+        if (Array.isArray(source === null || source === void 0 ? void 0 : source.holder_id)) source.holder_id = source.holder_id.slice(index, index + 1);
+      }
+      if (Array.isArray((_unit$_origin = unit._origin) === null || _unit$_origin === void 0 || (_unit$_origin = _unit$_origin.holder) === null || _unit$_origin === void 0 ? void 0 : _unit$_origin.form_record)) {
+        var records = unit._origin.holder.form_record;
+        // 单 Holder 的多份商品仍归属同一人；多个 Holder 才按份对应。
+        if (records.length > 1) unit._origin.holder.form_record = records.slice(index, index + 1);
+      }
+      return setLineIdentity(rebuildEntitlementLine(unit, hooks.getProduct(unit).bundle || [], hooks, 1), "".concat(data._id, ":entitlement-unit:").concat(index));
+    });
+  });
+}
+
+/** 客户端钩子可能保留原 _id，只给新增的重复行补标识，保留拆分结果。 */
+export function finalizeEntitlementLines(products, hooks) {
+  var runtime = function runtime(item) {
+    return isEntitlementRuntimeLine(item, hooks.getProduct(item));
+  };
+  var seen = new Set(products.filter(function (item) {
+    return !runtime(item);
+  }).map(function (item) {
+    return String(item._id);
+  }));
+  return products.map(function (origin, index) {
+    var _origin$_id;
+    if (!runtime(origin)) return origin;
+    var base = String((_origin$_id = origin._id) !== null && _origin$_id !== void 0 ? _origin$_id : hooks.getProduct(origin)._id);
+    var id = base;
+    var ordinal = index;
+    while (seen.has(id)) id = "".concat(base, ":entitlement-split:").concat(ordinal++);
+    seen.add(id);
+    return id === String(origin._id) ? origin : setLineIdentity(cloneDeep(origin), id);
+  });
+}

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

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
+import { WalletPassEvaluator } from '../../model/strategy/adapter/walletPass/evaluator';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -9,11 +10,19 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     private store;
     window: WindowPlugin;
     private hooks;
+    private entitlementPassEnabled;
+    private defaultWalletPassEvaluator?;
+    setEntitlementPassEnabled(enabled: boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
+    getWalletPassEvaluator(): WalletPassEvaluator | undefined;
+    private normalizeHolderRecordIds;
+    /**
+     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
+     */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
@@ -21,7 +30,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         orderTotalAmount: number;
         holders: {
-            form_record_id: number;
+            form_record_id: number | string;
         }[];
         isFormSubject: RulesFormSubject;
     }): {
@@ -29,6 +38,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
+        evaluatedDiscountList?: Discount[];
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
@@ -40,7 +50,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: RulesFormSubject;
         orderTotalAmount: number;