@pisell/pisellos 2.1.164 → 2.1.165

package/dist/solution/VenueBooking/types.d.ts

@@ -6,9 +6,7 @@ export declare enum VenueBookingHooks {
     onDestroy = "venueBooking:onDestroy",
     onRetryInit = "venueBooking:onRetryInit",
     onRefresh = "venueBooking:onRefresh",
-    onCartValidationChanged = "venueBooking:onCartValidationChanged",
-    /** 登录客户的智能定价、营销配置与订单汇总已完成刷新 */
-    onSmartPricingUpdated = "venueBooking:onSmartPricingUpdated"
+    onCartValidationChanged = "venueBooking:onCartValidationChanged"
 }
 export type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export interface VenueBookingEntryContext {

package/dist/solution/VenueBooking/types.js

@@ -4,7 +4,6 @@ export var VenueBookingHooks = /*#__PURE__*/function (VenueBookingHooks) {
   VenueBookingHooks["onRetryInit"] = "venueBooking:onRetryInit";
   VenueBookingHooks["onRefresh"] = "venueBooking:onRefresh";
   VenueBookingHooks["onCartValidationChanged"] = "venueBooking:onCartValidationChanged";
-  VenueBookingHooks["onSmartPricingUpdated"] = "venueBooking:onSmartPricingUpdated";
   return VenueBookingHooks;
 }({});
 

package/dist/solution/VenueBooking/utils/dateSummary.d.ts

@@ -1,11 +1,11 @@
 import type { VenueBookingSlotConfig, VenueResourceRawData, VenueDateSummaryItem, ResourceProductMapping } from '../types';
+import type { QuotationModule } from '../../../modules/Quotation';
 export declare function buildDateRangeSummary(params: {
     startDate: string;
     endDate: string;
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
+    quotationModule?: QuotationModule;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
-    /** 按日期构建 slot 智能定价 Map */
-    buildSlotPriceMap?: (date: string, config: VenueBookingSlotConfig, productIds: number[]) => Map<string, string | null>;
 }): VenueDateSummaryItem[];

package/dist/solution/VenueBooking/utils/dateSummary.js

@@ -6,31 +6,41 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from 'dayjs';
-import { buildTimeSlotGrid } from "./timeSlot";
+import { buildTimeSlotGrid, generateTimeLabels } from "./timeSlot";
 export function buildDateRangeSummary(params) {
   var startDate = params.startDate,
     endDate = params.endDate,
     config = params.config,
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
-    resolveConfig = params.resolveConfig,
-    buildSlotPriceMap = params.buildSlotPriceMap;
+    quotationModule = params.quotationModule,
+    resolveConfig = params.resolveConfig;
   var result = [];
-  var productIds = buildSlotPriceMap ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
+  var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
     return m.productId;
   }))) : [];
   var cursor = dayjs(startDate);
   var end = dayjs(endDate);
