@pisell/pisellos 2.1.170 → 2.1.172

package/lib/modules/Payment/walletpass.js

@@ -31,6 +31,7 @@ var WalletPassPaymentImpl = class {
     this.userIdentificationCodes = [];
     this.searchResults = [];
     this.walletParams = null;
+    this.walletInitData = null;
   }
   /**
    * 发送事件的辅助方法
@@ -42,7 +43,9 @@ 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
+      });
     }
   }
   /**
@@ -112,7 +115,10 @@ 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: []
+        userIdentificationCodes: [],
+        transformList: [],
+        noApplicableVoucher: [],
+        products: []
       };
     }
     this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationStarted, {
@@ -153,11 +159,28 @@ 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
-      });
+      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) {
       throw error;
     }
   }
@@ -166,19 +189,49 @@ var WalletPassPaymentImpl = class {
    * 先获取推荐列表，再获取用户识别码列表（顺序执行）
    */
   async initializeWalletDataAsync(baseParams) {
+    var _a, _b;
     try {
-      const walletRecommendList = await this.getWalletPassRecommendListAsync(baseParams);
       const identificationParams = {
         ...baseParams,
         available: 2,
-        prepare_payments: this.formatWalletPassList2PreparePayments(walletRecommendList),
+        prepare_payments: [],
         other_exact_codes: [],
         filter_prepare_wallet_pass: 1
       };
-      const userIdentificationCodes = await this.getUserIdentificationCodeListAsync(identificationParams);
+      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 || []
+      };
       return {
-        walletRecommendList,
-        userIdentificationCodes
+        walletRecommendList: recommended,
+        userIdentificationCodes: allList,
+        transformList,
+        noApplicableVoucher,
+        products: products || []
       };
     } catch (error) {
       this.paymentModule.logError("[WalletPass] 初始化钱包数据失败", error, {
@@ -261,10 +314,14 @@ 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 [];
     }
   }
@@ -462,6 +519,19 @@ var WalletPassPaymentImpl = class {
     this.searchResults = [];
     this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
+  /**
+   * 获取存储的钱包初始化数据
+   */
+  getStoredWalletInitData() {
+    return this.walletInitData;
+  }
+  /**
+   * 清除存储的钱包初始化数据
+   */
+  clearStoredWalletInitData() {
+    this.walletInitData = null;
+    this.paymentModule.logInfo("[WalletPass] 钱包初始化数据已清除");
+  }
   /**
    * 清除所有缓存数据
    */
@@ -470,11 +540,18 @@ 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"]
+      cleared_types: [
+        "walletRecommendList",
+        "userIdentificationCodes",
+        "searchResults",
+        "walletParams",
+        "walletInitData"
+      ]
     });
   }
 };

package/lib/modules/Product/utils.js

@@ -25,10 +25,10 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 function isNormalProduct(product) {
   var _a;
-  if (product == null ? void 0 : product.duration) {
+  if (product.duration) {
     return false;
   }
-  if ((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) {
+  if ((_a = product["schedule.ids"]) == null ? void 0 : _a.length) {
     return false;
   }
   return true;

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

@@ -11,19 +11,17 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, with_extra, }: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
-        schedule_datetime?: string;
         cacheId?: string;
         customer_id?: number;
         menu_list_ids?: number[];
+        schedule_datetime?: string;
         with_count?: string[];
         with_schedule?: number;
-        /** 追加到默认 with 字段（如 dataVariants） */
-        with_extra?: string[];
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];

package/lib/modules/ProductList/index.js

@@ -59,10 +59,9 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_datetime,
     schedule_date,
     cacheId,
-    with_schedule,
-    with_extra = []
+    with_schedule
   }) {
-    var _a;
+    var _a, _b, _c;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -70,49 +69,43 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    try {
-      const productsData = await this.request.post(
-        `/product/query`,
-        {
-          open_quotation: 1,
-          open_bundle: 0,
-          exclude_extension_type: [
-            "product_party",
-            "product_event",
-            "product_series_event",
-            "product_package_ticket",
-            "ticket",
-            "event_item"
-          ],
-          with: ["category", "collection", "resourceRelation", ...with_extra],
-          status: "published",
-          num: 500,
-          skip: 1,
-          customer_id,
-          category_ids,
-          ids: product_ids,
-          collection,
-          front_end_cache_id: cacheId,
-          with_count,
-          // client_schedule_ids: schedule_ids,
-          schedule_date,
-          schedule_datetime,
-          // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-          application_code: "online-store",
-          with_schedule,
-          is_eject: 1,
-          menu_list_ids,
-          open_deposit: 1
-        },
-        { useCache: true, customToast: () => {
-        } }
-      );
-      const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-      this.addProduct(sortedList);
-      return sortedList;
-    } catch (error) {
-      return error;
-    }
+    const _platform = this.core.context.platform;
+    const productsData = await this.request.post(
+      `/product/query`,
+      {
+        open_quotation: 1,
+        open_bundle: 0,
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
+        ],
+        with: ["category", "collection", "resourceRelation"],
+        status: "published",
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
+        // client_schedule_ids: schedule_ids,
+        schedule_date,
+        application_code: _platform === "shop" ? ((_b = this.otherParams) == null ? void 0 : _b.channel) === "online_store" ? "online-store" : (_c = this.otherParams) == null ? void 0 : _c.channel : "online-store",
+        with_schedule,
+        schedule_datetime,
+        is_eject: 1
+      },
+      { useCache: true }
+    );
+    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.addProduct(sortedList);
+    return sortedList;
   }
   async loadProductsPrice({
     ids = [],

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

@@ -1,25 +1,28 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
-import { Discount } from "../Discount/types";
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
+import { Discount } from '../Discount/types';
+import { WindowPlugin } from '../../plugins';
 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;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, isFormSubject, }: {
+    getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
+        orderTotalAmount: number;
         isFormSubject: boolean;
     }): {
         isAvailable: boolean;
@@ -29,17 +32,18 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
-    calcDiscount({ discountList, productList, holders, isFormSubject, }: {
+    calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
         isFormSubject: boolean;
+        orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
+        selectedList?: any[];
         scan?: boolean;
     }): DiscountResult;
     /**