@pisell/pisellos 1.0.0 → 1.0.1

package/dist/modules/Rules/index.js

@@ -27,7 +27,6 @@ import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
-import Decimal from 'decimal.js';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -107,18 +106,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
       }
 
-      // 编辑商品已有商品券
-      if (productList.every(function (item) {
-        var _item$discount_list;
-        return item.booking_id && (((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length) || item.price == 0);
-      })) {
-        return {
-          isAvailable: false,
-          discountList: oldDiscountList,
-          productList: productList
-        };
-      }
-
       // 合并新旧折扣列表，并计算折扣结果
       var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
@@ -161,13 +148,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = productList.find(function (n) {
-        return n.booking_id;
-      }) && productList.find(function (n) {
-        return !n.booking_id;
-      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -183,69 +163,24 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return !discount.isManualSelect;
       });
 
-      // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
-      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
-      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
+      // 优惠券按过期时间排序（即将过期优先）
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
-        // 1. 商品券优先级最高
-        if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
-        if (b.tag === 'good_pass' && a.tag !== 'good_pass') return 1;
-
-        // 2. 如果都是商品券或都不是商品券，按照类型和折扣力度排序
-        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') {
-          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
-          if (a.par_value !== b.par_value) {
-            var valueA = new Decimal(100).minus(a.par_value || 0);
-            var valueB = new Decimal(100).minus(b.par_value || 0);
-            return valueA.minus(valueB).toNumber();
-          }
-          // 相同折扣的情况下，按照过期时间排序
-          return compareByExpireTime(a, b);
-        }
-
-        // 3. 其他情况按照过期时间排序
-        return compareByExpireTime(a, b);
-        function compareByExpireTime(itemA, itemB) {
-          if (itemA.expire_time && itemB.expire_time) {
-            var timeA = new Date(itemA.expire_time).getTime();
-            var timeB = new Date(itemB.expire_time).getTime();
-            return timeA - timeB;
-          }
-          // 有过期时间的优先级高于永久的
-          return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
+        if (a.expire_time && b.expire_time) {
+          var timeA = new Date(a.expire_time).getTime();
+          var timeB = new Date(b.expire_time).getTime();
+          return timeA - timeB;
         }
+        // 有过期时间的优先级高于永久的
+        return a.expire_time ? -1 : b.expire_time ? 1 : 0;
       });
 
-      // const newProductList = [];
-      //
-      // productList.forEach(item => {
-      //   const product = this.hooks.getProduct(item);
-      //   if (product.quantity > 1) {
-      //     for (let i = 1; i < product.quantity; i++) {
-      //       newProductList.push(product)
-      //     }
-      //   } else {
-      //     newProductList.push(item)
-      //   }
-      // })
-
-      // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
+      // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedProductList = _toConsumableArray(productList).sort(function (a, b) {
         var aProduct = _this3.hooks.getProduct(a);
         var bProduct = _this3.hooks.getProduct(b);
-        var priceA = new Decimal(aProduct.price || '0');
-        var priceB = new Decimal(bProduct.price || '0');
-        if (priceA.toNumber() === priceB.toNumber()) {
-          if (aProduct.quantity === bProduct.quantity) {
-            var _bProduct$discount_li, _aProduct$discount_li;
-            return ((_bProduct$discount_li = bProduct.discount_list) === null || _bProduct$discount_li === void 0 ? void 0 : _bProduct$discount_li.length) - ((_aProduct$discount_li = aProduct.discount_list) === null || _aProduct$discount_li === void 0 ? void 0 : _aProduct$discount_li.length);
-          }
-          return aProduct.quantity - bProduct.quantity;
-        }
-        return priceB.toNumber() - priceA.toNumber();
+        var priceA = parseFloat(aProduct.price || '0');
+        var priceB = parseFloat(bProduct.price || '0');
+        return priceB - priceA;
       });
 
       // 标记已使用的优惠券
@@ -281,7 +216,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
+            return discount.id && discount.type === 'good_pass';
           }));
 
           // 判断优惠券是否适用于该商品
@@ -294,41 +229,33 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
             applicableProducts.push({
               amount: product.price,
-              type: discount.tag || discount.type,
-              tag: discount.tag || discount.type,
+              type: discount.tag,
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
-                original_amount: product.origin_total,
-                pre_value: discount.par_value,
-                product_id: originProduct.id
-              },
-              num: product.num || 1
+                original_amount: product.origin_total
+              }
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
         });
       });
-      console.log(sortedProductList, 'sortedProductListsortedProductList');
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
-      sortedProductList.forEach(function (originProduct, i) {
+      sortedProductList.forEach(function (originProduct) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
+          return discount.id && discount.type === 'good_pass';
         })) {
-          processedProductsMap.set(product._id, [originProduct]);
+          processedProductsMap.set(product._id, originProduct);
           return;
         }
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
-          // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          if (Number(product.price) === 0 || !product.price) return false;
           // 如果优惠券已被使用，则跳过