-  while (!cursor.isAfter(end)) {
-    var _date = cursor.format('YYYY-MM-DD');
-    var effectiveConfig = (resolveConfig === null || resolveConfig === void 0 ? void 0 : resolveConfig(_date)) || config;
-    var slotPriceMap = buildSlotPriceMap && productIds.length ? buildSlotPriceMap(_date, effectiveConfig, productIds) : undefined;
+  var _loop = function _loop() {
+    var date = cursor.format('YYYY-MM-DD');
+    var effectiveConfig = (resolveConfig === null || resolveConfig === void 0 ? void 0 : resolveConfig(date)) || config;
+    var quotationPriceMap;
+    if (quotationModule && productIds.length) {
+      var timeLabels = generateTimeLabels(effectiveConfig);
+      var timePoints = timeLabels.map(function (label) {
+        return "".concat(date, " ").concat(label);
+      });
+      quotationPriceMap = quotationModule.buildProductPriceMap({
+        productIds: productIds,
+        timePoints: timePoints
+      });
+    }
     var grid = buildTimeSlotGrid({
-      date: _date,
+      date: date,
       config: effectiveConfig,
       rawResources: rawResources,
       resourceProductMap: resourceProductMap,
-      slotPriceMap: slotPriceMap
+      quotationPriceMap: quotationPriceMap
     });
     var totalSlots = 0;
     var availableSlots = 0;
@@ -68,7 +78,7 @@ export function buildDateRangeSummary(params) {
     } finally {
       _iterator.f();
     }
-    var status = void 0;
+    var status;
     if (totalSlots === 0) {
       status = 'unavailable';
     } else if (availableSlots === 0) {
@@ -79,13 +89,16 @@ export function buildDateRangeSummary(params) {
       status = 'available';
     }
     result.push({
-      date: _date,
+      date: date,
       status: status,
       startingPrice: lowestPrice !== null ? lowestPrice.toFixed(2) : null,
       totalSlots: totalSlots,
       availableSlots: availableSlots
     });
     cursor = cursor.add(1, 'day');
+  };
+  while (!cursor.isAfter(end)) {
+    _loop();
   }
   return result;
 }

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -5,6 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
 }): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -51,7 +51,9 @@ export function mergeConsecutiveSlots(slots) {
   return groups;
 }
 export function buildPriceBreakdown(params) {
-  var group = params.group;
+  var group = params.group,
+    productId = params.productId,
+    quotation = params.quotation;
   if (!group.slots.length) return [];
   var entries = [];
   var _iterator = _createForOfIteratorHelper(group.slots),
@@ -60,10 +62,14 @@ export function buildPriceBreakdown(params) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var slot = _step.value;
       var unitPrice = Number(slot.price || '0');
+      var shelfId = quotation ? quotation.getQuotationShelfId({
+        productId: productId,
+        datetime: slot.startTime
+      }) : 0;
       var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
-      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
+      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
         last.quantity += 1;
       } else {
@@ -71,7 +77,7 @@ export function buildPriceBreakdown(params) {
           start_time: startHm,
           end_time: endHm,
           unit_price: unitPrice,
-          quotation_shelf_id: 0,
+          quotation_shelf_id: shelfId,
           quantity: 1
         });
       }

package/dist/solution/VenueBooking/utils/timeSlot.d.ts

@@ -27,8 +27,6 @@ export declare function buildTimeSlotGrid(params: {
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
-    /** @deprecated 使用 slotPriceMap */
     quotationPriceMap?: Map<string, string | null>;
-    slotPriceMap?: Map<string, string | null>;
 }): VenueTimeSlotGrid;
 export {};

package/dist/solution/VenueBooking/utils/timeSlot.js

