@pisell/pisellos 0.0.174 → 0.0.176

package/dist/modules/Date/index.js

@@ -172,11 +172,11 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchResourceDates",
     value: function () {
       var _fetchResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var url, query, fetchUrl, _ref, start_date, end_date, resource_ids, res;
+        var url, query, _params$useCache, useCache, fetchUrl, _ref, start_date, end_date, resource_ids, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              url = params.url, query = params.query;
+              url = params.url, query = params.query, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache;
               fetchUrl = url || '/schedule/resource/list';
               _ref = query || {}, start_date = _ref.start_date, end_date = _ref.end_date, resource_ids = _ref.resource_ids;
               _context3.prev = 3;
@@ -185,9 +185,9 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 start_date: start_date,
                 end_date: end_date,
                 resource_ids: resource_ids,
-                front_end_cache_id: this.cacheId
+                front_end_cache_id: useCache && this.cacheId
               }, {
-                useCache: true
+                useCache: useCache
               });
             case 6:
               res = _context3.sent;

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

@@ -43,6 +43,8 @@ export interface DateModuleAPI {
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 是否使用缓存 */
+    useCache?: boolean;
     /** 查询参数 */
     query?: {
         /** 开始日期 */

package/dist/modules/Rules/index.js

@@ -328,7 +328,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          if (Number(product.price) === 0 || !product.price) return false;
+          if (Number(product.price) === 0 && discount.tag === 'good_pass' || Number(product.total) === 0 && discount.tag !== 'good_pass' || !product.price) return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;

package/dist/solution/BookingByStep/index.d.ts

@@ -131,6 +131,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getCart(): CartItem[];
     getAvailableDate(params?: {
         url?: string;
+        useCache?: boolean;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;

package/dist/solution/BookingByStep/index.js

@@ -681,6 +681,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           startDate,
           endDate,
           type,
+          _params$useCache,
+          useCache,
           tempProducts,
           dateRange,
           tempStartDate,
@@ -696,7 +698,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               params = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
-              products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
+              products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
@@ -738,7 +740,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: resourceIds
                 },
                 rules: rules,
-                type: type
+                type: type,
+                useCache: useCache
               });
             case 15:
               res = _context12.sent;

package/lib/modules/Date/index.js

@@ -117,22 +117,18 @@ var DateModule = class extends import_BaseModule.BaseModule {
     this.store.dateList = currentDateList;
   }
   async fetchResourceDates(params) {
-    const { url, query } = params;
+    const { url, query, useCache = true } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
     try {
-      const res = await this.request.get(
-        fetchUrl,
-        {
-          start_date,
-          end_date,
-          resource_ids,
-          front_end_cache_id: this.cacheId
-        },
-        {
-          useCache: true
-        }
-      );
+      const res = await this.request.get(fetchUrl, {
+        start_date,
+        end_date,
+        resource_ids,
+        front_end_cache_id: useCache && this.cacheId
+      }, {
+        useCache
+      });
       return res;
     } catch (error) {
       console.error(error);

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

@@ -43,6 +43,8 @@ export interface DateModuleAPI {
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 是否使用缓存 */
+    useCache?: boolean;
     /** 查询参数 */
     query?: {
         /** 开始日期 */

package/lib/modules/Rules/index.js

@@ -213,7 +213,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (Number(product.price) === 0 || !product.price)
+        if (Number(product.price) === 0 && discount.tag === "good_pass" || Number(product.total) === 0 && discount.tag !== "good_pass" || !product.price)
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")

package/lib/solution/BookingByStep/index.d.ts

@@ -131,6 +131,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getCart(): CartItem[];
     getAvailableDate(params?: {
         url?: string;
+        useCache?: boolean;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;

package/lib/solution/BookingByStep/index.js

@@ -388,7 +388,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
     var _a, _b, _c;
-    let { products, startDate, endDate, type } = params;
+    let { products, startDate, endDate, type, useCache = true } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -425,7 +425,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: resourceIds
       },
       rules,
-      type
+      type,
+      useCache
     });
     return res;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.174",
+  "version": "0.0.176",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",