@pisell/pisellos 0.10.40 → 0.10.42

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -17,6 +17,7 @@ exports.normalizeOrderCollections = normalizeOrderCollections;
 exports.repairDuplicateProductLineIdentities = repairDuplicateProductLineIdentities;
 exports.setOrderCollectionUid = setOrderCollectionUid;
 var _lodashEs = require("lodash-es");
+var _entitlementPass = require("../../Discount/entitlementPass");
 const IDENTITY_CONFIG = {
   product: {
     persistentIdField: 'order_detail_id',
@@ -81,20 +82,22 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
-function getGoodPassResourceId(product) {
-  const goodPass = (product.discount_list || []).find(item => {
-    const type = item?.type || item?.tag || item?.discount?.type || item?.discount?.tag;
-    return type === 'good_pass';
-  });
-  if (!goodPass) return null;
-  const resourceId = goodPass.discount?.resource_id ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
-  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+function getFullCoveragePassIdentity(product) {
+  const pass = (product.discount_list || []).find(item => (0, _entitlementPass.isFullCoveragePass)(item));
+  if (!pass) return null;
+  const resourceId = pass.discount?.resource_id ?? pass.resource_id ?? pass.discount_id ?? pass.id;
+  if (isBlankOrderCollectionIdentity(resourceId)) return null;
+  return {
+    type: String(pass.type || pass.tag),
+    resourceId: String(resourceId)
+  };
 }
 function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
   const encodedOriginalUid = encodeURIComponent(originalUid);
-  const resourceId = getGoodPassResourceId(product);
-  if (resourceId) {
-    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  const passIdentity = getFullCoveragePassIdentity(product);
+  if (passIdentity) {
+    const passType = passIdentity.type === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return `os-split:product:${encodedOriginalUid}:${passType}:${encodeURIComponent(passIdentity.resourceId)}:${duplicateOrdinal}`;
   }
   return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
 }

package/lib/modules/Order/utils.js

@@ -564,6 +564,24 @@ function resolveSubmitBundleMapId(bundle) {
   }
   return undefined;
 }
+function ensureSubmitDiscountIdentity(discount) {
+  if (!discount || typeof discount !== 'object' || Array.isArray(discount)) {
+    return discount;
+  }
+  const discountRecord = discount;
+  const metadata = discountRecord.metadata && typeof discountRecord.metadata === 'object' && !Array.isArray(discountRecord.metadata) ? discountRecord.metadata : {};
+  const uniqueIdentificationNumber = metadata.unique_identification_number;
+  if (uniqueIdentificationNumber !== undefined && uniqueIdentificationNumber !== null && String(uniqueIdentificationNumber).trim() !== '') {
+    return discount;
+  }
+  return {
+    ...discountRecord,
+    metadata: {
+      ...metadata,
+      unique_identification_number: (0, _orderCollectionIdentity.createUuidV4)()
+    }
+  };
+}
 function collectSubmitProductDiscountList(product) {
   const submitDiscountList = Array.isArray(product?.discount_list) ? [...product.discount_list] : [];
   for (const bundle of product?.product_bundle || []) {
@@ -585,7 +603,7 @@ function collectSubmitProductDiscountList(product) {
       });
     }
   }
-  return normalizeOrderProductDiscountList(submitDiscountList);
+  return normalizeOrderProductDiscountList(submitDiscountList.map(ensureSubmitDiscountIdentity));
 }
 
 /**

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/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,5 @@
 import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
 export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
-export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery): AvailabilityQueryResult;
-export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams): AvailabilitySelectionValidationResult;
+export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilityQueryResult;
+export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilitySelectionValidationResult;