@pisell/pisellos 2.1.162 → 2.1.164

package/lib/modules/Order/index.js

@@ -76,6 +76,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.store.tempOrder) {
       this.store.tempOrder = null;
     }
+    if (!Array.isArray(this.store.availableWalletIds)) {
+      this.store.availableWalletIds = [];
+    }
     this.request = this.core.getPlugin("request");
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
@@ -163,14 +166,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── Discount: 公共 API ───
   async loadDiscountConfig(params) {
     var _a, _b, _c, _d;
-    const discountList = await ((_a = this.store.discount) == null ? void 0 : _a.loadPrepareConfig({
+    const prepareConfig = await ((_a = this.store.discount) == null ? void 0 : _a.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || "create",
       with_good_pass: 1,
       with_discount_card: 1,
       with_wallet_pass_holder: 1,
+      with_available_wallet_flag: 1,
+      with_available_wallet_pass_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     }));
+    const discountList = prepareConfig == null ? void 0 : prepareConfig.discountList;
+    this.store.availableWalletIds = (prepareConfig == null ? void 0 : prepareConfig.availableWalletIds) || [];
     if (discountList) {
       (_b = this.store.discount) == null ? void 0 : _b.setDiscountList(discountList);
     }
@@ -182,6 +189,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  getAvailableWalletIds() {
+    return this.store.availableWalletIds || [];
+  }
   async scanCode(code, customerId) {
     var _a, _b, _c, _d;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };

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

@@ -15,6 +15,7 @@ export interface OrderState {
     discountList: any[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
+    availableWalletIds?: number[];
 }
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
 export interface UpdateProductInOrderParams {
@@ -248,5 +249,6 @@ export interface OrderModuleAPI {
         action?: 'create';
     }) => Promise<void>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
 }

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

@@ -11,7 +11,7 @@ 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, }: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, with_extra, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
@@ -22,6 +22,8 @@ export declare class ProductList extends BaseModule implements Module {
         menu_list_ids?: number[];
         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,7 +59,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_datetime,
     schedule_date,
     cacheId,
-    with_schedule
+    with_schedule,
+    with_extra = []
   }) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
@@ -69,44 +70,49 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    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: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-        application_code: "online-store",
-        with_schedule,
-        schedule_datetime,
-        is_eject: 1
-      },
-      { useCache: true, customToast: () => {
-      } }
-    );
-    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    this.addProduct(sortedList);
-    return sortedList;
+    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;
+    }
   }
   async loadProductsPrice({
     ids = [],

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -34,6 +34,10 @@ __export(getDateIsInSchedule_exports, {
 });
 module.exports = __toCommonJS(getDateIsInSchedule_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+import_dayjs.default.extend(import_isSameOrAfter.default);
+import_dayjs.default.extend(import_isSameOrBefore.default);
 var getDateIsInSchedule = (dateTime, scheduleList) => {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {
     return false;

package/lib/solution/ScanOrder/index.js

@@ -563,7 +563,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         ...tempOrder.metadata || {},
         shop_service_data: {
           ...(tempOrder.metadata || {}).shop_service_data || {},
-          service_type: ((_a = this.otherParams) == null ? void 0 : _a.businessCode) === "dine_in" ? "dine_in" : "take_away",
+          service_type: ((_a = this.otherParams) == null ? void 0 : _a.businessCode) === "dine_in" ? "dine_in" : "",
           pickup_reference_mode: mode
         }
       };

package/lib/solution/ShopDiscount/index.js

@@ -511,7 +511,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const prepareConfig = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -520,11 +520,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
+      const goodPassList = (prepareConfig == null ? void 0 : prepareConfig.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );
       const scanDiscountIds = scanDiscount.map((n) => n.id);
-      const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
+      const newGoodPassList = goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.store.originalDiscountList = newDiscountList;
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(newDiscountList));

package/lib/solution/VenueBooking/index.d.ts

@@ -3,6 +3,7 @@ import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { ScheduleItem } from '../../modules/Schedule/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -36,10 +37,17 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loginEffectDisposers;
     private customerLoginRefreshInFlight;
     private customerLoginRefreshIdInFlight;
+    /** 最近一次确认登录的客户；登录事件与 user 插件更新之间可能存在时序差。 */
+    private smartPricingCustomerId;
     private loadAllProductsInFlight;
     private productsLoaded;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
+    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
+    private slotPriceMapCache;
+    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
+    private smartPricingProductCatalog;
+    private static readonly PISELL1_LOGIN_SUCCESS;
     private getLoggerContext;
     private safeStringify;
     private pickErrorMessage;
@@ -68,6 +76,22 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    /** 清除 slot 价格分段缓存（商品重载 / 登录后 customerId 变化时调用） */
+    private clearSlotPriceMapCache;
+    /** 读取当前登录 customerId */
+    private resolveCustomerIdForSmartPricing;
+    private resolveAvailableWalletIdsForSmartPricing;
+    /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
+    private getScheduleListForSmartPricing;
+    /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */
+    private buildSmartPricingContext;
+    /** venue + addon 全量商品，供智能定价评估 */
+    private getAllProductsForSmartPricing;
+    private getSlotPriceMapCacheKey;
+    /**
+     * 按 schedule 分段构建 slot 价格 Map，带实例级缓存。
+     */
+    private buildSlotPriceMapForDate;
     loadAllProducts(): Promise<{
         venueProducts: ProductData[];
         addonProducts: ProductData[];
@@ -140,8 +164,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
-    private injectScheduleResolverToQuotation;
-    getScheduleListByIds(ids: number[]): import("../../modules/Schedule/types").ScheduleItem[];
+    getScheduleListByIds(ids: number[]): ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
@@ -149,7 +172,12 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromQuotation;
+    private recalculateOrderPricesFromSmartPricing;
+    /**
+     * DataVariant 重算价格后，同步刷新订单展示、Rules 与 Summary 共用的价格口径。
+     * Rules 会在本轮结束后根据当前客户的 discountList 重新写入实际折扣。
+     */
+    private resetProductPriceForSmartPricing;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];
@@ -164,6 +192,15 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         discountId: number;
         isSelected: boolean;
     }): Promise<import("../../modules/Discount").Discount[]>;
+    /**
+     * 统一 VenueBooking 折扣后的订单行价。
+     *
+     * Rules 的 `discount_list.amount` 是已经按适用规则计算出的每件优惠额；它是这里唯一
+     * 的折扣金额来源。使用智能定价写入的 source_product_price 减去该金额，再同步
+     * selling_price 与 Summary 使用的 main_product_selling_price，避免 UI 的购物车行价、
+     * 小计和提交订单各自读取到不同的价格字段。
+     */
+    private normalizeDiscountedOrderPrices;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;