@pisell/pisellos 0.10.44 → 0.10.46

package/dist/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -28,6 +28,8 @@ export declare class WalletPassEvaluator {
     /** 检查代金券/折扣卡是否可用 并返回config */
     checkVoucherAvailability(input: EvaluatorInput): {
         isAvailable: boolean;
+        reason: string | undefined;
+        reasonCode: string | undefined;
         config: {
             [x: string]: any;
         };

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -283,7 +283,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "checkVoucherAvailability",
     value: function checkVoucherAvailability(input) {
-      var _results$, _results$2;
+      var _results$, _results$2, _results$3, _results$4;
       var orderTotalAmount = input.orderTotalAmount,
         products = input.products,
         vouchers = input.vouchers;
@@ -291,7 +291,9 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
       var isAvailable = ((_results$ = results[0]) === null || _results$ === void 0 ? void 0 : _results$.isApplicable) || false;
       return {
         isAvailable: isAvailable,
-        config: _objectSpread({}, (_results$2 = results[0]) === null || _results$2 === void 0 || (_results$2 = _results$2.strategyResult) === null || _results$2 === void 0 || (_results$2 = _results$2.config) === null || _results$2 === void 0 || (_results$2 = _results$2.metadata) === null || _results$2 === void 0 ? void 0 : _results$2.custom)
+        reason: (_results$2 = results[0]) === null || _results$2 === void 0 ? void 0 : _results$2.reason,
+        reasonCode: (_results$3 = results[0]) === null || _results$3 === void 0 ? void 0 : _results$3.reasonCode,
+        config: _objectSpread({}, (_results$4 = results[0]) === null || _results$4 === void 0 || (_results$4 = _results$4.strategyResult) === null || _results$4 === void 0 || (_results$4 = _results$4.config) === null || _results$4 === void 0 || (_results$4 = _results$4.metadata) === null || _results$4 === void 0 ? void 0 : _results$4.custom)
       };
     }
 

package/dist/modules/Customer/index.js

@@ -203,7 +203,8 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 sort_by: SORT_BY,
                 with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord'],
                 search_wallet_flag: 1,
-                search_wallet_pass_flag: 1
+                search_wallet_pass_flag: 1,
+                filter_franchisor_permissions: ['use']
               }, search && {
                 search: search
               }), _otherParams), url === '/customer/select-list' ? {

package/dist/modules/Discount/availability.d.ts

@@ -0,0 +1,7 @@
+import type { Discount, DiscountFilterRejectKey } from './types';
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+export declare function getDiscountUsageLimitFailKey(discount: Discount): DiscountFilterRejectKey | null;
+export declare function hasAvailableDiscountBalance(discount: Discount): boolean;
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+export declare function getDiscountLifecycleReason(discount: Discount): 'disabled' | 'exhausted' | 'expired' | undefined;
+export declare function getDiscountUsageBlockReason(discount: Discount): string | undefined;

package/dist/modules/Discount/availability.js

@@ -0,0 +1,49 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
+import { hasAvailableEntitlementUses, isEntitlementPass } from "./entitlementPass";
+
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+export function getDiscountUsageLimitFailKey(discount) {
+  var _discount$extension_d, _limits$find;
+  var value = (_discount$extension_d = discount.extension_data) === null || _discount$extension_d === void 0 || (_discount$extension_d = _discount$extension_d.find(function (field) {
+    return field.field_key === 'usage_credits';
+  })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value;
+  if (!value) return null;
+  var limits = [['total_credits', discount.total_order_behavior_count], ['per_user_limit', discount.customer_order_behavior_count], ['max_per_day', discount.today_order_behavior_count], ['max_per_week', discount.week_order_behavior_count], ['max_per_month', discount.month_order_behavior_count]];
+  return ((_limits$find = limits.find(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      count = _ref2[1];
+    return Number(value[key]) > 0 && Number(count || 0) >= Number(value[key]);
+  })) === null || _limits$find === void 0 ? void 0 : _limits$find[0]) || null;
+}
+export function hasAvailableDiscountBalance(discount) {
+  if (isEntitlementPass(discount)) return hasAvailableEntitlementUses(discount);
+  return new Decimal(discount.par_value || 0).minus(discount.used_par_value || 0).greaterThan(0);
+}
+
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+export function getDiscountLifecycleReason(discount) {
+  var _discount$metadata;
+  if (discount.limit_status && discount.limit_status !== 'enable') {
+    return 'disabled';
+  }
+  if ((isEntitlementPass(discount) || discount.par_value != null) && !hasAvailableDiscountBalance(discount) || getDiscountUsageLimitFailKey(discount) === 'total_credits') {
+    return 'exhausted';
+  }
+  // 自定义日程沿用快照语义，不使用遗留固定有效期字段推断过期。
+  if (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.validity_type) !== 'custom_schedule_validity' && discount.expire_time) {
+    var expiry = dayjs(discount.expire_time);
+    if (expiry.isValid() && !dayjs().isBefore(expiry)) return 'expired';
+  }
+  return undefined;
+}
+export function getDiscountUsageBlockReason(discount) {
+  return getDiscountLifecycleReason(discount) || getDiscountUsageLimitFailKey(discount) || (discount.unified_available_status != null && String(discount.unified_available_status) !== '' && Number(discount.unified_available_status) === 0 ? 'server_unavailable' : undefined);
+}

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

@@ -27,6 +27,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_pass_flag?: 0 | 1;
         with_virtual_currency?: 0 | 1;
         with_entitlement_pass?: 0 | 1;
