@pisell/pisellos 0.10.39 → 0.10.41

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

@@ -123,8 +123,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/dist/solution/UnifiedBookingSales/index.js

@@ -44,7 +44,7 @@ import { UnifiedBookingSalesHooks } from "./types";
 import { AvailabilityRemoteOccupancyCache } from "./remoteOccupancyCache";
 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 } from "../../utils/platform";
 export * from "./types";
 export { AvailabilityError } from "../../modules/ResourcePlanner";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'basic', 'checkout', 'availability', 'documents'];
@@ -1830,17 +1830,17 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
   }, {
     key: "shouldUseCheckoutSyncTask",
     value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams13, _this$otherParams14;
+      var _this$otherParams13, _this$otherParams$pla, _this$otherParams14;
       var configured = (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.checkoutSyncTaskEnabled;
       if (configured === true) return true;
-      var platform = normalizeRuntimePlatform((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.platform);
-      return platform !== 'h5' && platform !== 'kiosk';
+      var platform = String((_this$otherParams$pla = (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase();
+      return !isCustomerUserPlatform(platform) && platform !== 'kiosk';
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -4282,7 +4282,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "getProductTimeRanges",
     value: (function () {
       var _getProductTimeRanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(contextId) {
-        var _this$otherParams$pla,
+        var _this$otherParams$pla2,
           _this$otherParams20,
           _this9 = this;
         var request,
@@ -4304,7 +4304,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               context = _yield$this$ensureAva.context;
               projectionEntry = _yield$this$ensureAva.projectionEntry;
               contextVersion = context.activeVersion;
-              isPosAvailabilityRequest = String((_this$otherParams$pla = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
+              isPosAvailabilityRequest = String((_this$otherParams$pla2 = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
               allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
                 return Array.isArray(startTimes) && startTimes.length > 0;
               });
@@ -4456,7 +4456,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams21, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla3, _this$otherParams21, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -4686,7 +4686,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
               candidateStartTime = getCandidateStartTime(params.candidate);
-              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
+              allowPosAvailabilityOverride = String((_this$otherParams$pla3 = (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform) !== null && _this$otherParams$pla3 !== void 0 ? _this$otherParams$pla3 : '').trim().toLowerCase() === 'pos';
               refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {

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/BookingContext/index.js

@@ -171,9 +171,9 @@ function buildBookingConfigQueryKey(params = {}) {
   return JSON.stringify(sorted);
 }
 function resolveBookingConfigRequest(platform, params = {}) {
-  const isH5 = (0, _platform.normalizeRuntimePlatform)(platform) === 'h5';
-  const endpoint = isH5 ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
-  const query = isH5 ? {
+  const isCustomerPlatform = (0, _platform.isCustomerUserPlatform)(platform);
+  const endpoint = isCustomerPlatform ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
+  const query = isCustomerPlatform ? {
     item_type: params.item_type || DEFAULT_BOOKING_CONFIG_PARAMS.item_type
   } : {
     ...DEFAULT_BOOKING_CONFIG_PARAMS,

package/lib/modules/Customer/index.js

@@ -153,7 +153,10 @@ class CustomerModule extends _BaseModule.BaseModule {
       ...(search && {
         search
       }),
-      ..._otherParams
+      ..._otherParams,
+      ...(url === '/customer/select-list' ? {
+        with_franchisor_data: 1
+      } : {})
     };
     const res = await this.request.get(url, queryParams, {
       cache: {

package/lib/modules/Customer/types.d.ts

@@ -50,6 +50,8 @@ export interface ShopGetCustomerListParams {
     search_wallet_flag?: 0 | 1;
     /** wallet pass搜索标识 */
     search_wallet_pass_flag?: 0 | 1;
+    /** 是否查询连锁加盟组合店铺数据 */
+    with_franchisor_data?: boolean | 0 | 1;
     /** 其他筛选参数 */
     [key: string]: any;
 }

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

@@ -412,6 +412,8 @@ export interface WalletAssetsBehaviorOptions {
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
+    /** 客户变化时，仅保留与本次扫码匹配的搜索结果；其他搜索缓存仍会清空。 */
+    retainSearchResultCodes?: string[];
 }
 export interface SelectWalletAssetOptions {
     selected: boolean;
@@ -419,6 +421,8 @@ export interface SelectWalletAssetOptions {
 }
 export interface ScanWalletAssetResult {
     type: SearchIdentificationCodeResult['type'];
+    /** walletCode 时保留完整 Wallet Detail，供客户解析与客户选择器使用。 */
+    data?: WalletDetailSearchData;
     asset?: any;
     selected: boolean;
     state: WalletAssetsState;
@@ -864,6 +868,8 @@ export interface SearchIdentificationCodeParams extends WalletDeductionRecommend
  * 搜索识别码响应数据
  */
 export interface SearchIdentificationCodeResponse {
+    /** 业务是否成功 */
+    status?: boolean;
     /** 响应状态码 */
     code?: number;
     /** 响应消息 */
@@ -871,12 +877,26 @@ export interface SearchIdentificationCodeResponse {
     /** 响应数据 */
     data?: SearchIdentificationCodeItem[];
 }
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
+export interface WalletDetailSearchData {
+    id?: string | number;
+    customer_id?: string | number;
+    customer?: Record<string, any> | null;
+    is_cross_shop_wallet?: boolean | 0 | 1;
+    [key: string]: any;
+}
+export interface WalletDetailSearchResponse {
+    status?: boolean;
+    code?: number;
+    message?: string;
+    data?: WalletDetailSearchData | null;
+}
 /**
  * 搜索识别码结果类型
  */
 export type SearchIdentificationCodeResult = {
     type: 'walletCode';
-    data: SearchIdentificationCodeItem[];
+    data: WalletDetailSearchData;
 } | {
     type: 'normalCode';
     data: SearchIdentificationCodeItem[];

package/lib/modules/Payment/types.js

@@ -221,6 +221,7 @@ let PaymentHooks = exports.PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
 /**
  * 搜索识别码响应数据
  */
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
 /**
  * 搜索识别码结果类型
  */

package/lib/modules/Payment/walletpass.d.ts

@@ -96,7 +96,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
-     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+     * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
      */
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;

package/lib/modules/Payment/walletpass.js

@@ -705,7 +705,7 @@ class WalletPassPaymentImpl {
    * 搜索识别码信息
    * 通过识别码搜索相关的钱包通行证信息
    * 基于 WalletDeductionRecommendParams 参数结构
-   * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+   * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
    */
   async searchIdentificationCodeAsync(params, config = {}) {
     try {
@@ -725,6 +725,7 @@ class WalletPassPaymentImpl {
         const walletDetailParams = {
           code: code,
           with_customer: 1,
+          with_franchisor_data: 1,
           with: ['wallet']
         };
         this.paymentModule.logInfo('[WalletPass] 搜索钱包识别码', {
@@ -733,15 +734,18 @@ class WalletPassPaymentImpl {
           with: walletDetailParams.with
         });
         const response = await this.paymentModule.request.post('/wallet/detail/search', walletDetailParams);
-        const searchResults = response?.data || [];
+        const walletDetail = response?.data;
+        if (response?.status !== true || response?.code !== 200 || !walletDetail || typeof walletDetail !== 'object' || Array.isArray(walletDetail)) {
+          throw new Error(response?.message || 'Wallet detail search failed');
+        }
         this.paymentModule.logInfo('[WalletPass] 钱包识别码搜索完成', {
           code: code,
-          results_count: searchResults.length,
+          results_count: 1,
           type: 'walletCode'
         });
         return {
           type: 'walletCode',
-          data: searchResults
+          data: walletDetail
         };
       }
 
@@ -830,9 +834,16 @@ class WalletPassPaymentImpl {
     const previousCustomerId = this.walletAssetsState.customerId;
     const customerChanged = String(previousCustomerId ?? '') !== String(nextCustomerId ?? '');
     const preserveSelection = options.preserveSelection !== false && !customerChanged;
+    const retainedSearchCodeKeys = new Set((options.retainSearchResultCodes || []).map(normalizeWalletAssetCode).filter(Boolean));
+    const retainedSearchResults = customerChanged && retainedSearchCodeKeys.size > 0 ? this.searchResults.filter(item => isWalletPaymentAsset(item) && getWalletAssetCodeKeys(item).some(code => retainedSearchCodeKeys.has(code))) : [];
     if (customerChanged) {
       this.clearSearchResults();
+      if (retainedSearchResults.length > 0) {
+        this.searchResults = mergeWalletAssets(retainedSearchResults);
+        this.queuePendingAutoSelectForAssets(retainedSearchResults);
+      }
     }
+    const preserveSearchContext = preserveSelection || retainedSearchResults.length > 0;
     const committedKeys = new Set(this.walletAssetsState.committedIds.map(id => String(id)));
     const committedItems = this.walletAssetsState.items.filter(item => committedKeys.has(getWalletAssetKey(item)));
     const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
@@ -901,8 +912,8 @@ class WalletPassPaymentImpl {
       error: null
     });
     try {
-      const searchedWalletAssetCodes = preserveSelection ? this.getSearchedWalletAssetCodes() : [];
-      const useAggregateRecalculate = preserveSelection && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
+      const searchedWalletAssetCodes = preserveSearchContext ? this.getSearchedWalletAssetCodes() : [];
+      const useAggregateRecalculate = preserveSearchContext && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
       const aggregateResult = useAggregateRecalculate ? await this.aggregateRecalculateWalletAssetsAsync(businessData, selectedIds) : null;
       const result = aggregateResult || (await this.initializeWalletDataFromBusinessAsync(businessData));
       if (requestSequence !== this.walletAssetsRequestSequence) {
@@ -920,7 +931,7 @@ class WalletPassPaymentImpl {
           this.searchResults = this.searchResults.filter(item => !missingSelectedKeys.has(getWalletAssetKey(item)));
         }
       }
-      const searchedWalletAssets = preserveSelection ? this.syncSearchedWalletAssets([...(result.transformList || []), ...(result.noApplicableVoucher || [])]) : [];
+      const searchedWalletAssets = preserveSearchContext ? this.syncSearchedWalletAssets([...(result.transformList || []), ...(result.noApplicableVoucher || [])]) : [];
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
       }
@@ -1122,14 +1133,23 @@ class WalletPassPaymentImpl {
       code: normalizedCode,
       prepare_payments: this.formatWalletPassList2PreparePayments(this.walletAssetsState.selectedItems)
     });
+    if (result.type === 'walletCode') {
+      return {
+        type: 'walletCode',
+        data: result.data,
+        asset: result.data,
+        selected: false,
+        state: this.getWalletAssetsState()
+      };
+    }
     const paymentAssets = this.formatSearchedWalletPaymentAssets(result.data.filter(isWalletPaymentAsset));
     if (paymentAssets.length > 0) {
       this.searchResults = mergeWalletAssets(this.searchResults, paymentAssets);
     }
     const asset = paymentAssets.find(item => String(item?.code || '') === normalizedCode) || paymentAssets[0];
-    if (!asset || result.type === 'walletCode') {
+    if (!asset) {
       return {
-        type: result.type,
+        type: 'normalCode',
         asset,
         selected: false,
         state: this.getWalletAssetsState()

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

@@ -397,6 +397,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     refreshWalletAssets(params?: {
         order_wait_pay_amount?: number;
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<WalletAssetsState>;
     /** 选择或取消单张钱包资产，并立即同步 pending wallet payments。 */
     selectWalletAsset(params: {

package/lib/solution/BaseSales/index.js

@@ -3013,7 +3013,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       await this.publishWalletAssetsState(clearedState);
     }
     const refreshTask = wallet.refreshWalletAssetsFromBusinessAsync(businessData, {
-      preserveSelection: params?.preserveSelection !== false && !customerChanged
+      preserveSelection: params?.preserveSelection !== false && !customerChanged,
+      retainSearchResultCodes: params?.retainSearchResultCodes
     });
     await this.publishWalletAssetsState(wallet.getWalletAssetsState());
     let state = await refreshTask;
@@ -3165,10 +3166,24 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     const beforePayments = (0, _lodashEs.cloneDeep)(this.store.order.getOrderPayments());
     const pendingWalletAmount = this.getPendingWalletPaymentAmount(beforePayments);
+    const amountSnapshot = this.store.order.getOrderAmountSnapshot?.();
     if (pendingWalletAmount.lte(0)) {
-      throw new Error('当前订单没有待确认的 Wallet 支付');
+      this.logWarning('confirmWalletPayment: 未发现待确认 Wallet 支付，跳过 Wallet 确认并按普通订单提交', {
+        amountGap: amountSnapshot?.amountGap
+      });
+      const submitResult = await this.submitSalesOrder({
+        smallTicketDataFlag: 1
+      });
+      if (isRejectedSalesSubmitResult(submitResult)) {
+        throw new Error(getSalesSubmitErrorMessage(submitResult, '订单提交失败'));
+      }
+      const latestAmountSnapshot = this.store.order.getOrderAmountSnapshot?.();
+      return {
+        submitResult,
+        payments: this.store.order.getOrderPayments(),
+        isOrderFullyPaid: new _decimal.default(latestAmountSnapshot?.amountGap || 0).lte(0)
+      };
     }
-    const amountSnapshot = this.store.order.getOrderAmountSnapshot?.();
     const effectiveAmountDue = _decimal.default.max(new _decimal.default(amountSnapshot?.amountGap || 0).minus(pendingWalletAmount), 0);
     if (effectiveAmountDue.gt(0.01)) {
       throw new Error('Wallet 支付尚未覆盖全部待支付金额');

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

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

@@ -33,6 +33,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
     protected openDataTarget: string | null;
+    private readonly customerResolveRequests;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -78,10 +79,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
     /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
-    private findCustomerById;
     private normalizeCustomer;
     private getRawCustomerId;
-    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *

package/lib/solution/BookingTicket/index.js

@@ -164,6 +164,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
   openDataTarget = null;
+  customerResolveRequests = new Map();
 
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -442,7 +443,15 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
 
     // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
     if (!hasOrderCustomer && extractedCustomerId && !isUserPlatform) {
-      await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+      try {
+        await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+      } catch (error) {
+        // 客户映射失败不能阻断原有 Pass 的可用性、展示或优惠处理。
+        console.warn('[BookingTicket] scan discount customer resolve failed', {
+          customerId: extractedCustomerId,
+          error
+        });
+      }
     }
     if (raw.isAvailable) {
       await this.store.order.recalculateSummary({
@@ -493,43 +502,39 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     return null;
   }
   async resolveCustomerById(customerId) {
-    const localCustomers = this.store.customer.getCustomers();
-    const localCustomer = this.findCustomerById(localCustomers, customerId);
-    const normalizedLocalCustomer = localCustomer ? this.normalizeCustomer(localCustomer) : null;
-    if (normalizedLocalCustomer && this.hasUsableCustomerDetails(normalizedLocalCustomer)) {
-      return normalizedLocalCustomer;
-    }
-    const result = await this.store.customer.queryCustomerList({
-      ids: [customerId],
-      skip: 1,
-      num: 1
-    });
-    const remoteCustomer = this.findCustomerById(result?.list || [], customerId) || result?.list?.[0] || null;
-    if (remoteCustomer) {
-      return this.normalizeCustomer(remoteCustomer);
-    }
-    try {
-      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
-      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
-    } catch (error) {
-      console.warn('[BookingTicket] resolveCustomerById detail request failed', {
-        customerId,
-        error
-      });
+    const rawCustomerId = String(customerId ?? '').trim();
+    const numericCustomerId = Number(rawCustomerId);
+    if (!rawCustomerId || !Number.isInteger(numericCustomerId) || numericCustomerId <= 1) {
       return null;
     }
+    const normalizedCustomerId = String(numericCustomerId);
+    const existingRequest = this.customerResolveRequests.get(normalizedCustomerId);
+    if (existingRequest) return existingRequest;
+    const request = this.request.post(`/customer/resolve/${encodeURIComponent(normalizedCustomerId)}`, {
+      with_franchisor_data: 1,
+      with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord']
+    }).then(result => {
+      const customer = result?.data;
+      const resolvedCustomerId = Number(customer && typeof customer === 'object' && !Array.isArray(customer) ? this.getRawCustomerId(customer) : NaN);
+      if (result?.status !== true || result?.code !== 200 || !customer || typeof customer !== 'object' || Array.isArray(customer) || !Number.isInteger(resolvedCustomerId) || resolvedCustomerId <= 1) {
+        const error = new Error(result?.message || 'Customer resolve failed');
+        error.code = result?.code;
+        throw error;
+      }
+      return this.normalizeCustomer(customer);
+    }).finally(() => {
+      if (this.customerResolveRequests.get(normalizedCustomerId) === request) {
+        this.customerResolveRequests.delete(normalizedCustomerId);
+      }
+    });
+    this.customerResolveRequests.set(normalizedCustomerId, request);
+    return request;
   }
 
   /** 兼容既有优惠码扫码逻辑。 */
   resolveCustomerByDiscountCustomerId(customerId) {
     return this.resolveCustomerById(customerId);
   }
-  findCustomerById(customers = [], customerId) {
-    return customers.find(customer => {
-      const rawId = this.getRawCustomerId(customer);
-      return rawId !== null && String(rawId) === String(customerId);
-    }) || null;
-  }
   normalizeCustomer(customer) {
     const raw = customer;
     const rawId = this.getRawCustomerId(customer);
@@ -547,9 +552,6 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const raw = customer;
     return customer.id ?? raw.customer_id ?? raw.customerId ?? null;
   }
-  hasUsableCustomerDetails(customer) {
-    return !!(customer.name || customer.phone || customer.email || customer.display_name || customer.customer_name);
-  }
 
   /**
    * 更新当前预约的 appointment_status。
@@ -1669,6 +1671,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       const result = await (0, _applyGlobalScan.applyGlobalScan)({
         setOrderCustomer: customer => this.setOrderCustomer(customer),
         getOrderCustomerSnapshot: () => this.getOrderCustomerSnapshot(),
+        resolveCustomerById: customerId => this.resolveCustomerById(customerId),
         getBusinessCode: () => this.otherParams?.businessCode,
         buildAddProductCtx: extra => this.buildAddProductCtx(extra),
         decideAddProduct: (item, options) => this.decideAddProduct(item, options),

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts

@@ -5,6 +5,7 @@ import { GlobalScanFormattedResult } from './formatGlobalScan';
 export interface GlobalScanApplyHost {
     setOrderCustomer(customer: ICustomer | null): void;
     getOrderCustomerSnapshot(): ICustomer | null;
+    resolveCustomerById?(customerId: string | number): Promise<ICustomer | null>;
     getBusinessCode(): string | undefined;
     buildAddProductCtx(extra?: Record<string, any>): Record<string, any>;
     decideAddProduct(item: any, options?: Record<string, any>): AddProductDecision;
@@ -26,6 +27,7 @@ export interface GlobalScanApplyHost {
     addProductToOrder(product: any, booking?: any): Promise<any>;
     refreshWalletAssets?(params?: {
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<any>;
     scanWalletAsset?(code: string): Promise<{
         type: 'walletCode' | 'normalCode';