@pisell/pisellos 2.1.151 → 2.1.152

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/Product/utils.js

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

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

@@ -16,10 +16,10 @@ export declare class ProductList extends BaseModule implements Module {
         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;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -61,7 +61,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule
   }) {
-    var _a, _b;
+    var _a;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -95,12 +95,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
+        application_code: "online-store",
         with_schedule,
         schedule_datetime,
         is_eject: 1
       },
-      { useCache: true }
+      { useCache: true, customToast: () => {
+      } }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     this.addProduct(sortedList);

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

@@ -0,0 +1,48 @@
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import type { ScheduleItem } from '../Schedule/types';
+import type { QuotationItem } from './types';
+export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState } from './types';
+export declare class QuotationModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    private scheduleResolver?;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    loadQuotations(params?: {
+        channel?: string;
+    }): Promise<void>;
+    getQuotationList(): QuotationItem[];
+    /**
+     * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
+     * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
+     *
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * First matching quotation whose schedule covers `datetime` and whose product_data contains
+     * the requested productId wins.
+     */
+    getPriceForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+    }): string | null;
+    getQuotationShelfId(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+    }): number;
+    /**
+     * Batch pre-compute quotation prices for a set of products across multiple time points.
+     * Key format: `${productId}:${timePoint}`
+     * This avoids repeated schedule matching when the same product appears in multiple resource rows.
+     */
+    buildProductPriceMap(params: {
+        productIds: number[];
+        timePoints: string[];
+    }): Map<string, string | null>;
+    setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private isQuotationActiveAt;
+    private findProductData;
+}

package/lib/modules/Quotation/index.js

@@ -0,0 +1,152 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Quotation/index.ts
+var Quotation_exports = {};
+__export(Quotation_exports, {
+  QuotationModule: () => QuotationModule
+});
+module.exports = __toCommonJS(Quotation_exports);
+var import_BaseModule = require("../BaseModule");
+var import_getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
+var QuotationModule = class extends import_BaseModule.BaseModule {
+  constructor(name, version) {
+    super(name, version);
+    this.defaultName = "quotation";
+    this.defaultVersion = "1.0.0";
+    this.store = { list: [] };
+  }
+  async initialize(core, options) {
+    this.core = core;
+    this.request = core.getPlugin("request");
+    if (!this.request)
+      throw new Error("QuotationModule 需要 request 插件支持");
+    this.store = { list: [] };
+  }
+  async loadQuotations(params) {
+    var _a;
+    const query = {};
+    if (params == null ? void 0 : params.channel)
+      query.channel = params.channel;
+    if ((params == null ? void 0 : params.channel) === "online_store") {
+      query.channel = "online-store";
+    }
+    const res = await this.request.get(
+      "/quotation/available",
+      query,
+      { useCache: false }
+    );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
+    list.sort((a, b) => b.sort - a.sort);
+    this.store.list = list;
+  }
+  getQuotationList() {
+    return this.store.list;
+  }
+  /**
+   * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
+   * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
+   *
+   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+   * First matching quotation whose schedule covers `datetime` and whose product_data contains
+   * the requested productId wins.
+   */
+  getPriceForProduct(params) {
+    const { productId, variantId, datetime } = params;
+    for (const quotation of this.store.list) {
+      if (!this.isQuotationActiveAt(quotation, datetime))
+        continue;
+      const match = this.findProductData(quotation.product_data, productId, variantId);
+      if (!match)
+        continue;
+      if (match.value === 0)
+        continue;
+      return String(match.value);
+    }
+    return null;
+  }
+  getQuotationShelfId(params) {
+    const { productId, variantId, datetime } = params;
+    for (const quotation of this.store.list) {
+      if (!this.isQuotationActiveAt(quotation, datetime))
+        continue;
+      const match = this.findProductData(quotation.product_data, productId, variantId);
+      if (!match || match.value === 0)
+        continue;
+      return quotation.id;
+    }
+    return 0;
+  }
+  /**
+   * Batch pre-compute quotation prices for a set of products across multiple time points.
+   * Key format: `${productId}:${timePoint}`
+   * This avoids repeated schedule matching when the same product appears in multiple resource rows.
+   */
+  buildProductPriceMap(params) {
+    const map = /* @__PURE__ */ new Map();
+    if (!this.store.list.length)
+      return map;
+    for (const productId of params.productIds) {
+      for (const timePoint of params.timePoints) {
+        const key = `${productId}:${timePoint}`;
+        const price = this.getPriceForProduct({ productId, datetime: timePoint });
+        if (price !== null) {
+          map.set(key, price);
+        }
+      }
+    }
+    return map;
+  }
+  setScheduleResolver(resolver) {
+    this.scheduleResolver = resolver;
+  }
+  isQuotationActiveAt(quotation, datetime) {
+    var _a;
+    if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
+      return false;
+    const scheduleItems = quotation.schedule.map((s) => {
+      var _a2;
+      const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
+      if (full)
+        return full;
+      return {
+        ...s,
+        repeat_type: s.repeat_type || "none",
+        repeat_rule: s.repeat_rule || null,
+        time_slot: s.time_slot || []
+      };
+    });
+    return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
+  }
+  findProductData(productData, productId, variantId) {
+    if (variantId && variantId !== 0) {
+      const variantMatch = productData.find(
+        (p) => p.product_id === productId && p.variant_id === variantId
+      );
+      if (variantMatch)
+        return variantMatch;
+    }
+    return productData.find(
+      (p) => p.product_id === productId && p.variant_id === 0
+    );
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  QuotationModule
+});

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

@@ -0,0 +1,42 @@
+export interface QuotationProductData {
+    id: number;
+    shelf_id: number;
+    product_id: number;
+    variant_id: number;
+    type: string;
+    value: number;
+}
+export interface QuotationSchedule {
+    id: number;
+    name: string;
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string;
+    end_time: string;
+    is_all: number;
+    repeat_type?: string;
+    repeat_rule?: any;
+    designation?: any;
+    time_slot?: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+    pivot?: Record<string, any>;
+}
+export interface QuotationItem {
+    id: number;
+    shop_id: number;
+    shelf_type_id?: number;
+    name: string;
+    description?: string;
+    status: string;
+    sort: number;
+    channel: string[];
+    created_at?: string;
+    updated_at?: string;
+    deleted_at?: string | null;
+    schedule: QuotationSchedule[];
+    product_data: QuotationProductData[];
+}
+export interface QuotationState {
+    list: QuotationItem[];
+}

package/lib/modules/Quotation/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Quotation/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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;
     /**