@pisell/pisellos 0.0.571 → 0.0.572

package/lib/solution/ShopDiscount/index.js

@@ -11,6 +11,9 @@ var _utils = require("./utils");
 var _types = require("../../modules/Rules/types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
+var _availability = require("../../modules/Discount/availability");
+var _entitlementState = require("../../modules/Discount/entitlementState");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class ShopDiscountImpl extends _BaseModule.BaseModule {
   defaultName = 'shopDiscount';
@@ -21,6 +24,16 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
   store;
   options = {};
   hooks;
+  entitlementPassEnabled = false;
+
+  // 由使用多次卡的预约组件显式开启，其他入口沿用原券流程。
+  setEntitlementPassEnabled(enabled) {
+    this.entitlementPassEnabled = enabled;
+    this.store.rules?.setEntitlementPassEnabled(enabled);
+    if (!enabled) {
+      this.store.discount?.setDiscountList(this.getDiscountList().filter(item => !(0, _entitlementPass.isEntitlementPass)(item)));
+    }
+  }
   constructor(name, version) {
     super(name, version);
     // 初始化所有必要的状态属性
@@ -118,9 +131,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
   }
   registerEventListeners() {
     this.core.effects.only(`${this.name}:onCustomerChange`, customer => {
-      if (this.options.otherParams?.cacheId && this.getDiscountList().length) {
-        return;
-      }
+      if (!this.entitlementPassEnabled && this.options.otherParams?.cacheId && this.getDiscountList().length) return;
       this.loadPrepareConfig({
         customerId: customer.id,
         action: 'create',
@@ -181,6 +192,10 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
   async setCustomer(customer) {
     if (this.store.customer?.id !== customer.id) {
       this.store.customer = customer;
+      if (this.entitlementPassEnabled) {
+        const retained = this.getDiscountList().filter(item => !(0, _entitlementPass.isEntitlementPass)(item) || item.isEditMode || item.isScan && String(item.customer_id) === String(customer.id));
+        await this.store.discount?.setDiscountList(retained);
+      }
       await this.core.effects.emit(`${this.name}:onCustomerChange`, customer);
     }
   }
@@ -222,6 +237,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       productList,
       discountList: this.getDiscountList()
     };
+    if (this.entitlementPassEnabled) this.store.productList = newProductList || productList;
     if (newDiscountList) {
       newDiscountList = this.setDiscountList(newDiscountList);
     }
@@ -300,7 +316,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
     try {
       const resultDiscountWithReason = (await this.store.discount?.batchSearch(code, {
         customerId,
-        orderId: this.store.orderId
+        orderId: this.store.orderId,
+        withEntitlementPass: this.entitlementPassEnabled
       })) || {
         discountList: [],
         unavailableReasonKey: null
@@ -336,7 +353,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       });
       // 如果扫回来的券当前有选中的，则不进行计算
       const currentSelectedDiscountList = this.getDiscountList().filter(n => n.isSelected);
-      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some(n => withScanList.some(m => m.id === n.id))) {
+      if (!withScanList.some(_entitlementPass.isEntitlementPass) && currentSelectedDiscountList.length && currentSelectedDiscountList.some(n => withScanList.some(m => m.id === n.id))) {
         return {
           type: "clientCalc",
           isAvailable: true,
@@ -347,6 +364,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
+        evaluatedDiscountList,
         isAvailable,
         unavailableReason
       } = rulesModule.isDiscountListAvailable({
@@ -361,20 +379,36 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         productList: this.store.productList || [],
         discountList: this.getDiscountList()
       };
+      let isAccepted = isAvailable;
       if (isAvailable) {
+        if (this.entitlementPassEnabled) this.setProductList(newProductList || []);
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
-        this.setProductList(newProductList || []);
+        if (!this.entitlementPassEnabled) this.setProductList(newProductList || []);
         if (this.isWalkIn() && resultDiscountList.length && this.options.otherParams?.platform === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(resultDiscountList[0].customer_id);
         }
       }
+      if (!isAvailable) {
+        const ids = new Set(withScanList.map(item => String(item.id)));
+        const retainable = (evaluatedDiscountList || []).filter(item => ids.has(String(item.id)) && (0, _entitlementPass.isEntitlementPass)(item) && !(0, _availability.getDiscountLifecycleReason)(item));
+        if (retainable.length) {
+          this.setDiscountList((0, _entitlementState.retainScannedEntitlements)(this.getDiscountList(), retainable));
+          isAccepted = true;
+        }
+      }
+      if (this.entitlementPassEnabled) {
+        this.store.originalDiscountList = this.getDiscountList();
+        await this.store.discount?.setOriginalDiscountList(this.getDiscountList());
+      }
       return {
         type: "clientCalc",
         isAvailable: isAvailable || false,
-        productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList(),
-        unavailableReason
+        isAccepted,
+        productList: isAvailable ? newProductList : this.store.productList || [],
+        discountList: this.getDiscountList(),
+        unavailableReason,
+        unavailableReasonKey: (evaluatedDiscountList || []).find(item => withScanList.some(scanned => String(scanned.id) === String(item.id)) && item.reasonCode)?.reasonCode || unavailableReasonKey
       };
     } catch (error) {
       console.error('[ShopDiscount] 扫码出错:', error);
@@ -454,7 +488,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = [...editModeDiscountList, ...discountList.filter(item => !item.isDisabled)];
+    const newDiscountList = this.entitlementPassEnabled ? (0, _entitlementState.withCommittedEntitlementDetails)([...editModeDiscountList.filter(item => !(0, _entitlementPass.isEntitlementPass)(item)), ...discountList.filter(item => (0, _entitlementPass.isEntitlementPass)(item) || !item.isDisabled)], productList, this.hooks?.getProduct || (item => item)) : [...editModeDiscountList, ...discountList.filter(item => !item.isDisabled && !(0, _entitlementPass.isEntitlementPass)(item))];
     const isProductFree = id => {
       const targetProduct = productList.find(n => n.id === id);
       if (!targetProduct) return false;
@@ -497,7 +531,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         const {
           ...customer
         } = result.data;
-        this.setCustomer(customer);
+        const customerUpdate = this.setCustomer(customer);
+        if (this.entitlementPassEnabled) await customerUpdate;
         await this.core.effects.emit(`${this.name}:onScanCustomerChange`, customer);
       }
     } catch (error) {
@@ -518,6 +553,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
   // 加载准备配置
   async loadPrepareConfig(params) {
     try {
+      const entitlementPassEnabled = this.entitlementPassEnabled;
       const orderId = this.store.orderId;
       const customerId = params.customerId || this.getCustomer()?.id;
       // if (customerId === 1 || !customerId) {
@@ -530,25 +566,26 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
+        ...(this.entitlementPassEnabled ? {
+          with_entitlement_pass: 1,
+          filter_order_wallet_pass_usage: 0
+        } : {}),
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...(orderId ? {
           order_id: orderId
         } : {})
       });
       const goodPassList = prepareConfigResult?.discountList || [];
-      const scanDiscount = this.getDiscountList()?.filter(item => item.isScan);
-
-      // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-      const scanDiscountIds = scanDiscount.map(n => n.id);
-      const newGoodPassList = goodPassList.filter(n => !scanDiscountIds.includes(n.id));
-      const newDiscountList = [...scanDiscount, ...(newGoodPassList || [])];
+      if (entitlementPassEnabled !== this.entitlementPassEnabled) return;
+      if (entitlementPassEnabled && (String(customerId) !== String(this.getCustomer()?.id) || String(orderId) !== String(this.store.orderId))) return;
+      const newDiscountList = (0, _entitlementState.mergeEntitlementDiscountLists)(this.getDiscountList(), goodPassList || [], this.store.discount?.getOriginalDiscountList());
 
       // 存储原始优惠券列表
       this.store.originalDiscountList = newDiscountList;
       await this.store.discount?.setOriginalDiscountList(newDiscountList);
 
       // 根据当前预约时间过滤优惠券列表
-      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+      const filteredDiscountList = newDiscountList.filter(item => (0, _entitlementPass.isEntitlementPass)(item) || this.filterDiscountListByBookingTime([item], this.store.currentBookingTime).length > 0);
       this.store.filteredDiscountList = filteredDiscountList;
       this.setDiscountList(filteredDiscountList || []);
       if (this.store.productList?.length) {

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

@@ -11,7 +11,7 @@ export declare enum ShopDiscountHooks {
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"
 }
-export declare type Customer = {
+export type Customer = {
     id: string | number;
     name: string;
     email: string;

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

@@ -21,13 +21,13 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
-export declare const getDiscountListAmountTotal: (discount: Discount[]) => Discount;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
 /**
  * 获取折扣金额 计算每个折扣的金额
  * @param discount
  * @returns
  */
-export declare const getDiscountListAmount: (discount: Discount[]) => Discount;
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
 export interface ScheduleItem {
     id: number;
     name: string | {
@@ -98,3 +98,4 @@ export declare const calculateOrderLevelDiscountAllocation: (discount: Discount,
     discountAmount: number;
     difference: number;
 }>;
+export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;

package/lib/solution/ShopDiscount/utils.js

@@ -3,10 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
+exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountTimeUnavailableReason = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrAfter.default);
+_dayjs.default.extend(_isSameOrBefore.default);
 const uniqueById = (arr, key = 'id') => {
   const seen = new Set();
   return arr.filter(item => !seen.has(item[key]) && seen.add(item[key]));
@@ -45,7 +50,7 @@ const isAllNormalProduct = items => {
 exports.isAllNormalProduct = isAllNormalProduct;
 const getDiscountAmount = (discount, total, price) => {
   // 商品券
-  if (discount.tag === 'good_pass') {
+  if ((0, _entitlementPass.isFullCoveragePass)(discount)) {
     return new _decimal.default(price).minus(new _decimal.default(price || 0)).toNumber();
   }
 
@@ -395,6 +400,7 @@ const filterDiscountListByBookingTime = (discountList, bookingTime) => {
     return discountList;
   }
   return discountList.filter(discount => {
+    if ((0, _entitlementPass.isEntitlementPass)(discount)) return !getDiscountTimeUnavailableReason(discount, bookingTime);
     if (discount?.metadata?.validity_type === "custom_schedule_validity") {
       return getDateIsInSchedule(bookingTime, discount.custom_schedule_snapshot?.data || []);
     }
@@ -540,4 +546,34 @@ const calculateOrderLevelDiscountAllocation = (discount, applicableProducts) =>
   }
   return result;
 };
-exports.calculateOrderLevelDiscountAllocation = calculateOrderLevelDiscountAllocation;
+exports.calculateOrderLevelDiscountAllocation = calculateOrderLevelDiscountAllocation;
+const getDiscountTimeUnavailableReason = (discount, useTime) => {
+  const useTimeDayjs = (0, _dayjs.default)(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
+    if (discount?.metadata?.validity_type === "custom_schedule_validity") {
+      return getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || []) ? undefined : 'outside_schedule';
+    }
+    const isHasStart = !!discount.start_date && !!discount.start_time;
+    const startDate = (0, _dayjs.default)(`${discount.start_date} ${discount.start_time}`);
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
+    }
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    const expireTime = discount.expire_time ? (0, _dayjs.default)(discount.expire_time) : null;
+    const isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    const validity = discount.extension_data?.find(field => field.field_key === 'valid_times')?.value;
+    if (validity?.restrict_use_by_schedule === true && !getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
+};
+exports.getDiscountTimeUnavailableReason = getDiscountTimeUnavailableReason;

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

@@ -55,7 +55,7 @@ export interface UnifiedBookingSalesStagePlannerProductsParams {
     rawProducts?: Record<string, any>[];
 }
 /** Ordinary retail product staging. No resource, time, or booking facts are required. */
-export declare type UnifiedBookingSalesStageRetailProductsParams = UnifiedBookingSalesStagePlannerProductsParams;
+export type UnifiedBookingSalesStageRetailProductsParams = UnifiedBookingSalesStagePlannerProductsParams;
 /** Adds one ordinary retail product without replacing other retail lines already in the cart. */
 export interface UnifiedBookingSalesAddRetailProductParams {
     /** Prefer a supplied catalog record when the UI has already loaded it. */

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

@@ -11,7 +11,7 @@ export declare enum VenueBookingHooks {
     /** 登录客户的智能定价、营销配置与订单汇总已完成刷新 */
     onSmartPricingUpdated = "venueBooking:onSmartPricingUpdated"
 }
-export declare type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
+export type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export interface VenueBookingEntryContext {
     biz: string;
     venueId?: string;

package/lib/types/index.d.ts

@@ -38,7 +38,7 @@ export interface ModuleOptions {
     initialState?: Record<string, any>;
     otherParams?: Record<string, any>;
 }
-export declare type EventHandler = (data?: any) => void;
+export type EventHandler = (data?: any) => void;
 export interface PisellCore {
     registerPlugin: (plugin: Plugin, options?: PluginOptions) => void;
     getPlugin: <T extends Plugin>(name: string) => T | null;

package/lib/utils/task.d.ts

@@ -1,5 +1,5 @@
-declare type Action = (...args: any[]) => Promise<any>;
-declare type Task = {
+type Action = (...args: any[]) => Promise<any>;
+type Task = {
     uuid: string;
     type: string;
     actionParams?: Record<string, any>;

package/lib/utils/watch.d.ts

@@ -2,8 +2,8 @@
  * 监听模块
  *
  */
-export declare type WatchEventCallback = (...args: any[]) => void;
-export declare type WatchEventItem = {
+export type WatchEventCallback = (...args: any[]) => void;
+export type WatchEventItem = {
     key: string;
     callback: WatchEventCallback;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.571",
+  "version": "0.0.572",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,6 +9,23 @@
     "dist",
     "lib"
   ],
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev --watch",
+    "push": "yalc push --replace",
+    "test": "vitest",
+    "lint": "eslint src --ext .ts",
+    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
+    "changeset": "changeset",
+    "version": "changeset version",
+    "release": "changeset publish && npm run sync && git push",
+    "example": "npx parcel-bundler examples/index.html",
+    "docs": "typedoc --out docs src/index.ts",
+    "sync": "node sync.js",
+    "prepublishOnly": "npm run build",
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release",
+    "deploy:ci": "npm run build && npm run version && changeset publish --registry=https://registry.npmjs.com/ && npm run sync"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/username/pisell-os.git"
@@ -53,21 +70,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev --watch",
-    "push": "yalc push --replace",
-    "test": "vitest",
-    "lint": "eslint src --ext .ts",
-    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
-    "changeset": "changeset",
-    "version": "changeset version",
-    "release": "changeset publish && npm run sync && git push",
-    "example": "npx parcel-bundler examples/index.html",
-    "docs": "typedoc --out docs src/index.ts",
-    "sync": "node sync.js",
-    "deploy": "npm run build && npm run changeset && npm run version && npm run release",
-    "deploy:ci": "npm run build && npm run version && changeset publish --registry=https://registry.npmjs.com/ && npm run sync"
   }
-}
+}