@pisell/pisellos 2.1.109 → 2.1.111

package/lib/modules/Payment/walletpass.js

@@ -31,7 +31,6 @@ var WalletPassPaymentImpl = class {
     this.userIdentificationCodes = [];
     this.searchResults = [];
     this.walletParams = null;
-    this.walletInitData = null;
   }
   /**
    * 发送事件的辅助方法
@@ -43,9 +42,7 @@ var WalletPassPaymentImpl = class {
       const fullEventName = `${this.paymentModule.name}:${eventName}`;
       this.paymentModule.core.effects.emit(fullEventName, data);
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] 发送事件失败", error, {
-        hook
-      });
+      this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }
   }
   /**
@@ -115,10 +112,7 @@ var WalletPassPaymentImpl = class {
     if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
       return {
         walletRecommendList: [],
-        userIdentificationCodes: [],
-        transformList: [],
-        noApplicableVoucher: [],
-        products: []
+        userIdentificationCodes: []
       };
     }
     this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationStarted, {
@@ -159,28 +153,11 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      this.paymentModule.logError(
-        `[WalletPass] 从业务数据初始化钱包数据失败`,
-        error,
-        {
-          duration: `${duration}ms`,
-          customer_id: businessData.customer_id,
-          totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
-        }
-      );
-      throw error;
-    }
-  }
-  /**
-   * 获取订单基础详情
-   */
-  async getOrderBasicDetailAsync(orderId) {
-    try {
-      const response = await this.paymentModule.request.get(
-        `/order/order/${orderId}/basic-detail`
-      );
-      return (response == null ? void 0 : response.data) || {};
-    } catch (error) {
+      this.paymentModule.logError(`[WalletPass] 从业务数据初始化钱包数据失败`, error, {
+        duration: `${duration}ms`,
+        customer_id: businessData.customer_id,
+        totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
+      });
       throw error;
     }
   }
@@ -189,49 +166,19 @@ var WalletPassPaymentImpl = class {
    * 先获取推荐列表，再获取用户识别码列表（顺序执行）
    */
   async initializeWalletDataAsync(baseParams) {
-    var _a, _b;
     try {
+      const walletRecommendList = await this.getWalletPassRecommendListAsync(baseParams);
       const identificationParams = {
         ...baseParams,
         available: 2,
-        prepare_payments: [],
+        prepare_payments: this.formatWalletPassList2PreparePayments(walletRecommendList),
         other_exact_codes: [],
         filter_prepare_wallet_pass: 1
       };
-      const [allList, orderBasicDetail] = await Promise.all([
-        this.getUserIdentificationCodeListAsync(identificationParams),
-        baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
-      ]);
-      const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
-      if (!walletPassEvaluator) {
-        return {
-          walletRecommendList: [],
-          userIdentificationCodes: [],
-          transformList: [],
-          noApplicableVoucher: [],
-          products: []
-        };
-      }
-      const products = (orderBasicDetail == null ? void 0 : orderBasicDetail.detail) || baseParams.products;
-      const res = walletPassEvaluator == null ? void 0 : walletPassEvaluator.getRecommendedVouchers({
-        orderTotalAmount: baseParams.order_wait_pay_amount,
-        products,
-        vouchers: allList
-      });
-      const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
-      this.walletRecommendList = recommended;
-      this.walletInitData = {
-        transformList,
-        noApplicableVoucher,
-        products: products || []
-      };
+      const userIdentificationCodes = await this.getUserIdentificationCodeListAsync(identificationParams);
       return {
-        walletRecommendList: recommended,
-        userIdentificationCodes: allList,
-        transformList,
-        noApplicableVoucher,
-        products: products || []
+        walletRecommendList,
+        userIdentificationCodes
       };
     } catch (error) {
       this.paymentModule.logError("[WalletPass] 初始化钱包数据失败", error, {
@@ -314,14 +261,10 @@ var WalletPassPaymentImpl = class {
       });
       return this.userIdentificationCodes;
     } catch (error) {
-      this.paymentModule.logError(
-        "[WalletPass] 获取用户识别码列表失败",
-        error,
-        {
-          customer_id: params.customer_id,
-          available: params.available
-        }
-      );
+      this.paymentModule.logError("[WalletPass] 获取用户识别码列表失败", error, {
+        customer_id: params.customer_id,
+        available: params.available
+      });
       return [];
     }
   }
@@ -519,19 +462,6 @@ var WalletPassPaymentImpl = class {
     this.searchResults = [];
     this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
-  /**
-   * 获取存储的钱包初始化数据
-   */
-  getStoredWalletInitData() {
-    return this.walletInitData;
-  }
-  /**
-   * 清除存储的钱包初始化数据
-   */
-  clearStoredWalletInitData() {
-    this.walletInitData = null;
-    this.paymentModule.logInfo("[WalletPass] 钱包初始化数据已清除");
-  }
   /**
    * 清除所有缓存数据
    */
@@ -540,18 +470,11 @@ var WalletPassPaymentImpl = class {
     this.userIdentificationCodes = [];
     this.searchResults = [];
     this.walletParams = null;
-    this.walletInitData = null;
     this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
       clearedTypes: ["all"]
     });
     this.paymentModule.logInfo("[WalletPass] 所有缓存数据已清除", {
-      cleared_types: [
-        "walletRecommendList",
-        "userIdentificationCodes",
-        "searchResults",
-        "walletParams",
-        "walletInitData"
-      ]
+      cleared_types: ["walletRecommendList", "userIdentificationCodes", "searchResults", "walletParams"]
     });
   }
 };

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

@@ -1,28 +1,25 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
-import { Discount } from '../Discount/types';
-import { WindowPlugin } from '../../plugins';
+import { Discount } from "../Discount/types";
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    window: WindowPlugin;
     private hooks;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
     private checkHolderMatch;
-    getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
-        orderTotalAmount: number;
         isFormSubject: boolean;
     }): {
         isAvailable: boolean;
@@ -32,18 +29,17 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
-    calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
+    calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
         isFormSubject: boolean;
-        orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
-        selectedList?: any[];
+        selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
     /**