@pisell/pisellos 2.3.136 → 2.3.138

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/ResourcePlanner/planner.js

@@ -436,7 +436,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
 }
 function normalizeRequirementGroup(product, requirementGroup) {
   var _requirementGroup$for;
-  var resourceType = 'single';
+  var resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   var required = requirementGroup.required !== false;
   var min = required ? 1 : 0;
   return _objectSpread(_objectSpread({}, requirementGroup), {}, {
@@ -482,7 +482,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(function (resource) {
     return _objectSpread(_objectSpread({}, resource), {}, {
-      resourceType: 'single',
+      resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
       capacity: Math.max(1, Number(resource.capacity || 1) || 1),
       windows: (resource.windows || []).map(function (window) {
         return _objectSpread({}, window);
@@ -637,7 +637,8 @@ function buildCells(projection) {
           var usedCapacity = segmentOccupancies.reduce(function (sum, occupancy) {
             return sum + Math.max(1, Number(occupancy.pax || 1) || 1);
           }, 0);
-          var remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          var remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           var requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           var reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(function (occupancy) {
             var source = occupancy.source || 'remote';
@@ -671,7 +672,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -679,7 +680,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status: status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity: remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1739,7 +1740,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: (_resource$raw = resource.raw) === null || _resource$raw === void 0 ? void 0 : _resource$raw.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: _isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: _isPast ? ['past'] : [].concat(_toConsumableArray(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), ['outside_resource_window'])
@@ -1763,7 +1764,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: (_resource$raw2 = resource.raw) === null || _resource$raw2 === void 0 ? void 0 : _resource$raw2.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status: status,
         remainingCapacity: remainingCapacity,
         maxCapacity: maxCapacity,
@@ -2330,7 +2331,8 @@ export function validateAvailabilitySelection(projection, params) {
       var remainingCapacity = matchedCell === null || matchedCell === void 0 ? void 0 : matchedCell.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         var capacityPerBooking = normalizedPartySize !== null && normalizedPartySize !== void 0 ? normalizedPartySize : 1;
-        var availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/RegisterAndLogin/config.js

@@ -386,23 +386,25 @@ function withH5AuthPrefix(config) {
   return nextConfig;
 }
 var h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
-
-// Kiosk 复用网店顾客认证接口，通过注册参数独立标识会员归属渠道。
-var kioskConfig = _objectSpread(_objectSpread({}, h5OnlineStoreConfig), {}, {
-  emailCodeRegister: _objectSpread(_objectSpread({}, h5OnlineStoreConfig.emailCodeRegister), {}, {
-    transformParams: function transformParams(params) {
-      return _objectSpread(_objectSpread({}, h5OnlineStoreConfig.emailCodeRegister.transformParams(params)), {}, {
-        login_channel: 'kiosk'
-      });
-    }
-  }),
-  phoneCodeRegister: _objectSpread(_objectSpread({}, h5OnlineStoreConfig.phoneCodeRegister), {}, {
-    transformParams: function transformParams(params) {
-      return _objectSpread(_objectSpread({}, h5OnlineStoreConfig.phoneCodeRegister.transformParams(params)), {}, {
-        login_channel: 'kiosk'
+function withKioskSalesChannel(config) {
+  return _objectSpread(_objectSpread({}, config), {}, {
+    options: function options(params) {
+      var options = (typeof config.options === 'function' ? config.options(params) : config.options) || {};
+      var headers = typeof options.headers === 'function' ? options.headers(params) : options.headers;
+      return _objectSpread(_objectSpread({}, options), {}, {
+        headers: _objectSpread(_objectSpread({}, headers), {}, {
+          'Sales-Channel': 'kiosk'
+        })
       });
     }
-  })
+  });
+}
+
+// Kiosk 复用网店顾客认证接口，通过注册（含验证码登录自动注册）请求头标识会员归属渠道。
+var kioskConfig = _objectSpread(_objectSpread({}, h5OnlineStoreConfig), {}, {
+  emailCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.emailCodeRegister),
+  phoneCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeRegister),
+  phoneCodeLogin: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeLogin)
 });
 
 /**
@@ -731,6 +733,16 @@ var defaultConfig = {
 /**
  * webpos 渠道配置
  */
+var webposPasswordResetOptions = {
+  prefix: false,
+  isDefaultSaasDomain: true,
+  cache: false,
+  noToast: true,
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json'
+  }
+};
 var webposConfig = {
   sendEmailVerificationCode: {
     url: '/auth/email/register-code',
@@ -883,15 +895,23 @@ var webposConfig = {
     }
   },
   checkEmailCode: {
-    url: '/auth/email/check-email-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/verify',
+    method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email,
-        code: params.code,
-        action: params.action
+        code: params.code
       };
-    }
+    },
+    // SaaS 成功时 data 为 null，统一为既有验证码校验返回结构。
+    transformResponse: function transformResponse(response) {
+      return (response === null || response === void 0 ? void 0 : response.status) === true ? _objectSpread(_objectSpread({}, response), {}, {
+        data: {
+          valid: true
+        }
+      }) : response;
+    },
+    options: webposPasswordResetOptions
   },
   checkMobileCode: {
     url: '/auth/mobile/check-mobile-code',
@@ -917,13 +937,14 @@ var webposConfig = {
     }
   },
   sendPasswordResetEmail: {
-    url: '/auth/email/reset-password-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/send',
+    method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email
       };
-    }
+    },
+    options: webposPasswordResetOptions
   },
   sendPasswordResetSms: {
     url: '/auth/mobile/sms-forget',
@@ -964,15 +985,18 @@ var webposConfig = {
     }
   },
   resetPasswordByEmail: {
-    url: '/auth/email/reset-password',
+    url: '/tenant/account/reset-password/email-code',
     method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email,
         password: params.password,
-        code: params.code
+        code: params.code,
+        // 页面先校验两次输入完全一致，SDK 保持原有重置参数。
+        password_confirmation: params.password
       };
-    }
+    },
+    options: webposPasswordResetOptions
   },
   resetPasswordByPhone: {
     url: '/auth/mobile/reset-password',

package/dist/solution/RegisterAndLogin/index.d.ts

@@ -4,6 +4,8 @@ import { RegisterParams, LoginParams, OAuthLoginParams, SendVerificationCodePara
 import { ApiCaller } from './config';
 export * from './types';
 export * from './config';
+export { validatePassword } from './utils';
+export type { PasswordValidationOptions } from './utils';
 /**
  * 注册登录解决方案实现
  */

package/dist/solution/RegisterAndLogin/index.js

@@ -22,7 +22,7 @@ import { RegisterAndLoginHooks, VerificationCodeType, VerificationPurpose } from
 import { createApiCaller } from "./config";
 export * from "./types";
 export * from "./config";
-
+export { validatePassword } from "./utils";
 /**
  * 注册登录解决方案实现
  */

package/dist/solution/RegisterAndLogin/utils.d.ts

@@ -10,10 +10,18 @@ export declare function validateEmail(email: string): boolean;
  * 验证手机号格式（支持多种国际格式）
  */
 export declare function validatePhone(phone: string): boolean;
-/**
- * 验证密码强度
- */
-export declare function validatePassword(password: string): {
+export interface PasswordValidationOptions {
+    minLength?: number;
+    maxLength?: number;
+    requireLowercase?: boolean;
+    requireUppercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+    specialCharactersPattern?: RegExp;
+    messages?: Partial<Record<'minLength' | 'maxLength' | 'requireLowercase' | 'requireUppercase' | 'requireNumber' | 'requireSpecialCharacters', string>>;
+}
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+export declare function validatePassword(password: string, options?: PasswordValidationOptions): {
     isValid: boolean;
     errors: string[];
 };

package/dist/solution/RegisterAndLogin/utils.js

@@ -33,29 +33,49 @@ export function validatePhone(phone) {
   var phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
-
-/**
- * 验证密码强度
- */
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
 export function validatePassword(password) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var errors = [];
-  if (password.length < 8) {
-    errors.push('密码长度至少为8位');
+  var _options$minLength = options.minLength,
+    minLength = _options$minLength === void 0 ? 8 : _options$minLength,
+    _options$maxLength = options.maxLength,
+    maxLength = _options$maxLength === void 0 ? 128 : _options$maxLength,
+    _options$requireLower = options.requireLowercase,
+    requireLowercase = _options$requireLower === void 0 ? true : _options$requireLower,
+    _options$requireUpper = options.requireUppercase,
+    requireUppercase = _options$requireUpper === void 0 ? true : _options$requireUpper,
+    _options$requireNumbe = options.requireNumber,
+    requireNumber = _options$requireNumbe === void 0 ? true : _options$requireNumbe,
+    _options$requireSpeci = options.requireSpecialCharacters,
+    requireSpecialCharacters = _options$requireSpeci === void 0 ? true : _options$requireSpeci,
+    _options$specialChara = options.specialCharactersPattern,
+    specialCharactersPattern = _options$specialChara === void 0 ? /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/ : _options$specialChara,
+    _options$messages = options.messages,
+    messages = _options$messages === void 0 ? {} : _options$messages;
+  if (password.length < minLength) {
+    var _messages$minLength;
+    errors.push((_messages$minLength = messages.minLength) !== null && _messages$minLength !== void 0 ? _messages$minLength : "\u5BC6\u7801\u957F\u5EA6\u81F3\u5C11\u4E3A".concat(minLength, "\u4F4D"));
   }
-  if (password.length > 128) {
-    errors.push('密码长度不能超过128位');
+  if (password.length > maxLength) {
+    var _messages$maxLength;
+    errors.push((_messages$maxLength = messages.maxLength) !== null && _messages$maxLength !== void 0 ? _messages$maxLength : "\u5BC6\u7801\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7".concat(maxLength, "\u4F4D"));
   }
-  if (!/[a-z]/.test(password)) {
-    errors.push('密码必须包含至少一个小写字母');
+  if (requireLowercase && !/[a-z]/.test(password)) {
+    var _messages$requireLowe;
+    errors.push((_messages$requireLowe = messages.requireLowercase) !== null && _messages$requireLowe !== void 0 ? _messages$requireLowe : '密码必须包含至少一个小写字母');
   }
-  if (!/[A-Z]/.test(password)) {
-    errors.push('密码必须包含至少一个大写字母');
+  if (requireUppercase && !/[A-Z]/.test(password)) {
+    var _messages$requireUppe;
+    errors.push((_messages$requireUppe = messages.requireUppercase) !== null && _messages$requireUppe !== void 0 ? _messages$requireUppe : '密码必须包含至少一个大写字母');
   }
-  if (!/\d/.test(password)) {
-    errors.push('密码必须包含至少一个数字');
+  if (requireNumber && !/\d/.test(password)) {
+    var _messages$requireNumb;
+    errors.push((_messages$requireNumb = messages.requireNumber) !== null && _messages$requireNumb !== void 0 ? _messages$requireNumb : '密码必须包含至少一个数字');
   }
-  if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push('密码必须包含至少一个特殊字符');
+  if (requireSpecialCharacters && !specialCharactersPattern.test(password)) {
+    var _messages$requireSpec;
+    errors.push((_messages$requireSpec = messages.requireSpecialCharacters) !== null && _messages$requireSpec !== void 0 ? _messages$requireSpec : '密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,

package/dist/solution/Sales/index.d.ts

@@ -105,6 +105,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+    private sortCompletedBookings;
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
     private sortUnpaidBookings;
     /**

package/dist/solution/Sales/index.js

@@ -760,6 +760,20 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+  }, {
+    key: "sortCompletedBookings",
+    value: function sortCompletedBookings(bookings) {
+      var createdAt = function createdAt(booking) {
+        var _booking$order3;
+        var timestamp = dayjs(((_booking$order3 = booking.order) === null || _booking$order3 === void 0 ? void 0 : _booking$order3.created_at) || '').valueOf();
+        return Number.isFinite(timestamp) ? timestamp : 0;
+      };
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        return createdAt(right) - createdAt(left);
+      });
+    }
+
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
   }, {
     key: "sortUnpaidBookings",
@@ -1260,7 +1274,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
                 includeAllFuture: true
               });
-              completedBookings = completedBookingList.map(function (booking) {
+              completedBookings = this.sortCompletedBookings(completedBookingList).map(function (booking) {
                 return _objectSpread(_objectSpread({}, booking), {}, {
                   status: 'compelete',
                   isTimeout: false,

package/dist/solution/UnifiedBookingSales/index.js

@@ -304,10 +304,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   var _product$cartDetailVa, _product$_extend;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/ResourcePlanner/planner.js

@@ -412,7 +412,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
   };
 }
 function normalizeRequirementGroup(product, requirementGroup) {
-  const resourceType = 'single';
+  const resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   const required = requirementGroup.required !== false;
   const min = required ? 1 : 0;
   return {
@@ -457,7 +457,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(resource => ({
     ...resource,
-    resourceType: 'single',
+    resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
     capacity: Math.max(1, Number(resource.capacity || 1) || 1),
     windows: (resource.windows || []).map(window => ({
       ...window
@@ -573,7 +573,8 @@ function buildCells(projection) {
             occupancy
           }) => occupancy) : [];
           const usedCapacity = segmentOccupancies.reduce((sum, occupancy) => sum + Math.max(1, Number(occupancy.pax || 1) || 1), 0);
-          const remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          const remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           const requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           const reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(occupancy => {
             const source = occupancy.source || 'remote';
@@ -607,7 +608,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -615,7 +616,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1500,7 +1501,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: resource.raw?.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: isPast ? ['past'] : [...(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), 'outside_resource_window']
@@ -1524,7 +1525,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: resource.raw?.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status,
         remainingCapacity,
         maxCapacity,
@@ -2008,7 +2009,8 @@ function validateAvailabilitySelection(projection, params, runtimeOptions = {})
       const remainingCapacity = matchedCell?.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         const capacityPerBooking = normalizedPartySize ?? 1;
-        const availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/RegisterAndLogin/config.js

@@ -305,24 +305,29 @@ function withH5AuthPrefix(config) {
   return nextConfig;
 }
 const h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
+function withKioskSalesChannel(config) {
+  return {
+    ...config,
+    options: params => {
+      const options = (typeof config.options === 'function' ? config.options(params) : config.options) || {};
+      const headers = typeof options.headers === 'function' ? options.headers(params) : options.headers;
+      return {
+        ...options,
+        headers: {
+          ...headers,
+          'Sales-Channel': 'kiosk'
+        }
+      };
+    }
+  };
+}
 
-// Kiosk 复用网店顾客认证接口，通过注册参数独立标识会员归属渠道。
+// Kiosk 复用网店顾客认证接口，通过注册（含验证码登录自动注册）请求头标识会员归属渠道。
 const kioskConfig = {
   ...h5OnlineStoreConfig,
-  emailCodeRegister: {
-    ...h5OnlineStoreConfig.emailCodeRegister,
-    transformParams: params => ({
-      ...h5OnlineStoreConfig.emailCodeRegister.transformParams(params),
-      login_channel: 'kiosk'
-    })
-  },
-  phoneCodeRegister: {
-    ...h5OnlineStoreConfig.phoneCodeRegister,
-    transformParams: params => ({
-      ...h5OnlineStoreConfig.phoneCodeRegister.transformParams(params),
-      login_channel: 'kiosk'
-    })
-  }
+  emailCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.emailCodeRegister),
+  phoneCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeRegister),
+  phoneCodeLogin: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeLogin)
 };
 
 /**
@@ -583,6 +588,16 @@ const defaultConfig = {
 /**
  * webpos 渠道配置
  */
+const webposPasswordResetOptions = {
+  prefix: false,
+  isDefaultSaasDomain: true,
+  cache: false,
+  noToast: true,
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json'
+  }
+};
 const webposConfig = {
   sendEmailVerificationCode: {
     url: '/auth/email/register-code',
@@ -705,13 +720,20 @@ const webposConfig = {
     })
   },
   checkEmailCode: {
-    url: '/auth/email/check-email-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/verify',
+    method: 'POST',
     transformParams: params => ({
       email: params.email,
-      code: params.code,
-      action: params.action
-    })
+      code: params.code
+    }),
+    // SaaS 成功时 data 为 null，统一为既有验证码校验返回结构。
+    transformResponse: response => response?.status === true ? {
+      ...response,
+      data: {
+        valid: true
+      }
+    } : response,
+    options: webposPasswordResetOptions
   },
   checkMobileCode: {
     url: '/auth/mobile/check-mobile-code',
@@ -733,11 +755,12 @@ const webposConfig = {
     })
   },
   sendPasswordResetEmail: {
-    url: '/auth/email/reset-password-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/send',
+    method: 'POST',
     transformParams: params => ({
       email: params.email
-    })
+    }),
+    options: webposPasswordResetOptions
   },
   sendPasswordResetSms: {
     url: '/auth/mobile/sms-forget',
@@ -770,13 +793,16 @@ const webposConfig = {
     })
   },
   resetPasswordByEmail: {
-    url: '/auth/email/reset-password',
+    url: '/tenant/account/reset-password/email-code',
     method: 'POST',
     transformParams: params => ({
       email: params.email,
       password: params.password,
-      code: params.code
-    })
+      code: params.code,
+      // 页面先校验两次输入完全一致，SDK 保持原有重置参数。
+      password_confirmation: params.password
+    }),
+    options: webposPasswordResetOptions
   },
   resetPasswordByPhone: {
     url: '/auth/mobile/reset-password',

package/lib/solution/RegisterAndLogin/index.d.ts

@@ -4,6 +4,8 @@ import { RegisterParams, LoginParams, OAuthLoginParams, SendVerificationCodePara
 import { ApiCaller } from './config';
 export * from './types';
 export * from './config';
+export { validatePassword } from './utils';
+export type { PasswordValidationOptions } from './utils';
 /**
  * 注册登录解决方案实现
  */

package/lib/solution/RegisterAndLogin/index.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  RegisterAndLoginImpl: true
+  RegisterAndLoginImpl: true,
+  validatePassword: true
 };
 exports.RegisterAndLoginImpl = void 0;
+Object.defineProperty(exports, "validatePassword", {
+  enumerable: true,
+  get: function () {
+    return _utils.validatePassword;
+  }
+});
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -32,6 +39,7 @@ Object.keys(_config).forEach(function (key) {
     }
   });
 });
+var _utils = require("./utils");
 /**
  * 注册登录解决方案实现
  */

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

@@ -10,10 +10,18 @@ export declare function validateEmail(email: string): boolean;
  * 验证手机号格式（支持多种国际格式）
  */
 export declare function validatePhone(phone: string): boolean;
-/**
- * 验证密码强度
- */
-export declare function validatePassword(password: string): {
+export interface PasswordValidationOptions {
+    minLength?: number;
+    maxLength?: number;
+    requireLowercase?: boolean;
+    requireUppercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+    specialCharactersPattern?: RegExp;
+    messages?: Partial<Record<'minLength' | 'maxLength' | 'requireLowercase' | 'requireUppercase' | 'requireNumber' | 'requireSpecialCharacters', string>>;
+}
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+export declare function validatePassword(password: string, options?: PasswordValidationOptions): {
     isValid: boolean;
     errors: string[];
 };

package/lib/solution/RegisterAndLogin/utils.js

@@ -49,29 +49,36 @@ function validatePhone(phone) {
   const phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
-
-/**
- * 验证密码强度
- */
-function validatePassword(password) {
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+function validatePassword(password, options = {}) {
   const errors = [];
-  if (password.length < 8) {
-    errors.push('密码长度至少为8位');
+  const {
+    minLength = 8,
+    maxLength = 128,
+    requireLowercase = true,
+    requireUppercase = true,
+    requireNumber = true,
+    requireSpecialCharacters = true,
+    specialCharactersPattern = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/,
+    messages = {}
+  } = options;
+  if (password.length < minLength) {
+    errors.push(messages.minLength ?? `密码长度至少为${minLength}位`);
   }
-  if (password.length > 128) {
-    errors.push('密码长度不能超过128位');
+  if (password.length > maxLength) {
+    errors.push(messages.maxLength ?? `密码长度不能超过${maxLength}位`);
   }
-  if (!/[a-z]/.test(password)) {
-    errors.push('密码必须包含至少一个小写字母');
+  if (requireLowercase && !/[a-z]/.test(password)) {
+    errors.push(messages.requireLowercase ?? '密码必须包含至少一个小写字母');
   }
-  if (!/[A-Z]/.test(password)) {
-    errors.push('密码必须包含至少一个大写字母');
+  if (requireUppercase && !/[A-Z]/.test(password)) {
+    errors.push(messages.requireUppercase ?? '密码必须包含至少一个大写字母');
   }
-  if (!/\d/.test(password)) {
-    errors.push('密码必须包含至少一个数字');
+  if (requireNumber && !/\d/.test(password)) {
+    errors.push(messages.requireNumber ?? '密码必须包含至少一个数字');
   }
-  if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push('密码必须包含至少一个特殊字符');
+  if (requireSpecialCharacters && !specialCharactersPattern.test(password)) {
+    errors.push(messages.requireSpecialCharacters ?? '密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,

package/lib/solution/Sales/index.d.ts

@@ -105,6 +105,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+    private sortCompletedBookings;
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
     private sortUnpaidBookings;
     /**

package/lib/solution/Sales/index.js

@@ -507,6 +507,15 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+  sortCompletedBookings(bookings) {
+    const createdAt = booking => {
+      const timestamp = (0, _dayjs.default)(booking.order?.created_at || '').valueOf();
+      return Number.isFinite(timestamp) ? timestamp : 0;
+    };
+    return [...bookings].sort((left, right) => createdAt(right) - createdAt(left));
+  }
+
   /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
   sortUnpaidBookings(bookings, currentBookings) {
     const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
@@ -881,7 +890,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     const bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
       includeAllFuture: true
     });
-    const completedBookings = completedBookingList.map(booking => {
+    const completedBookings = this.sortCompletedBookings(completedBookingList).map(booking => {
       return {
         ...booking,
         status: 'compelete',

package/lib/solution/UnifiedBookingSales/index.js

@@ -283,10 +283,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   if (product.duration || product.service_duration) return 'duration';

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.136",
+  "version": "2.3.138",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",