@pisell/pisellos 0.0.567 → 0.0.569

package/lib/modules/Date/utils.js

@@ -1,122 +1,159 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Date/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  disableAllDates: () => disableAllDates,
-  disableDatesBeforeOneDay: () => disableDatesBeforeOneDay,
-  generateMonthDates: () => generateMonthDates,
-  handleAvailableDateByResource: () => handleAvailableDateByResource,
-  handleAvailableDatesByRules: () => handleAvailableDatesByRules
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var generateMonthDates = (startDate, endDate, type) => {
-  const start = type === "day" ? (0, import_dayjs.default)(startDate).format("YYYY-MM-DD") : (0, import_dayjs.default)(startDate).format("YYYY-MM-01");
-  const end = (0, import_dayjs.default)(endDate).format("YYYY-MM-DD");
+exports.handleAvailableDatesByRules = exports.handleAvailableDateByResource = exports.generateMonthDates = exports.disableDatesBeforeOneDay = exports.disableAllDates = void 0;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 生成当前月份的所有日期
+ * @param startDate 开始日期
+ * @param endDate 结束日期
+ * @param type 类型：按月查 ｜ 按周查
+ * @returns 日期列表
+ */
+const generateMonthDates = (startDate, endDate, type) => {
+  // 如果是按月查询需要从01号开始，如果是按周查询以开始结束时间为准
+  const start = type === 'day' ? (0, _dayjs.default)(startDate).format('YYYY-MM-DD') : (0, _dayjs.default)(startDate).format('YYYY-MM-01');
+  const end = (0, _dayjs.default)(endDate).format('YYYY-MM-DD');
   const dates = [];
-  let currentDate = (0, import_dayjs.default)(start);
-  while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(end), "day") || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(end), "day")) {
+  let currentDate = (0, _dayjs.default)(start);
+  while ((0, _dayjs.default)(currentDate).isBefore((0, _dayjs.default)(end), 'day') || (0, _dayjs.default)(currentDate).isSame((0, _dayjs.default)(end), 'day')) {
     dates.push({
-      date: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD"),
-      week: (0, import_dayjs.default)(currentDate).format("ddd"),
-      weekNum: (0, import_dayjs.default)(currentDate).day(),
-      status: "available"
+      date: (0, _dayjs.default)(currentDate).format('YYYY-MM-DD'),
+      week: (0, _dayjs.default)(currentDate).format('ddd'),
+      weekNum: (0, _dayjs.default)(currentDate).day(),
+      status: 'available'
     });
-    currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");
+    currentDate = (0, _dayjs.default)(currentDate).add(1, 'day');
   }
   return dates;
 };
