@pisell/pisellos 3.0.41 → 3.0.43

package/lib/modules/Rules/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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);
 
 // src/modules/Rules/index.ts
@@ -26,6 +36,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -58,8 +69,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    if (productList.every((item) => {
+      var _a;
+      const product = this.hooks.getProduct(item);
+      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || (newDiscountList[0].tag === "good_pass" ? product.price == 0 : product.total == 0));
+    })) {
+      return {
+        isAvailable: false,
+        discountList: oldDiscountList,
+        productList
+      };
+    }
+    const filteredOldDiscountList = oldDiscountList.filter((discount) => !discount.isEditMode && discount.tag !== "good_pass");
     const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
-      ...oldDiscountList,
+      ...filteredOldDiscountList,
       ...newDiscountList
     ]), "product_id");
     const result = this.calcDiscount({
@@ -94,6 +117,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList
   }, options) {
+    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -107,19 +131,43 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      if (a.expire_time && b.expire_time) {
-        const timeA = new Date(a.expire_time).getTime();
-        const timeB = new Date(b.expire_time).getTime();
-        return timeA - timeB;
+      if (a.tag === "good_pass" && b.tag !== "good_pass")
+        return -1;
+      if (b.tag === "good_pass" && a.tag !== "good_pass")
+        return 1;
+      if (a.tag === "good_pass" && b.tag === "good_pass") {
+        return compareByExpireTime(a, b);
+      } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
+        if (a.par_value !== b.par_value) {
+          const valueA = new import_decimal.default(100).minus(a.par_value || 0);
+          const valueB = new import_decimal.default(100).minus(b.par_value || 0);
+          return valueA.minus(valueB).toNumber();
+        }
+        return compareByExpireTime(a, b);
+      }
+      return compareByExpireTime(a, b);
+      function compareByExpireTime(itemA, itemB) {
+        if (itemA.expire_time && itemB.expire_time) {
+          const timeA = new Date(itemA.expire_time).getTime();
+          const timeB = new Date(itemB.expire_time).getTime();
+          return timeA - timeB;
+        }
+        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
       }
-      return a.expire_time ? -1 : b.expire_time ? 1 : 0;
     });
     const sortedProductList = [...productList].sort((a, b) => {
+      var _a, _b;
       const aProduct = this.hooks.getProduct(a);
       const bProduct = this.hooks.getProduct(b);
-      const priceA = parseFloat(aProduct.price || "0");
-      const priceB = parseFloat(bProduct.price || "0");
-      return priceB - priceA;
+      const priceA = new import_decimal.default(aProduct.price || "0");
+      const priceB = new import_decimal.default(bProduct.price || "0");
+      if (priceA.toNumber() === priceB.toNumber()) {
+        if (aProduct.quantity === bProduct.quantity) {
+          return ((_a = bProduct.discount_list) == null ? void 0 : _a.length) - ((_b = aProduct.discount_list) == null ? void 0 : _b.length);
+        }
+        return aProduct.quantity - bProduct.quantity;
+      }
+      return priceB.toNumber() - priceA.toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -136,32 +184,42 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && discount2.type === "good_pass")));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           applicableProducts.push({
             amount: product.price,
-            type: discount.tag,
+            type: discount.tag || discount.type,
+            tag: discount.tag || discount.type,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
-              original_amount: product.origin_total
-            }
+              original_amount: product.origin_total,
+              pre_value: discount.par_value,
+              product_id: originProduct.id
+            },
+            num: product.num || 1
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
     });
-    sortedProductList.forEach((originProduct) => {
-      var _a, _b, _c, _d, _e;
+    console.log(sortedProductList, "sortedProductListsortedProductList");
+    sortedProductList.forEach((originProduct, i) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
-        processedProductsMap.set(product._id, originProduct);
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
+        processedProductsMap.set(product._id, [originProduct]);
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (usedDiscounts.get(discount.id))
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+          return false;
+        if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== "good_pass")
+          return false;
+        const targetUsedDiscounts = usedDiscounts.get(discount.id);
+        if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
@@ -171,16 +229,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscount = applicableDiscounts[0];
+      const selectedDiscountCard = applicableDiscounts.find((n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass");
+      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
-      if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
+      if ((options == null ? void 0 : options.discountId) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
+        var _a2;
+        return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+      }))) {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
@@ -189,6 +251,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   bundle: product.bundle,
                   options: product.options
                 }),
+                variant: originProduct._productInit.variant,
+                original_price: originProduct._productInit.original_price,
                 total: (0, import_utils2.getProductTotalPrice)({
                   product: {
                     price: product.price
@@ -199,45 +263,67 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         } else {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
+                _id: product._id.split("___")[0] + "___" + i,
                 total: product.origin_total || product.total,
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
         return;
       }
-      usedDiscounts.set(selectedDiscount.id, true);
-      const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-      const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
-        discount: {
-          resource_id: selectedDiscount.id,
-          title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
+      const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
+      const splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length) : 1;
+      const arr = [];
+      if (splitCount < product.quantity && isNeedSplit) {
+        arr.push(this.hooks.setProduct(originProduct, {
+          discount_list: [],
+          quantity: product.quantity - splitCount,
+          _id: product._id.split("___")[0]
+        }));
+      }
+      for (let i2 = 0; i2 < splitCount; i2++) {
+        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
+        usedDiscounts.set(selectedDiscount2.id, true);
+        const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+        let productOriginTotal = product.origin_total || product.total || 0;
+        if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          productOriginTotal = product.total;
         }
-      };
-      appliedProducts.push(discountDetail);
-      appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-      if (product.isClient) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+        if ((_h = product.discount_list) == null ? void 0 : _h.length) {
+          productOriginTotal = product.origin_total;
+        }
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
+        const discountDetail = {
+          amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          discount: {
+            resource_id: selectedDiscount2.id,
+            title: selectedDiscount2.format_title,
+            original_amount: productOriginTotal,
+            product_id: originProduct.id,
+            percent: selectedDiscount2.par_value
+          },
+          num: product.num || 1
+        };
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+        if (product.isClient) {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+            quantity: isNeedSplit ? 1 : product.quantity,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -245,28 +331,26 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
-            total: (0, import_utils2.getProductTotalPrice)({
-              product: {
-                price: "0"
-              },
-              bundle: product.bundle,
-              options: product.options
-            })
-          })
-        );
-      } else {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+            variant: originProduct._productInit.variant,
+            original_price: new import_decimal.default(product.price || 0).toNumber(),
+            total: targetProductTotal
+          }));
+        } else {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
-            origin_total: product.origin_total || product.total
-          })
-        );
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+            quantity: isNeedSplit ? 1 : product.quantity,
+            total: targetProductTotal,
+            origin_total: productOriginTotal
+          }));
+        }
       }
+      console.log(arr, "arrarrarr");
+      processedProductsMap.set(product._id, arr);
     });
-    const processedProductList = productList.map((originProduct) => {
+    const processedProductList = [];
+    productList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       const getDefaultProduct = () => {
         if (product.isClient) {
@@ -280,6 +364,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
+            variant: originProduct._productInit.variant,
+            original_price: originProduct._productInit.original_price,
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
                 price: product.price
@@ -297,7 +383,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           });
         }
       };
-      return processedProductsMap.get(product._id) || getDefaultProduct();
+      const arr = processedProductsMap.get(product._id);
+      (arr == null ? void 0 : arr.length) ? processedProductList.push(...arr) : processedProductList.push(getDefaultProduct());
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];
@@ -321,6 +408,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return {
           ...discount,
           isSelected: true,
+          isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
           // 标记为可用，因为它已被应用
           isAvailable: true,
           // 记录适用的商品IDs
@@ -342,6 +430,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         // 如果有适用的商品，标记为可用
         isAvailable,
         isSelected,
+        // 如果是扫码进来的，要手动设置为手动选择：false
+        isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
         // 记录适用的商品IDs
         applicableProductIds: applicableProducts,
         // 添加可抵扣的商品详情
@@ -350,6 +440,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProductDetails: []
       };
     });
