@pisell/pisellos 2.1.161 → 2.1.163

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/Rules/index.js

@@ -362,6 +362,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       return priceB.minus(priceA).toNumber();
     });
+    const isProductIncludedByLimitedData = (limitedData, productId) => {
+      const excludedIds = (limitedData == null ? void 0 : limitedData.exclude_product_ids) || [];
+      const isExcluded = (limitedData == null ? void 0 : limitedData.filter) === 1 && excludedIds.some((id) => String(id) === String(productId));
+      return !isExcluded;
+    };
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
     const discountApplicableProducts = /* @__PURE__ */ new Map();
@@ -632,6 +637,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           return false;
         }
         if (limitedData.type === "product_all") {
+          if (!isProductIncludedByLimitedData(limitedData, product.id)) {
+            return false;
+          }
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {
             return false;
           }

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

@@ -373,6 +373,26 @@ var calculateTaxFee = (shopInfo, items) => {
   }, new import_decimal.default(0));
   return totalTaxFee;
 };
+var getCartItemDepositData = (item) => {
+  var _a, _b, _c, _d;
+  const target = item;
+  return ((_a = target == null ? void 0 : target._productOrigin) == null ? void 0 : _a.custom_deposit_data) || ((_b = target == null ? void 0 : target._origin) == null ? void 0 : _b.custom_deposit_data) || ((_d = (_c = target == null ? void 0 : target._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.custom_deposit_data);
+};
+var getCartItemQuantity = (item) => {
+  return new import_decimal.default((item == null ? void 0 : item.num) || 1);
+};
+var calculateCartItemDepositTotal = (item) => {
+  var _a;
+  const depositData = getCartItemDepositData(item);
+  if ((depositData == null ? void 0 : depositData.has_deposit) == 1 && typeof (depositData == null ? void 0 : depositData.deposit_fixed) === "string" && typeof (depositData == null ? void 0 : depositData.deposit_percentage) === "string") {
+    const lineTotal = new import_decimal.default(item.summaryTotal ?? item.total ?? 0);
+    const quantity = getCartItemQuantity(item);
+    const fixedTotal = new import_decimal.default(depositData.deposit_fixed || 0).times(quantity);
+    const percentageTotal = new import_decimal.default(depositData.deposit_percentage || 0).times(lineTotal);
+    return fixedTotal.plus(percentageTotal);
+  }
+  return new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
+};
 var calculateDeposit = (items) => {
   if (!(items == null ? void 0 : items.length)) {
     return void 0;
@@ -380,11 +400,11 @@ var calculateDeposit = (items) => {
   const protocols = [];
   let hasDeposit = false;
   const total = items.reduce((sum, item) => {
-    var _a, _b, _c;
+    var _a, _b;
     if (item == null ? void 0 : item.deposit) {
       hasDeposit = true;
-      const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
-      (_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
+      const cartItemTotalPrice = calculateCartItemDepositTotal(item);
+      (_b = (_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.protocols) == null ? void 0 : _b.forEach((protocol) => {
         if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
           protocols.push(protocol);
         }

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

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 5 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -329,7 +329,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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';
@@ -40,6 +41,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private productsLoaded;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
+    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
+    private slotPriceMapCache;
+    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
+    private smartPricingProductCatalog;
     private getLoggerContext;
     private safeStringify;
     private pickErrorMessage;
@@ -68,6 +73,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 +161,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 +169,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromQuotation;
+    private recalculateOrderPricesFromSmartPricing;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];