-var disableAllDates = (dates) => {
-  return dates.map((date) => ({ ...date, status: "unavailable" }));
+
+/**
+ * 禁用所有日期
+ * @param dates 日期列表
+ * @returns 日期列表
+ */
+exports.generateMonthDates = generateMonthDates;
+const disableAllDates = dates => {
+  return dates.map(date => ({
+    ...date,
+    status: 'unavailable'
+  }));
 };
-var disableDatesBeforeOneDay = (dates, oneDay) => {
-  const day = oneDay ? (0, import_dayjs.default)(oneDay).format("YYYY-MM-DD") : (0, import_dayjs.default)().format("YYYY-MM-DD");
-  return dates.map((date) => {
-    if ((0, import_dayjs.default)(date.date).isBefore(day, "day")) {
-      return { ...date, status: "unavailable" };
+
+/**
+ * 禁用某一天之前的日期，如不传则默认今天
+ * @param dates 日期列表
+ * @param oneDay 日期
+ * @returns 日期列表
+ */
+exports.disableAllDates = disableAllDates;
+const disableDatesBeforeOneDay = (dates, oneDay) => {
+  const day = oneDay ? (0, _dayjs.default)(oneDay).format('YYYY-MM-DD') : (0, _dayjs.default)().format('YYYY-MM-DD');
+  return dates.map(date => {
+    if ((0, _dayjs.default)(date.date).isBefore(day, 'day')) {
+      return {
+        ...date,
+        status: 'unavailable'
+      };
     } else {
       return date;
     }
   });
 };
-var handleAvailableDateByResource = (resources, dates) => {
+
+/**
+ * 根据资源中的日期处理出每个日期下存在的可用资源，根据form_id进行分类
+ * @param resources 资源列表
+ * @param dates 日期列表
+ * @returns 日期列表
+ */
+exports.disableDatesBeforeOneDay = disableDatesBeforeOneDay;
+const handleAvailableDateByResource = (resources, dates) => {
   const dateMap = {};
-  resources.forEach((resource) => {
-    const { form_id, id, times, ...others } = resource;
-    times.forEach((time) => {
-      var _a;
-      const { start_at } = time;
-      const date = (0, import_dayjs.default)(start_at).format("YYYY-MM-DD");
+  resources.forEach(resource => {
+    const {
+      form_id,
+      id,
+      times,
+      ...others
+    } = resource;
+    times.forEach(time => {
+      const {
+        start_at
+      } = time;
+      const date = (0, _dayjs.default)(start_at).format('YYYY-MM-DD');
       if (!dateMap[date]) {
-        dateMap[date] = [{ form_id, id, ...others, times: [time] }];
+        dateMap[date] = [{
+          form_id,
+          id,
+          ...others,
+          times: [time]
+        }];
       } else {
-        const temp = (_a = dateMap[date].filter((item) => item.id === id)) == null ? void 0 : _a[0];
+        const temp = dateMap[date].filter(item => item.id === id)?.[0];
         if (temp) {
           temp.times.push(time);
         } else {
-          dateMap[date].push({ form_id, id, ...others, times: [time] });
+          dateMap[date].push({
+            form_id,
+            id,
+            ...others,
+            times: [time]
+          });
         }
       }
     });
   });
-  return dates.map((date) => {
+  return dates.map(date => {
     const resource = dateMap[date.date];
     if (resource) {
-      return { ...date, resource };
+      return {
+        ...date,
+        resource
+      };
     } else {
-      return { ...date, status: "unavailable", resource: [] };
+      return {
+        ...date,
+        status: 'unavailable',
+        resource: []
+      };
     }
   });
 };
-var handleAvailableDatesByRules = (dates, rules) => {
+
+/**
+ * 根据规则判定哪些日期是可用的
+ * @param dates 日期列表
+ * @param rules 提前量规则
+ * @returns 日期列表
+ */
+exports.handleAvailableDateByResource = handleAvailableDateByResource;
+const handleAvailableDatesByRules = (dates, rules) => {
   let newDates = disableDatesBeforeOneDay(dates);
-  if (!(rules == null ? void 0 : rules.length)) {
+  if (!rules?.length) {
     return newDates;
   }
-  let scheduleMap = {};
-  let latestStartDate = "";
-  let earliestEndDate = "";
+  let scheduleMap = {}; // 日程列表
+  let latestStartDate = ''; // 最晚开始日期
+  let earliestEndDate = ''; // 最早结束日期
   let resourceFormIds = [];
-  rules.forEach((rule) => {
-    var _a, _b;
-    if ((_a = rule == null ? void 0 : rule.schedule) == null ? void 0 : _a.length) {
+  rules.forEach(rule => {
+    // 如果有日程列表，需要将它去重加入到scheduleMap
+    if (rule?.schedule?.length) {
       for (const item of rule.schedule) {
-        if ((0, import_dayjs.default)(item.date).isBefore((0, import_dayjs.default)(newDates[0].date), "day")) {
+        // 判断item.date是否在dates的开始和结束日期范围内，如果不在则跳过
+        if ((0, _dayjs.default)(item.date).isBefore((0, _dayjs.default)(newDates[0].date), 'day')) {
           continue;
         }
-        if ((0, import_dayjs.default)(item.date).isAfter(
-          (0, import_dayjs.default)(newDates[newDates.length - 1].date),
-          "day"
-        )) {
+        // 判断日程日期是否超过了dates中的最后一个日期，如果超过了则循环break
+        if ((0, _dayjs.default)(item.date).isAfter((0, _dayjs.default)(newDates[newDates.length - 1].date), 'day')) {
           break;
         }
+        // 在范围内的日程如果scheduleMap中不存在，则加入到scheduleMap
         if (!scheduleMap[item.date]) {
           scheduleMap[item.date] = item;
         } else {
@@ -126,70 +163,91 @@ var handleAvailableDatesByRules = (dates, rules) => {
         }
       }
     }
-    const { future_day, unit, unit_type } = (rule == null ? void 0 : rule.cut_off_time) || {};
+    const {
+      future_day,
+      unit,
+      unit_type
+    } = rule?.cut_off_time || {};
+    // 预定天数存在，则开始计算从当前时间开始往后推预定天数作为结束时间
     if (future_day) {
-      const endDate = (0, import_dayjs.default)().add(future_day, "day");
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
-        earliestEndDate = endDate.format("YYYY-MM-DD");
+      const endDate = (0, _dayjs.default)().add(future_day, 'day');
+      if (!earliestEndDate || endDate.isBefore((0, _dayjs.default)(earliestEndDate), 'day')) {
+        earliestEndDate = endDate.format('YYYY-MM-DD');
       }
     } else if (future_day === 0) {
-      const endDate = (0, import_dayjs.default)();
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
-        earliestEndDate = endDate.format("YYYY-MM-DD");
+      const endDate = (0, _dayjs.default)();
+      if (!earliestEndDate || endDate.isBefore((0, _dayjs.default)(earliestEndDate), 'day')) {
+        earliestEndDate = endDate.format('YYYY-MM-DD');
       }
     }
+
+    // 如果存在提前预约时间，则开始计算从当前时间开始往后推提前预约时间作为开始时间
     if (unit && unit_type) {
-      const startDate = (0, import_dayjs.default)(
-        (0, import_dayjs.default)().add(unit, unit_type).format("YYYY-MM-DD")
-      );
-      if (!latestStartDate || startDate.isAfter((0, import_dayjs.default)(latestStartDate), "day")) {
-        latestStartDate = startDate.format("YYYY-MM-DD");
+      const startDate = (0, _dayjs.default)((0, _dayjs.default)().add(unit, unit_type).format('YYYY-MM-DD'));
+      if (!latestStartDate || startDate.isAfter((0, _dayjs.default)(latestStartDate), 'day')) {
+        latestStartDate = startDate.format('YYYY-MM-DD');
       }
     }
-    if ((_b = rule == null ? void 0 : rule.resourceFormIds) == null ? void 0 : _b.length) {
-      resourceFormIds = [
-        .../* @__PURE__ */ new Set([...resourceFormIds, ...rule == null ? void 0 : rule.resourceFormIds])
-      ];
+    if (rule?.resourceFormIds?.length) {
+      // 去重
+      resourceFormIds = [...new Set([...resourceFormIds, ...rule?.resourceFormIds])];
     }
   });
-  newDates = newDates.map((date) => {
-    var _a;
-    const disabledDate = { ...date, status: "unavailable" };
-    const hasScheduleConfig = rules.find((n) => {
-      var _a2;
-      return (_a2 = n.schedule) == null ? void 0 : _a2.length;
-    });
+  newDates = newDates.map(date => {
+    const disabledDate = {
+      ...date,
+      status: 'unavailable'
+    };
+    const hasScheduleConfig = rules.find(n => n.schedule?.length);
+    // 如果外面穿了 schedule，但是这个时候scheduleMap为空，则设置为不可用
+    // 这种情况为，商品设置了 5.1-5.31 可用，资源设置了 5.1-6.30 可用，session 类商品详情弹窗里里看到的6 月以后的日期都应该是不可用的
     if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
-      return { ...date, color: "", status: "unavailable" };
+      return {
+        ...date,
+        color: '',
+        status: 'unavailable'
+      };
     }
+    // 根据日程判断日期是否可用
     if (Object.keys(scheduleMap).length) {
       const schedule = scheduleMap[date.date];
-      if (!schedule || (schedule == null ? void 0 : schedule.isExcluded)) {
-        return { ...date, color: schedule == null ? void 0 : schedule.color, status: "unavailable" };
+      // 如果日程不存在 或者 日程存在但是需要排除，则设置为不可用
+      if (!schedule || schedule?.isExcluded) {
+        return {
+          ...date,
+          color: schedule?.color,
+          status: 'unavailable'
+        };
       } else {
-        date.color = schedule == null ? void 0 : schedule.color;
-        disabledDate.color = schedule == null ? void 0 : schedule.color;
+        date.color = schedule?.color;
+        disabledDate.color = schedule?.color;
       }
     }
-    if (!((_a = date == null ? void 0 : date.resource) == null ? void 0 : _a.length)) {
+
+    // 如果资源不存在，则设置为不可用
+    if (!date?.resource?.length) {
       return disabledDate;
     }
     if (latestStartDate || earliestEndDate) {
-      if (latestStartDate && (0, import_dayjs.default)(date.date).isBefore(latestStartDate, "day")) {
+      // 如果时间在最早开始时间之前，则设置为不可用
+      if (latestStartDate && (0, _dayjs.default)(date.date).isBefore(latestStartDate, 'day')) {
         return disabledDate;
       }
-      if (earliestEndDate && (0, import_dayjs.default)(date.date).isAfter(earliestEndDate, "day")) {
+      // 如果时间在最早结束时间之后，则设置为不可用
+      if (earliestEndDate && (0, _dayjs.default)(date.date).isAfter(earliestEndDate, 'day')) {
         return disabledDate;
       }
     }
-    if (resourceFormIds == null ? void 0 : resourceFormIds.length) {
+
+    // 如果存在资源form_id，则开始计算资源form_id在日期上是否全部存在
+    if (resourceFormIds?.length) {
       let hasReourceCount = 0;
-      resourceFormIds.forEach((formId) => {
-        var _a2;
-        if (((_a2 = date == null ? void 0 : date.resource) == null ? void 0 : _a2.find((item) => item.form_id === formId)) !== void 0) {
+      resourceFormIds.forEach(formId => {
+        if (date?.resource?.find(item => item.form_id === formId) !== undefined) {
           hasReourceCount++;
         }
       });
+      // 如果所需要的资源在日期上不足，则设置为不可用
       if (hasReourceCount < resourceFormIds.length) {
         return disabledDate;
       }
@@ -198,11 +256,4 @@ var handleAvailableDatesByRules = (dates, rules) => {
   });
   return newDates;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  disableAllDates,
-  disableDatesBeforeOneDay,
-  generateMonthDates,
-  handleAvailableDateByResource,
-  handleAvailableDatesByRules
-});
+exports.handleAvailableDatesByRules = handleAvailableDatesByRules;

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

@@ -16,6 +16,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     getDiscountList(): Discount[];
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
+    private normalizePositiveNumberIds;
     loadPrepareConfig(params: {
         action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
@@ -25,7 +26,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
-        order_id?: number;
+        order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
     private extractAvailableWalletIds;
     batchSearch(code: string, options?: {