@pisell/pisellos 2.2.308 → 2.2.310

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

@@ -130,6 +130,19 @@ class ProductList extends _BaseModule.BaseModule {
     };
     const rawApplicationCode = this.otherParams?.channel;
     const mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
+    const configuredBusinessCode = this.otherParams?.businessCode ?? this.otherParams?.business_code;
+    // application_code 是后端商品筛选字段；智能定价评估器则只读取
+    // strategy_context 中的 channel / business_code。默认补齐两者，
+    // 但允许调用方显式传入的上下文覆盖默认值。
+    const resolvedStrategyContext = {
+      ...(mappedApplicationCode ? {
+        channel: mappedApplicationCode
+      } : {}),
+      ...(configuredBusinessCode ? {
+        business_code: configuredBusinessCode
+      } : {}),
+      ...(strategy_context || {})
+    };
     const queryPayload = {
       ...((0, _platform.isCustomerUserPlatform)(this.otherParams?.platform) ? {} : {
         open_quotation: 1
@@ -162,7 +175,7 @@ class ProductList extends _BaseModule.BaseModule {
       with_schedule,
       schedule_datetime,
       extension_type,
-      strategy_context
+      strategy_context: Object.keys(resolvedStrategyContext).length ? resolvedStrategyContext : undefined
     };
     const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     const originalCallback = options?.callback;

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

@@ -16,8 +16,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
     private normalizeHolderRecordIds;
     /**
-     * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
-     * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
      */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {