@pisell/pisellos 1.0.24 → 1.0.26

package/dist/modules/AccountList/index.js

@@ -326,7 +326,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
-              if (((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id) {
+              if (!this.getActiveAccount() || ((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id || this.store.accounts.length === 1) {
                 this.setActiveAccount(this.store.accounts[0].getId());
               }
               _context6.next = 12;

package/dist/modules/Date/index.js

@@ -93,11 +93,14 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     key: "getResourceDates",
     value: function () {
       var _getResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _params$query;
-        var currentDateList, currentDateListMap, resourceIds, hasResource, dates;
+        var _params$query, currentDateList, currentDateListMap, resourceIds, hasResource, dates;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              if (!params.useCache) {
+                _context2.next = 7;
+                break;
+              }
               // 发请求之前，做一道检测，看 dateList 里是否有对应日期，且对应日期里是否都有对应 resource_ids 的资源
               currentDateList = this.getDateList() || [];
               currentDateListMap = new Map(currentDateList.map(function (item) {
@@ -112,18 +115,18 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 });
               });
               if (!hasResource) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
               return _context2.abrupt("return", currentDateList);
-            case 6:
-              _context2.next = 8;
+            case 7:
+              _context2.next = 9;
               return this.getResourceAvailableTimeList(params);
-            case 8:
+            case 9:
               dates = _context2.sent;
               this.setDateList(dates);
               return _context2.abrupt("return", dates);
-            case 11:
+            case 12:
             case "end":
               return _context2.stop();
           }
@@ -151,7 +154,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource;
+          var _item$resource, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
           var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
@@ -160,6 +163,16 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               return m.id === n.id;
             }));
           });
+          // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
+          (_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
+            var _item$resource2;
+            var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
+              return m.id === n.id;
+            });
+            if (newResource) {
+              n.times = newResource.times;
+            }
+          });
           currentItem.resource = [].concat(_toConsumableArray(currentItem.resource || []), _toConsumableArray(newResource || []));
           currentDateList[currentItemIndex] = currentItem;
         } else {
@@ -172,11 +185,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 +198,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

@@ -330,7 +330,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;
@@ -422,16 +422,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 记录实际应用了优惠券的商品信息
           var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+          var productOriginTotal = product.origin_total || product.total || 0;
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.origin_total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.origin_total || 0)).toNumber();
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
           var discountDetail = {
-            amount: new Decimal(product.origin_total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).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,
+              original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
             },
@@ -465,7 +466,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,
-              origin_total: product.origin_total || product.total
+              origin_total: productOriginTotal
             }));
           }
         }

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;
@@ -1407,7 +1410,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
         dateRange.forEach(function (n) {
-          resources.push.apply(resources, _toConsumableArray(_this10.store.date.getResourcesListByDate(n.date) || []));
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
       var cartItems = this.store.cart.getItems().filter(function (n) {

package/dist/solution/ShopDiscount/index.js

@@ -504,7 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             return n.id === id;
           });
           var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
-          return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
+          return Number(product === null || product === void 0 ? void 0 : product.total) === 0;
         };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
           var _item$applicableProdu2;

package/lib/modules/AccountList/index.js

@@ -195,7 +195,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
-      if (((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id) {
+      if (!this.getActiveAccount() || ((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id || this.store.accounts.length === 1) {
         this.setActiveAccount(this.store.accounts[0].getId());
       }
       await this.core.effects.emit(

package/lib/modules/Date/index.js

@@ -70,18 +70,20 @@ var DateModule = class extends import_BaseModule.BaseModule {
   }
   async getResourceDates(params) {
     var _a;
-    const currentDateList = this.getDateList() || [];
-    const currentDateListMap = new Map(
-      currentDateList.map((item) => [item.date, item])
-    );
-    const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
-    const hasResource = resourceIds.every((id) => {
-      var _a2;
-      const currentItem = currentDateListMap.get(id.toString());
-      return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
-    });
-    if (hasResource) {
-      return currentDateList;
+    if (params.useCache) {
+      const currentDateList = this.getDateList() || [];
+      const currentDateListMap = new Map(
+        currentDateList.map((item) => [item.date, item])
+      );
+      const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
+      const hasResource = resourceIds.every((id) => {
+        var _a2;
+        const currentItem = currentDateListMap.get(id.toString());
+        return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
+      });
+      if (hasResource) {
+        return currentDateList;
+      }
     }
     const dates = await this.getResourceAvailableTimeList(params);
     this.setDateList(dates);
@@ -93,7 +95,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
   setDateList(dateList) {
     const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
     dateList.forEach((item) => {
-      var _a;
+      var _a, _b;
       const currentItemIndex = currentDateList.findIndex(
         (n) => n.date === item.date
       );
@@ -105,6 +107,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
             return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
           }
         );
+        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
+          var _a2;
+          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
+          if (newResource2) {
+            n.times = newResource2.times;
+          }
+        });
         currentItem.resource = [
           ...currentItem.resource || [],
           ...newResource || []
@@ -117,22 +126,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")
@@ -293,14 +293,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.origin_total || 0).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(product.origin_total || 0)).toNumber();
+        const productOriginTotal = product.origin_total || product.total || 0;
+        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(product.origin_total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          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: product.origin_total,
+            original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
           },
@@ -331,7 +332,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,
-            origin_total: product.origin_total || product.total
+            origin_total: productOriginTotal
           }));
         }
       }

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;
   }
@@ -817,7 +818,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
       dateRange.forEach((n) => {
-        resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
+        if (n.resource)
+          resources.push(...n.resource);
       });
     }
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));

package/lib/solution/ShopDiscount/index.js

@@ -346,7 +346,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         var _a3;
         const targetProduct = productList.find((n) => n.id === id);
         const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
-        return Number(product == null ? void 0 : product.price) === 0;
+        return Number(product == null ? void 0 : product.total) === 0;
       };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
         var _a3;

package/package.json

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