@pisell/pisellos 2.1.166 → 2.1.168

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -34,10 +34,6 @@ __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/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 4 | 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: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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" : "",
+          service_type: ((_a = this.otherParams) == null ? void 0 : _a.businessCode) === "dine_in" ? "dine_in" : "take_away",
           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 prepareConfig = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -520,12 +520,11 @@ 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.filter((n) => !scanDiscountIds.includes(n.id));
+      const newGoodPassList = goodPassList == null ? void 0 : 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,7 +3,6 @@ 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';
@@ -37,17 +36,10 @@ 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;
@@ -76,22 +68,6 @@ 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[];
@@ -164,7 +140,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
-    getScheduleListByIds(ids: number[]): ScheduleItem[];
+    private injectScheduleResolverToQuotation;
+    getScheduleListByIds(ids: number[]): import("../../modules/Schedule/types").ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
@@ -172,12 +149,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromSmartPricing;
-    /**
-     * DataVariant 重算价格后，同步刷新订单展示、Rules 与 Summary 共用的价格口径。
-     * Rules 会在本轮结束后根据当前客户的 discountList 重新写入实际折扣。
-     */
-    private resetProductPriceForSmartPricing;
+    private recalculateOrderPricesFromQuotation;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];
@@ -192,15 +164,6 @@ 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>;