@@ -230,7 +230,6 @@ function buildProductSlots(params) {
     now = params.now,
     crossDay = params.crossDay,
     quotationPriceMap = params.quotationPriceMap,
-    slotPriceMap = params.slotPriceMap,
     childRawResources = params.childRawResources,
     childTimesCache = params.childTimesCache,
     childEventsCache = params.childEventsCache,
@@ -240,7 +239,7 @@ function buildProductSlots(params) {
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _resolvedPriceMap$get;
+      var _quotationPriceMap$ge;
       var label = _step7.value;
       var _label$split$map = label.split(':').map(Number),
         _label$split$map2 = _slicedToArray(_label$split$map, 1),
@@ -299,12 +298,11 @@ function buildProductSlots(params) {
       }
       var isBookable = status === 'available' || status === 'partially_occupied';
       var slotStartStr = slotStart.format('YYYY-MM-DD HH:mm');
-      var resolvedPriceMap = slotPriceMap !== null && slotPriceMap !== void 0 ? slotPriceMap : quotationPriceMap;
       slots.push({
         startTime: slotStartStr,
         endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
         status: status,
-        price: isBookable ? (_resolvedPriceMap$get = resolvedPriceMap === null || resolvedPriceMap === void 0 ? void 0 : resolvedPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _resolvedPriceMap$get !== void 0 ? _resolvedPriceMap$get : mapping.price : null,
+        price: isBookable ? (_quotationPriceMap$ge = quotationPriceMap === null || quotationPriceMap === void 0 ? void 0 : quotationPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _quotationPriceMap$ge !== void 0 ? _quotationPriceMap$ge : mapping.price : null,
         resourceId: resource.resourceId,
         resourceFormId: resource.formId,
         capacity: status === 'past' || status === 'unavailable' ? null : resCapacity,
@@ -324,9 +322,7 @@ export function buildTimeSlotGrid(params) {
     config = params.config,
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
-    quotationPriceMap = params.quotationPriceMap,
-    slotPriceMap = params.slotPriceMap;
-  var resolvedPriceMap = slotPriceMap !== null && slotPriceMap !== void 0 ? slotPriceMap : quotationPriceMap;
+    quotationPriceMap = params.quotationPriceMap;
   var timeLabels = generateTimeLabels(config);
   var now = dayjs();
   var crossDay = isBusinessHoursCrossDay(config);
@@ -381,8 +377,7 @@ export function buildTimeSlotGrid(params) {
           resCapacity: resCapacity,
           now: now,
           crossDay: crossDay,
-          quotationPriceMap: resolvedPriceMap,
-          slotPriceMap: resolvedPriceMap,
+          quotationPriceMap: quotationPriceMap,
           childRawResources: childRawResources,
           childTimesCache: childTimesCache,
           childEventsCache: childEventsCache,

package/lib/index.d.ts

@@ -7,6 +7,5 @@ export * from './modules';
 export * from './plugins';
 export * from './solution';
 export { PisellOSCore } from './core';
-export { DataVariantEvaluator } from './model/strategy/adapter/dataVariant/evaluator';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/lib/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  DataVariantEvaluator: () => import_evaluator.DataVariantEvaluator,
   PisellOSCore: () => import_core.PisellOSCore,
   default: () => src_default
 });
@@ -40,12 +39,10 @@ __reExport(src_exports, require("./modules"), module.exports);
 __reExport(src_exports, require("./plugins"), module.exports);
 __reExport(src_exports, require("./solution"), module.exports);
 var import_core = require("./core");
-var import_evaluator = require("./model/strategy/adapter/dataVariant/evaluator");
 var import_core2 = __toESM(require("./core"));
 var src_default = import_core2.default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DataVariantEvaluator,
   PisellOSCore,
   ...require("./types"),
   ...require("./modules"),

package/lib/model/strategy/adapter/index.d.ts

@@ -5,7 +5,3 @@ export { PromotionEvaluator } from './promotion/evaluator';
 export { PromotionAdapter } from './promotion/adapter';
 export { ItemRuleEvaluator } from './itemRule/evaluator';
 export { ItemRuleAdapter } from './itemRule/adapter';
-export { DataVariantEvaluator } from './dataVariant/evaluator';
-export { DataVariantAdapter } from './dataVariant/adapter';
-export { runDataVariantDemo } from './dataVariant/examples';
-export * from './dataVariant/type';

package/lib/model/strategy/adapter/index.js

@@ -30,15 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/index.ts
 var adapter_exports = {};
 __export(adapter_exports, {
-  DataVariantAdapter: () => import_adapter3.DataVariantAdapter,
-  DataVariantEvaluator: () => import_evaluator4.DataVariantEvaluator,
   ItemRuleAdapter: () => import_adapter2.ItemRuleAdapter,
   ItemRuleEvaluator: () => import_evaluator3.ItemRuleEvaluator,
   PromotionAdapter: () => import_adapter.PromotionAdapter,
   PromotionEvaluator: () => import_evaluator2.PromotionEvaluator,
   WalletPassAdapter: () => import_walletPass.default,
-  WalletPassEvaluator: () => import_evaluator.WalletPassEvaluator,
-  runDataVariantDemo: () => import_examples.runDataVariantDemo
+  WalletPassEvaluator: () => import_evaluator.WalletPassEvaluator
 });
 module.exports = __toCommonJS(adapter_exports);
 __reExport(adapter_exports, require("./type"), module.exports);
@@ -48,21 +45,13 @@ var import_evaluator2 = require("./promotion/evaluator");
 var import_adapter = require("./promotion/adapter");
 var import_evaluator3 = require("./itemRule/evaluator");
 var import_adapter2 = require("./itemRule/adapter");
-var import_evaluator4 = require("./dataVariant/evaluator");
-var import_adapter3 = require("./dataVariant/adapter");
-var import_examples = require("./dataVariant/examples");
-__reExport(adapter_exports, require("./dataVariant/type"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DataVariantAdapter,
-  DataVariantEvaluator,
   ItemRuleAdapter,
   ItemRuleEvaluator,
   PromotionAdapter,
   PromotionEvaluator,
   WalletPassAdapter,
   WalletPassEvaluator,
-  runDataVariantDemo,
-  ...require("./type"),
-  ...require("./dataVariant/type")
+  ...require("./type")
 });

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI, DiscountWithReason, DiscountPrepareConfigResult } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -22,12 +22,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
-        with_available_wallet_flag?: 0 | 1;
-        with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
         order_id?: number;
-    }): Promise<DiscountPrepareConfigResult>;
-    private extractAvailableWalletIds;
+    }): Promise<Discount[]>;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/lib/modules/Discount/index.js

@@ -100,17 +100,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const goodPassList = this.filterEnabledDiscountList(
       [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
-    return {
-      discountList: goodPassList,
-      availableWalletIds: this.extractAvailableWalletIds(prepareConfig == null ? void 0 : prepareConfig.data)
-    };
-  }
-  extractAvailableWalletIds(data) {
-    const availableWalletList = Array.isArray(data == null ? void 0 : data.avaiable_wallet_list) ? data.avaiable_wallet_list : Array.isArray(data == null ? void 0 : data.available_wallet_list) ? data.available_wallet_list : [];
-    const availableWalletPassList = Array.isArray(data == null ? void 0 : data.available_wallet_pass_list) ? data.available_wallet_pass_list : [];
-    const walletIds = availableWalletList.map((item) => Number(item == null ? void 0 : item.wallet_id)).filter((id) => Number.isFinite(id) && id > 0);
-    const walletPassProductIds = availableWalletPassList.map((item) => Number(item == null ? void 0 : item.product_id)).filter((id) => Number.isFinite(id) && id > 0);
-    return Array.from(/* @__PURE__ */ new Set([...walletIds, ...walletPassProductIds]));
+    return goodPassList;
   }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};

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

@@ -68,10 +68,6 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
-export interface DiscountPrepareConfigResult {
-    discountList: Discount[];
-    availableWalletIds: number[];
-}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -42,7 +42,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         action?: 'create';
     }): Promise<void>;
     getDiscountList(): Discount[];
-    getAvailableWalletIds(): number[];
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: Discount[];

package/lib/modules/Order/index.js

@@ -76,9 +76,6 @@ 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 || {};
@@ -166,18 +163,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── Discount: 公共 API ───
   async loadDiscountConfig(params) {
     var _a, _b, _c, _d;
-    const prepareConfig = await ((_a = this.store.discount) == null ? void 0 : _a.loadPrepareConfig({
+    const discountList = 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);
     }
@@ -189,9 +182,6 @@ 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,7 +15,6 @@ export interface OrderState {
     discountList: any[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
-    availableWalletIds?: number[];
 }
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
 export interface UpdateProductInOrderParams {
@@ -249,6 +248,5 @@ 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, 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[];
@@ -22,8 +22,6 @@ 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,8 +59,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_datetime,
     schedule_date,
     cacheId,
-    with_schedule,
-    with_extra = []
+    with_schedule
   }) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
@@ -70,49 +69,44 @@ 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 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;
   }
   async loadProductsPrice({
     ids = [],

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