+        filter_order_wallet_pass_usage?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
@@ -37,10 +38,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     }): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
-    private hasAvailableBalance;
-    private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
-    private checkUsageCreditsLimitWithFailKey;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/dist/modules/Discount/index.js

@@ -29,7 +29,7 @@ import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { BaseModule } from "../BaseModule";
 import { DiscountHooks } from "./types";
 import Decimal from 'decimal.js';
-import { hasAvailableEntitlementUses, isEntitlementPass } from "./entitlementPass";
+import { getDiscountLifecycleReason, getDiscountUsageBlockReason, getDiscountUsageLimitFailKey, hasAvailableDiscountBalance } from "./availability";
 export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(DiscountModule, _BaseModule);
   var _super = _createSuper(DiscountModule);
@@ -325,169 +325,30 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
         return _batchSearchByProductIds.apply(this, arguments);
       }
       return batchSearchByProductIds;
-    }()
+    }() // 展示列表只剔除已失效项，当前不可用项保留并携带原因。
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
-      var _this2 = this;
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && _this2.hasAvailableBalance(discount) && _this2.checkUsageCreditsLimit(discount);
-      });
-    }
-  }, {
-    key: "hasAvailableBalance",
-    value: function hasAvailableBalance(discount) {
-      if (isEntitlementPass(discount)) {
-        return hasAvailableEntitlementUses(discount);
-      }
-
-      // good_pass 与折扣卡继续沿用原有金额余额判断。
-      return new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
-    }
-
-    // 检查使用次数限制
-  }, {
-    key: "checkUsageCreditsLimit",
-    value: function checkUsageCreditsLimit(discount) {
-      // 如果没有 extension_data，则不需要限制
-      if (!discount.extension_data || discount.extension_data.length === 0) {
-        return true;
-      }
-
-      // 查找 field_key 为 usage_credits 的数据
-      var usageCreditsData = discount.extension_data.find(function (data) {
-        return data.field_key === 'usage_credits';
+        return discount.limit_status === 'enable' && hasAvailableDiscountBalance(discount) && !getDiscountLifecycleReason(discount);
+      }).map(function (discount) {
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          usageLimitFailKey: getDiscountUsageLimitFailKey(discount),
+          reasonCode: getDiscountUsageBlockReason(discount)
+        });
       });
-
-      // 如果没有找到 usage_credits 数据，则不需要限制
-      if (!usageCreditsData) {
-        return true;
-      }
-      var value = usageCreditsData.value;
-
-      // 检查总次数限制
-      if (value.total_credits && value.total_credits > 0) {
-        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-          return false;
-        }
-      }
-
-      // 检查单用户限制
-      if (value.per_user_limit && value.per_user_limit > 0) {
-        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-          return false;
-        }
-      }
-
-      // 检查单日限制
-      if (value.max_per_day && value.max_per_day > 0) {
-        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-          return false;
-        }
-      }
-
-      // 检查单周限制
-      if (value.max_per_week && value.max_per_week > 0) {
-        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-          return false;
-        }
-      }
-
-      // 检查单月限制
-      if (value.max_per_month && value.max_per_month > 0) {
-        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-          return false;
-        }
-      }
-
-      // 所有检查都通过
-      return true;
     }
-
-    // 过滤启用且可用的优惠券，并返回校验失败原因
   }, {
     key: "filterEnabledDiscountListWithReason",
     value: function filterEnabledDiscountListWithReason(discountList) {
-      var _this3 = this;
-      var lists = discountList.filter(function (discount) {
-        return discount.limit_status === 'enable';
-      }).filter(function (discount) {
-        return _this3.hasAvailableBalance(discount);
-      }).map(function (discount) {
-        var limitFailKey = _this3.checkUsageCreditsLimitWithFailKey(discount);
-        return _objectSpread(_objectSpread({}, discount), {}, {
-          usageLimitFailKey: limitFailKey
-        });
-      });
-
-      // 可用的列表
-      var availableLists = lists.filter(function (item) {
-        return !item.usageLimitFailKey && item.unified_available_status !== 0;
-      });
-      // 不可用数据
-      var currentFailDiscount = lists.find(function (item) {
-        return item.usageLimitFailKey;
-      });
       return {
-        discountList: availableLists,
-        unavailableReasonKey: currentFailDiscount === null || currentFailDiscount === void 0 ? void 0 : currentFailDiscount.usageLimitFailKey
+        discountList: this.filterEnabledDiscountList(discountList),
+        unavailableReasonKey: discountList.map(getDiscountUsageLimitFailKey).find(function (key) {
+          return key !== null;
+        }) || null
       };
     }
 
-    // 检查使用次数限制，并返回校验失败原因
-  }, {
-    key: "checkUsageCreditsLimitWithFailKey",
-    value: function checkUsageCreditsLimitWithFailKey(discount) {
-      if (!discount.extension_data || discount.extension_data.length === 0) {
-        return null;
-      }
-      var usageCreditsData = discount.extension_data.find(function (data) {
-        return data.field_key === 'usage_credits';
-      });
-      if (!usageCreditsData) {
-        return null;
-      }
-      var 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去重
   }, {
     key: "uniqueByProductId",

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

@@ -201,6 +201,12 @@ export interface Discount {
     start_time?: string;
     discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
+    /** 本次规则计算的不可用原因；可用性恢复后清除。 */
+    reason?: string;
+    reasonCode?: string;
+    unified_messages?: {
+        title?: string | Record<string, string>;
+    };
     unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {

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

@@ -572,7 +572,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;