-          var targetUsedDiscounts = usedDiscounts.get(discount.id);
-          if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
+          if (usedDiscounts.get(discount.id)) return false;
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
@@ -349,17 +276,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && product.discount_list.some(function (item) {
-          var _item$discount;
-          return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
-        })) {
+        if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {
           isManualDiscount = false;
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (product.isClient) {
-            processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               origin_total: getProductOriginTotalPrice({
                 product: {
                   original_price: product.original_price
@@ -367,8 +291,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
-              variant: originProduct._productInit.variant,
-              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price
@@ -379,115 +301,72 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: product.price
             }), {}, {
               discount_list: []
-            }))]);
+            })));
           } else {
-            processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-              _id: product._id.split('___')[0] + '___' + i,
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               total: product.origin_total || product.total,
               price: product.price
             }), {}, {
               discount_list: []
-            }))]);
+            })));
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
           return;
         }
 
-        // 是否需要拆分
-        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
-
-        // 需要拆分出来的数量
-        var splitCount = isNeedSplit ? Math.min(product.quantity, applicableDiscounts.filter(function (item) {
-          return (item.tag || item.type) === 'good_pass';
-        }).length) : 1;
-        var arr = [];
-        if (splitCount < product.quantity && isNeedSplit) {
-          arr.push(_this3.hooks.setProduct(originProduct, {
-            discount_list: [],
-            quantity: product.quantity - splitCount,
-            _id: product._id.split('___')[0]
-          }));
-        }
-        var _loop = function _loop() {
-          var selectedDiscount = applicableDiscounts[_i];
-          // 标记优惠券为已使用
-          usedDiscounts.set(selectedDiscount.id, true);
-
-          // 记录实际应用了优惠券的商品信息
-          var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-          var targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
-          var discountDetail = {
-            amount: selectedDiscount.tag === 'good_pass' ? product.price : new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber(),
-            type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
-            discount: {
-              resource_id: selectedDiscount.id,
-              title: selectedDiscount.format_title,
-              original_amount: product.origin_total || product.price,
-              product_id: originProduct.id,
-              percent: selectedDiscount.par_value
-            },
-            num: product.num || 1
-          };
-          appliedProducts.push(discountDetail);
-          appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-
-          // 记录应用了优惠券的商品
-          // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
-          if (product.isClient) {
-            var _originProduct$_produ;
-            var variant = (_originProduct$_produ = originProduct._productOrigin.variant) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.map(function (n) {
-              var _originProduct$_produ2;
-              if (n.id === ((_originProduct$_produ2 = originProduct._productOrigin) === null || _originProduct$_produ2 === void 0 ? void 0 : _originProduct$_produ2.product_variant_id)) {
-                n.original_price = n.price;
-                var _targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(n.price || 0)).toFixed(2);
-                n.price = _targetProductPrice;
-              }
-              return n;
-            });
-            arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: [discountDetail],
-              price: new Decimal(targetProductPrice).toNumber(),
-              quantity: isNeedSplit ? 1 : product.quantity,
-              origin_total: getProductOriginTotalPrice({
-                product: {
-                  original_price: targetProductPrice
-                },
-                bundle: product.bundle,
-                options: product.options
-              }),
-              variant: variant,
-              original_price: new Decimal(product.price).toNumber(),
-              total: getProductTotalPrice({
-                product: {
-                  price: targetProductPrice
-                },
-                bundle: product.bundle,
-                options: product.options
-              })
-            }));
-          } else {
-            arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + selectedDiscount.id,
-              price: new Decimal(targetProductPrice).toNumber(),
-              quantity: isNeedSplit ? 1 : product.quantity,
-              total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
-              origin_total: product.origin_total || product.total
-            }));
+        // 标记优惠券为已使用
+        usedDiscounts.set(selectedDiscount.id, true);
+
+        // 记录实际应用了优惠券的商品信息
+        var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+        var 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
           }
         };
-        for (var _i = 0; _i < splitCount; _i++) {
-          _loop();
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+
+        // 记录应用了优惠券的商品
+        // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
+        if (product.isClient) {
+          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            origin_total: getProductOriginTotalPrice({
+              product: {
+                original_price: product.original_price
+              },
+              bundle: product.bundle,
+              options: product.options
+            }),
+            total: getProductTotalPrice({
+              product: {
+                price: '0'
+              },
+              bundle: product.bundle,
+              options: product.options
+            })
+          }));
+        } else {
+          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            total: (product.origin_total || product.total) - product.price,
+            origin_total: product.origin_total || product.total
+          }));
         }
-        console.log(arr, 'arrarrarr');
-        processedProductsMap.set(product._id, arr);
       });
 
       // 按原始顺序构建处理后的商品列表
