@pisell/pisellos 2.3.49 → 2.3.50

package/dist/modules/Schedule/index.js

@@ -123,21 +123,24 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadAllSchedule",
     value: (function () {
       var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _scheduleList$data;
-        var scheduleList;
+        var _options$useCache, _scheduleList$data;
+        var options,
+          scheduleList,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+              _context2.next = 3;
               return this.request.get("/schedule", {
                 num: 999
               }, {
-                useCache: true
+                useCache: (_options$useCache = options.useCache) !== null && _options$useCache !== void 0 ? _options$useCache : true
               });
-            case 2:
+            case 3:
               scheduleList = _context2.sent;
               this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -176,8 +179,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadScheduleAvailableDate",
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
-        var startDate, endDate, custom_page_id, channel, dates, res;
+        var startDate, endDate, custom_page_id, channel, dates, res, responseData, dateList, otherProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -205,22 +207,25 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 8:
               res = _context3.sent;
-              this.setAvailabilityScheduleDateList(res.data.date_list);
-              this.setOtherProductsIds(res.data.other_product_ids || []);
+              responseData = res.data || {};
+              dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+              otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+              this.setAvailabilityScheduleDateList(dateList);
+              this.setOtherProductsIds(otherProductIds);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
-                _context3.next = 13;
+              if (!(!dateList.length && !otherProductIds.length || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+                _context3.next = 16;
                 break;
               }
               return _context3.abrupt("return", dates);
-            case 13:
-              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
+            case 16:
+              if (otherProductIds.length) {
                 // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
                 dates.forEach(function (n) {
                   n.status = 'available';
                 });
               } else {
-                res.data.date_list.forEach(function (n) {
+                dateList.forEach(function (n) {
                   var index = dates.findIndex(function (m) {
                     return m.date === n.date;
                   });
@@ -231,7 +236,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               }
               dates = disableDatesBeforeOneDay(dates);
               return _context3.abrupt("return", dates);
-            case 16:
+            case 19:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Summary/utils.js

@@ -706,25 +706,50 @@ var getBundleItemIsDiscountPrice = function getBundleItemIsDiscountPrice(item) {
 var getBundleItemIsMarkupOrDiscountPrice = function getBundleItemIsMarkupOrDiscountPrice(item) {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
+var getDiscountAmount = function getDiscountAmount(discounts) {
+  return (discounts || []).reduce(function (total, discount) {
+    return total.add(new Decimal(discount.amount || 0));
+  }, new Decimal(0)).toNumber();
+};
 
 /**
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2;
+  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
   // 新语义 v2 下 `main_product_selling_price` / `metadata.main_product_selling_price`
   // 已经是"含 option、含主商品折扣"的主价，直接作为主商品基准，无需再减折扣或加 option。
   // 仅需叠加 markup / markdown 类 bundle（原价 bundle 的税费单独处理）。
   var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+
+  // 做个兜底 如果新语义价格字段都没有，则切换回老逻辑
+  var hasMainProductPrice = (item === null || item === void 0 ? void 0 : item.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.main_product_original_price) != null;
+  if (!hasMainProductPrice) {
+    var _ref10, _ref11, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
+    total = new Decimal((_ref10 = (_ref11 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref11 !== void 0 ? _ref11 : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+    var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
+      var _item$metadata6;
+      return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
+    })) || [];
+    var mainProductDiscountAmount = getDiscountAmount(discount);
+    total = total.minus(mainProductDiscountAmount);
+
+    // 单规格
+    if (item !== null && item !== void 0 && item.option && Array.isArray(item === null || item === void 0 ? void 0 : item.option)) {
+      total = total.add(item === null || item === void 0 ? void 0 : item.option.reduce(function (t, option) {
+        return t.add(new Decimal(option.price || 0).mul(option.num || 1));
+      }, new Decimal(0)));
+    }
+  }
   var _iterator4 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
     _step4;
   try {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref10, _bundleItem$bundle_se2;
+        var _ref12, _bundleItem$bundle_se2;
         // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price 和 price 其实都已经是折后价格了，不需要单独再减一次
-        var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+        var bundleItemTotal = new Decimal((_ref12 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -844,12 +869,12 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref11, options) {
+export var getSurcharge = function getSurcharge(_ref13, options) {
   var _service$filter;
-  var service = _ref11.service,
-    addons = _ref11.addons,
-    bookingDetail = _ref11.bookingDetail,
-    bookingId = _ref11.bookingId;
+  var service = _ref13.service,
+    addons = _ref13.addons,
+    bookingDetail = _ref13.bookingDetail,
+    bookingId = _ref13.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -971,11 +996,11 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref12, _bundleItem$bundle_se3;
+                var _ref14, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref12 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0),
+                  total: Number((_ref14 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1191,9 +1216,9 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref13) {
-  var service = _ref13.service,
-    addons = _ref13.addons;
+function resetItemsSurchargeSideEffects(_ref15) {
+  var service = _ref15.service,
+    addons = _ref15.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

package/dist/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/dist/modules/index.js

@@ -17,4 +17,6 @@ export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
 export * from "./OpenData";
-export * from "./BookingContext";
+export * from "./BookingContext";
+export * from "./Holder";
+export * from "./ResourcePlanner";

package/dist/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/dist/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;
@@ -262,6 +266,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 可选。不走订阅。