@pisell/pisellos 2.3.38 → 2.3.39

package/lib/modules/Schedule/index.js

@@ -95,12 +95,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
    *
    * @memberof ScheduleModule
    */
-  async loadAllSchedule() {
+  async loadAllSchedule(options = {}) {
     var _a;
     const scheduleList = await this.request.get(
       `/schedule`,
       { num: 999 },
-      { useCache: true }
+      { useCache: options.useCache ?? true }
     );
     this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
@@ -126,7 +126,6 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
-    var _a, _b, _c;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -144,17 +143,20 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         channel
       }
     );
-    this.setAvailabilityScheduleDateList(res.data.date_list);
-    this.setOtherProductsIds(res.data.other_product_ids || []);
-    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    const responseData = res.data || {};
+    const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+    const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+    this.setAvailabilityScheduleDateList(dateList);
+    this.setOtherProductsIds(otherProductIds);
+    if (!dateList.length && !otherProductIds.length || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+    if (otherProductIds.length) {
       dates.forEach((n) => {
         n.status = "available";
       });
     } else {
-      res.data.date_list.forEach((n) => {
+      dateList.forEach((n) => {
         const index = dates.findIndex((m) => m.date === n.date);
         if (index !== -1) {
           dates[index].status = "available";

package/lib/modules/Summary/utils.js

@@ -437,11 +437,31 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
+var getDiscountAmount = (discounts) => {
+  return (discounts || []).reduce((total, discount) => {
+    return total.add(new import_decimal.default(discount.amount || 0));
+  }, new import_decimal.default(0)).toNumber();
+};
 var getMainProductTotal = (item) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let total = new import_decimal.default(
     (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
   );
+  const hasMainProductPrice = (item == null ? void 0 : item.main_product_selling_price) != null || ((_c = item == null ? void 0 : item.metadata) == null ? void 0 : _c.main_product_selling_price) != null || ((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.main_product_original_price) != null;
+  if (!hasMainProductPrice) {
+    total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.main_product_selling_price) ?? item.price ?? 0);
+    const discount = ((_g = (_f = item == null ? void 0 : item._origin) == null ? void 0 : _f.product) == null ? void 0 : _g.discount_list) || ((_j = (_i = (_h = item == null ? void 0 : item._originData) == null ? void 0 : _h.product) == null ? void 0 : _i.discount_list) == null ? void 0 : _j.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    })) || [];
+    const mainProductDiscountAmount = getDiscountAmount(discount);
+    total = total.minus(mainProductDiscountAmount);
+    if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
+      total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
+        return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
+      }, new import_decimal.default(0)));
+    }
+  }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);

package/lib/modules/index.d.ts

@@ -18,3 +18,5 @@ export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
 export * from './BookingContext';
+export * from './Holder';
+export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -36,6 +36,8 @@ __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
 __reExport(modules_exports, require("./BookingContext"), module.exports);
+__reExport(modules_exports, require("./Holder"), module.exports);
+__reExport(modules_exports, require("./ResourcePlanner"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -57,5 +59,7 @@ __reExport(modules_exports, require("./BookingContext"), module.exports);
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
   ...require("./OpenData"),
-  ...require("./BookingContext")
+  ...require("./BookingContext"),
+  ...require("./Holder"),
+  ...require("./ResourcePlanner")
 });

package/lib/plugins/window.d.ts

@@ -16,6 +16,7 @@ export interface WindowPlugin extends Plugin {
     history: History;
     interaction?: any;
     getWalletPassEvaluator?: () => WalletPassEvaluator;
+    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/server/index.d.ts

@@ -49,6 +49,10 @@ declare class Server {
     private productQuerySubscribers;
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     private productQueryScheduleTimers;
+    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
+    private menuScheduleRefreshInFlight;
+    private lastMenuScheduleRefreshAt;
+    private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -57,7 +61,6 @@ declare class Server {
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
     private salesSearchSubscribers;
     private deviceTaskActionsRegistered;
-    private localPaymentUpdateQueues;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -121,8 +124,6 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
-    private buildRemoteCheckoutData;
-    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
@@ -262,6 +263,16 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * ProductList callers such as standalone retail pages do not always have a selected schedule.
+     * In that case query against the current local time so menu availability can still be evaluated.
+     */
+    private resolveProductQueryScheduleContext;
+    /**
+     * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
+     * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
+     */
+    private refreshMenuScheduleCacheAfterEmptyResult;
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
      * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。
@@ -456,18 +467,6 @@ declare class Server {
      */
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
-    private handleOrderSalesDraft;
-    private createLocalPaymentOperationId;
-    private buildLocalPaymentOrderLogContext;
-    private isValidLocalPaymentDecimal;
-    private getInvalidLocalPaymentSurchargeFields;
-    private buildLocalPaymentSurchargeUpdate;
-    private handleGetLocalPayment;
-    private handleUpdateLocalPayment;
-    private runLocalPaymentUpdateInQueue;
-    private processLocalPaymentUpdate;
-    private processSuccessfulLocalPayment;
-    private sanitizeLocalRecoveryOrder;
     private handleOrderCheckout;
     private getDeviceTaskPlugin;
     private getIdGeneratorPlugin;
@@ -495,7 +494,6 @@ declare class Server {
     private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
-    private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;