@pisell/pisellos 0.10.60 → 0.10.61

package/dist/modules/Discount/index.js

@@ -266,6 +266,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               _context5.next = 3;
               return this.request.get("/machinecode/batch-search", _objectSpread(_objectSpread({
                 code: code,
+                resolve_ticket_order: 1,
                 translate_flag: 1,
                 tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
                 // available: 1,

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

@@ -609,7 +609,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;

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 | 1 | 2 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -465,7 +465,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -5,7 +5,7 @@ import type { OrderProduct, OrderProductIdentity, AddProductBookingInput } from
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 export type AddProductDecision = {

package/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -8,12 +8,13 @@ import dayjs from 'dayjs';
 import { cacheItemToBookingInput, derivePresetStartTimeFromDate, getProductExtend, getIsAutoClose, isSessionProduct, isBookingProduct, applySessionTimesToExtend, hasActualResourceSelection, productNeedsResourceExtend } from "../../../modules/BookingContext";
 import { transformBaseProductToOrderProduct } from "../../BaseSales/utils/transformBaseProductToOrderProduct";
 import { buildProductSkuFromCacheItem } from "./weighingProductSku";
+import { isSelfServicePlatform } from "../../../utils/platform";
 
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 
@@ -30,11 +31,11 @@ function needsSpecDetailModal(item) {
 }
 
 /**
- * 第二段：预约商品是否仍需打开资源 / 时间编辑（kiosk 强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
+ * 第二段：预约商品是否仍需打开资源 / 时间编辑（自助终端强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
  */
 function needsBookingEdit(cacheItem, ctx) {
   if (isNormalBookingProduct(cacheItem)) return false;
-  if ((ctx === null || ctx === void 0 ? void 0 : ctx.channel) === 'kiosk') return true;
+  if (isSelfServicePlatform(ctx === null || ctx === void 0 ? void 0 : ctx.channel)) return true;
   var isAutoAllocationOn = (ctx === null || ctx === void 0 ? void 0 : ctx.isAutoAllocationOn) || function () {
     return true;
   };

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -13,6 +13,7 @@ export var searchWalletPass = /*#__PURE__*/function () {
         case 0:
           params = {
             code: code,
+            resolve_ticket_order: 1,
             translate_flag: 1,
             // 翻译识别码名称 0:不翻译 1:翻译
             relation_product: 1,

package/dist/solution/BookingTicket/utils/scan/handleScan.js

@@ -10,6 +10,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { searchWalletPass, searchWallet, searchProduct, searchOrder } from "./cloudSearch";
 import scanCache from "./scanCache";
+import { isSelfServicePlatform } from "../../../../utils/platform";
 
 /**
  * Promise.any 的替代实现
@@ -161,7 +162,7 @@ export var handleGlobalScan = function handleGlobalScan(request, localSearch, ch
     if (value.startsWith('WL')) {
       requestList = [searchWallet(request, value)];
     } else {
-      requestList = [].concat(_toConsumableArray(channel === 'kiosk' ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
+      requestList = [].concat(_toConsumableArray(isSelfServicePlatform(channel) ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
     }
     return requestList;
   };

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

@@ -145,7 +145,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;

package/dist/solution/UnifiedBookingSales/index.js

@@ -45,7 +45,7 @@ import { AvailabilityRemoteOccupancyCache } from "./remoteOccupancyCache";
 import { BusinessAvailabilityController } from "./businessAvailability";
 import { BookingTicket } from "../BookingTicket";
 import { addLocalCalendarDays, captureRuntimeOffsetMinutes, formatLocalDate, formatLocalDateTime, formatLocalTime, localDateTimeToScalar, localDateToScalar, localDateToScalarStart, parseLocalDate, parseLocalDateTime } from "../../modules/ResourcePlanner/localClock";
-import { isCustomerUserPlatform, normalizeRuntimePlatform } from "../../utils/platform";
+import { isCustomerUserPlatform, isSelfServicePlatform, normalizeRuntimePlatform } from "../../utils/platform";
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
 export { AvailabilityError } from "../../modules/ResourcePlanner";
@@ -2005,7 +2005,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
   }, {
@@ -2015,7 +2015,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
       var configured = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.checkoutSyncTaskEnabled;
       if (configured === true) return true;
       var platform = normalizeRuntimePlatform((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform);
-      return !isCustomerUserPlatform(platform) && platform !== 'kiosk';
+      return !isCustomerUserPlatform(platform) && !isSelfServicePlatform(platform);
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -2838,7 +2838,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               throw new Error('[UnifiedBookingSales] getProtocol 需要 policyId');
             case 3:
               policyUrl = 'shop-policy';
-              if (this.otherParams.platform === 'kiosk' || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
+              if (isSelfServicePlatform(this.otherParams.platform) || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
                 policyUrl = 'policy';
               }
               return _context23.abrupt("return", this.request.get("/".concat(policyUrl, "/").concat(encodeURIComponent(normalizedPolicyId))));

package/dist/utils/platform.d.ts

@@ -6,3 +6,5 @@ export declare function normalizeRuntimePlatform(platform: unknown): string;
  * PC and H5 are authenticated-customer clients rather than staff terminals.
  */
 export declare function isCustomerUserPlatform(platform: unknown): boolean;
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+export declare function isSelfServicePlatform(platform: unknown): boolean;

package/dist/utils/platform.js

@@ -1,4 +1,5 @@
 var CUSTOMER_USER_PLATFORMS = new Set(['pc', 'h5']);
+var SELF_SERVICE_PLATFORMS = new Set(['kiosk', 'vending']);
 
 /**
  * Normalize the runtime platform passed through solution/module otherParams.
@@ -12,4 +13,9 @@ export function normalizeRuntimePlatform(platform) {
  */
 export function isCustomerUserPlatform(platform) {
   return CUSTOMER_USER_PLATFORMS.has(normalizeRuntimePlatform(platform));
+}
+
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+export function isSelfServicePlatform(platform) {
+  return SELF_SERVICE_PLATFORMS.has(normalizeRuntimePlatform(platform));
 }

package/lib/modules/Discount/index.js

@@ -142,6 +142,7 @@ class DiscountModule extends _BaseModule.BaseModule {
     } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
+      resolve_ticket_order: 1,
       translate_flag: 1,
       tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
       // available: 1,

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

@@ -609,7 +609,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;

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 | 1 | 2 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -465,7 +465,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -5,7 +5,7 @@ import type { OrderProduct, OrderProductIdentity, AddProductBookingInput } from
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 export type AddProductDecision = {

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -17,12 +17,13 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _BookingContext = require("../../../modules/BookingContext");
 var _transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
 var _weighingProductSku = require("./weighingProductSku");
+var _platform = require("../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 
@@ -39,11 +40,11 @@ function needsSpecDetailModal(item) {
 }
 
 /**
- * 第二段：预约商品是否仍需打开资源 / 时间编辑（kiosk 强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
+ * 第二段：预约商品是否仍需打开资源 / 时间编辑（自助终端强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
  */
 function needsBookingEdit(cacheItem, ctx) {
   if (isNormalBookingProduct(cacheItem)) return false;
-  if (ctx?.channel === 'kiosk') return true;
+  if ((0, _platform.isSelfServicePlatform)(ctx?.channel)) return true;
   const isAutoAllocationOn = ctx?.isAutoAllocationOn || (() => true);
   return !(0, _BookingContext.getIsAutoClose)(cacheItem, isAutoAllocationOn);
 }

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -10,6 +10,7 @@ exports.searchWalletPass = exports.searchWallet = exports.searchProduct = export
 const searchWalletPass = async (request, code) => {
   const params = {
     code,
+    resolve_ticket_order: 1,
     translate_flag: 1,
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,

package/lib/solution/BookingTicket/utils/scan/handleScan.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleUniversalScan = exports.handleGlobalScan = exports.handleCustomerScan = void 0;
 var _cloudSearch = require("./cloudSearch");
 var _scanCache = _interopRequireDefault(require("./scanCache"));
+var _platform = require("../../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Promise.any 的替代实现
@@ -107,7 +108,7 @@ const handleGlobalScan = (request, localSearch, channel) => {
     if (value.startsWith('WL')) {
       requestList = [(0, _cloudSearch.searchWallet)(request, value)];
     } else {
-      requestList = [...(channel === 'kiosk' ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
+      requestList = [...((0, _platform.isSelfServicePlatform)(channel) ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
     }
     return requestList;
   };

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

@@ -145,7 +145,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;

package/lib/solution/UnifiedBookingSales/index.js

@@ -1653,14 +1653,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
 
   /**
-   * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+   * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
    * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
    */
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
     if (configured === true) return true;
     const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
-    return !(0, _platform.isCustomerUserPlatform)(platform) && platform !== 'kiosk';
+    return !(0, _platform.isCustomerUserPlatform)(platform) && !(0, _platform.isSelfServicePlatform)(platform);
   }
 
   /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -2017,7 +2017,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       throw new Error('[UnifiedBookingSales] getProtocol 需要 policyId');
     }
     let policyUrl = 'shop-policy';
-    if (this.otherParams.platform === 'kiosk' || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
+    if ((0, _platform.isSelfServicePlatform)(this.otherParams.platform) || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
       policyUrl = 'policy';
     }
     return this.request.get(`/${policyUrl}/${encodeURIComponent(normalizedPolicyId)}`);

package/lib/utils/platform.d.ts

@@ -6,3 +6,5 @@ export declare function normalizeRuntimePlatform(platform: unknown): string;
  * PC and H5 are authenticated-customer clients rather than staff terminals.
  */
 export declare function isCustomerUserPlatform(platform: unknown): boolean;
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+export declare function isSelfServicePlatform(platform: unknown): boolean;

package/lib/utils/platform.js

@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isCustomerUserPlatform = isCustomerUserPlatform;
+exports.isSelfServicePlatform = isSelfServicePlatform;
 exports.normalizeRuntimePlatform = normalizeRuntimePlatform;
 const CUSTOMER_USER_PLATFORMS = new Set(['pc', 'h5']);
+const SELF_SERVICE_PLATFORMS = new Set(['kiosk', 'vending']);
 
 /**
  * Normalize the runtime platform passed through solution/module otherParams.
@@ -19,4 +21,9 @@ function normalizeRuntimePlatform(platform) {
  */
 function isCustomerUserPlatform(platform) {
   return CUSTOMER_USER_PLATFORMS.has(normalizeRuntimePlatform(platform));
+}
+
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+function isSelfServicePlatform(platform) {
+  return SELF_SERVICE_PLATFORMS.has(normalizeRuntimePlatform(platform));
 }

package/package.json

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