-      var processedProductList = [];
-      productList.forEach(function (originProduct) {
+      var processedProductList = productList.map(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
         var getDefaultProduct = function getDefaultProduct() {
           if (product.isClient) {
@@ -501,8 +380,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
-              variant: originProduct._productInit.variant,
-              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price
@@ -520,8 +397,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             });
           }
         };
-        var arr = processedProductsMap.get(product._id);
-        arr !== null && arr !== void 0 && arr.length ? processedProductList.push.apply(processedProductList, _toConsumableArray(arr)) : processedProductList.push(getDefaultProduct());
+        return processedProductsMap.get(product._id) || getDefaultProduct();
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券
@@ -584,7 +460,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           appliedProductDetails: []
         });
       });
-      console.log(processedProductList, 'processedProductList');
       return {
         productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))

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

@@ -37,20 +37,14 @@ 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;
-        quantity?: number;
-        variant?: any[];
-        original_price?: number;
     }) => Record<string, any>;
 }
 export {};

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

@@ -1,24 +1,16 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem, LoadScheduleAvailableDateParams } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } 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/dist/modules/Schedule/index.js

@@ -17,12 +17,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { cloneDeep } from 'lodash-es';
 import { BaseModule } from "../BaseModule";
-import dayjs from 'dayjs';
-import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
-import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
-import { generateMonthDates, disableAllDates, disableDatesBeforeOneDay } from "../Date/utils";
-dayjs.extend(isSameOrBefore);
-dayjs.extend(isSameOrAfter);
 export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(ScheduleModule, _BaseModule);
   var _super = _createSuper(ScheduleModule);
@@ -32,7 +26,6 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _this = _super.call(this, name, version);
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'schedule');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
-    _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", {});
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
@@ -48,15 +41,6 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
-
-              // 获取依赖的插件
-              this.request = core.getPlugin('request');
-              if (this.request) {
-                _context.next = 4;
-                break;
-              }
-              throw new Error('ScheduleModule 需要 request 插件支持');
-            case 4:
               // if (options?.initialState) {
               //   this.state = { ...this.state, ...options.initialState }
               // }
@@ -75,7 +59,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               if ((_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
-            case 8:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -86,115 +70,11 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
-    /**
-     * 加载当前店铺下所有 schedule
-     *
-     * @memberof ScheduleModule
-     */
-  }, {
-    key: "loadAllSchedule",
-    value: (function () {
-      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _scheduleList$data;
-        var scheduleList;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.request.get("/schedule", {
-                num: 999
-              }, {
-                useCache: true
-              });
-            case 2:
-              scheduleList = _context2.sent;
-              this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function loadAllSchedule() {
-        return _loadAllSchedule.apply(this, arguments);
-      }
-      return loadAllSchedule;
-    }())
   }, {
     key: "setScheduleList",
     value: function setScheduleList(list) {
       this.store.scheduleList = list;
     }
-  }, {
-    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;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              startDate = _ref.startDate, endDate = _ref.endDate, custom_page_id = _ref.custom_page_id, channel = _ref.channel;
-              // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
-              if (dayjs(startDate).isBefore(dayjs(), 'day')) {
-                startDate = dayjs().format('YYYY-MM-DD');
-              }
-              // 1.生成当前月份的所有日期，默认都不可用
-              dates = generateMonthDates(startDate, endDate);
-              dates = disableAllDates(dates);
-              // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
-              if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
-                _context3.next = 6;
-                break;
-              }
-              return _context3.abrupt("return", dates);
-            case 6:
-              _context3.next = 8;
-              return this.request.get("/schedule/product/availability/v2", {
-                start_date: startDate,
-                end_date: endDate,
-                custom_page_id: custom_page_id,
-                channel: channel
-              });
-            case 8:
-              res = _context3.sent;
-              this.setAvailabilityScheduleDateList(res.data.date_list);
-              this.setOtherProductsIds(res.data.other_product_ids || []);
-              // 如果没有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;
-                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) {
-                // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
-                dates.forEach(function (n) {
-                  n.status = 'available';
-                });
-              } else {
-                res.data.date_list.forEach(function (n) {
-                  var index = dates.findIndex(function (m) {
-                    return m.date === n.date;
-                  });
-                  if (index !== -1) {
-                    dates[index].status = 'available';
-                  }
-                });
-              }
-              dates = disableDatesBeforeOneDay(dates);
-              return _context3.abrupt("return", dates);
-            case 16:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function loadScheduleAvailableDate(_x3) {
-        return _loadScheduleAvailableDate.apply(this, arguments);
-      }
-      return loadScheduleAvailableDate;
-    }()
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
@@ -232,7 +112,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: store,
-          cacheKey: ['scheduleList', 'availabilityDateList', 'otherProductsIds']
+          cacheKey: ['scheduleList', 'availabilityDateList']
         });
       }
     }

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

@@ -9,19 +9,6 @@ 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 = {