+    console.log(processedProductList, "processedProductList");
     return {
       productList: processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]

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

@@ -37,14 +37,20 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
+    quantity: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
     setProduct: (product: Record<string, any>, values: {
+        _id?: string;
         total?: number;
         discount_list: any[];
         origin_total?: number;
-        price?: number;
+        price?: string | number;
+        variant?: any[];
+        original_price?: number;
+        quantity?: number;
     }) => Record<string, any>;
 }
 export {};

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

@@ -1,16 +1,24 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem, LoadScheduleAvailableDateParams } from './types';
 export declare class ScheduleModule extends BaseModule implements Module, ScheduleModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
+    private request;
     private store;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 加载当前店铺下所有 schedule
+     *
+     * @memberof ScheduleModule
+     */
+    loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];

package/lib/modules/Schedule/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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);
 
 // src/modules/Schedule/index.ts
@@ -24,6 +34,12 @@ __export(Schedule_exports, {
 module.exports = __toCommonJS(Schedule_exports);
 var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
+var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
+var import_utils = require("../Date/utils");
+import_dayjs.default.extend(import_isSameOrBefore.default);
+import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -35,6 +51,10 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   async initialize(core, options) {
     var _a, _b;
     this.core = core;
+    this.request = core.getPlugin("request");
+    if (!this.request) {
+      throw new Error("ScheduleModule 需要 request 插件支持");
+    }
     this.store = options == null ? void 0 : options.store;
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
@@ -51,9 +71,67 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+  /**
+   * 加载当前店铺下所有 schedule
+   *
+   * @memberof ScheduleModule
+   */
+  async loadAllSchedule() {
+    var _a;
+    const scheduleList = await this.request.get(
+      `/schedule`,
+      { num: 999 },
+      { useCache: true }
+    );
+    this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
+  }
   setScheduleList(list) {
     this.store.scheduleList = list;
   }
+  async loadScheduleAvailableDate({
+    startDate,
+    endDate,
+    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");
+    }
+    let dates = (0, import_utils.generateMonthDates)(startDate, endDate);
+    dates = (0, import_utils.disableAllDates)(dates);
+    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+      return dates;
+    }
+    const res = await this.request.get(
+      `/schedule/product/availability/v2`,
+      {
+        start_date: startDate,
+        end_date: endDate,
+        custom_page_id,
+        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")) {
+      return dates;
+    }
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+      dates.forEach((n) => {
+        n.status = "available";
+      });
+    } else {
+      res.data.date_list.forEach((n) => {
+        const index = dates.findIndex((m) => m.date === n.date);
+        if (index !== -1) {
+          dates[index].status = "available";
+        }
+      });
+    }
+    dates = (0, import_utils.disableDatesBeforeOneDay)(dates);
+    return dates;
+  }
   getScheduleListByIds(ids) {
     return this.store.scheduleList.filter((n) => ids.includes(n.id));
   }
@@ -76,7 +154,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["scheduleList", "availabilityDateList"]
+        cacheKey: ["scheduleList", "availabilityDateList", "otherProductsIds"]
       });
     }
   }

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

@@ -9,6 +9,19 @@ export type ScheduleAvailabilityDateItem = {
     schedule_id: number[];
     product_ids: number[];
 };
+/**
+ * 加载日程可用日期参数接口
+ */
+export interface LoadScheduleAvailableDateParams {
+    /** 开始日期 */
+    startDate: string;
+    /** 结束日期 */
+    endDate: string;
+    /** 自定义页面ID */
+    custom_page_id?: number;
+    /** 渠道 */
+    channel?: string;
+}
 export interface ScheduleModuleAPI {
 }
 export type ScheduleItem = {

package/lib/modules/Schedule/utils.js

@@ -140,7 +140,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
       const _start = startTmp.day(item);
-      const _end = _start.add(scheduleDiff, "second");
+      let _end = _start.add(scheduleDiff, "second");
+      if (_end.isAfter(deadline, "day")) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
           startTmp = startTmp.day(1).add(frequency, "day");