@pisell/pisellos 0.0.192 → 1.0.0

package/dist/modules/AccountList/index.js

@@ -303,7 +303,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeAccount",
     value: function () {
       var _removeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
-        var _this$getActiveAccoun, index;
+        var index;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -324,31 +324,26 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;
               });
-
-              // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
-              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;
+              _context6.next = 11;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 12:
-              _context6.next = 19;
+            case 11:
+              _context6.next = 18;
               break;
-            case 14:
-              _context6.prev = 14;
+            case 13:
+              _context6.prev = 13;
               _context6.t0 = _context6["catch"](0);
               this.store.error = _context6.t0 instanceof Error ? _context6.t0.message : 'Failed to remove account';
-              _context6.next = 19;
+              _context6.next = 18;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
-            case 19:
-              _context6.prev = 19;
+            case 18:
+              _context6.prev = 18;
               this.store.isLoading = false;
-              return _context6.finish(19);
-            case 22:
+              return _context6.finish(18);
+            case 21:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 14, 19, 22]]);
+        }, _callee6, this, [[0, 13, 18, 21]]);
       }));
       function removeAccount(_x9) {
         return _removeAccount.apply(this, arguments);

package/dist/modules/Cart/index.js

@@ -256,8 +256,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           bundle: bundle,
           options: options,
           product_variant_id: newProduct.product_variant_id,
-          quantity: quantity,
-          discounts: discounts
+          quantity: quantity
         });
       }
       if (discounts) {

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -20,7 +20,6 @@ export declare const formatProductToCartItem: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
-    discounts?: any[];
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -41,7 +40,6 @@ export declare const getProductTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
-    discounts?: any[];
 }) => number;
 /**
  * 获取商品原始总价
@@ -54,7 +52,6 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
-    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/dist/modules/Cart/utils/cartProduct.js

@@ -22,17 +22,13 @@ import { isNormalProduct } from "../../Product/utils";
 export var handleVariantProduct = function handleVariantProduct(product) {
   // 判断组合商品，然后直接修改 product 里的价格和 is_charge_tax
   if (product !== null && product !== void 0 && product.product_variant_id) {
-    var _product$variant;
     // 还需要判断 能从 variant 里找到对应的组合规格信息，才可以替换
-    var targetVariant = product === null || product === void 0 || (_product$variant = product.variant) === null || _product$variant === void 0 ? void 0 : _product$variant.find(function (n) {
+    var targetVariant = product.variant.find(function (n) {
       return n.id === product.product_variant_id;
     });
     if (targetVariant) {
       product.price = targetVariant.price;
-      // 如果 original_price 为 0，就不改了
-      if (Number(targetVariant.original_price) > 0) {
-        product.original_price = targetVariant.original_price;
-      }
+      product.original_price = targetVariant.original_price;
       product.is_charge_tax = targetVariant.is_charge_tax;
     }
   }
@@ -46,15 +42,13 @@ export var handleVariantProduct = function handleVariantProduct(product) {
  */
 export var formatProductToCartItem = function formatProductToCartItem(params) {
   var _product$custom_depos;
-  console.log('formatProductToCartItem>>>>>>', params);
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
     options = params.options,
     product_variant_id = params.product_variant_id,
     _params$quantity = params.quantity,
-    quantity = _params$quantity === void 0 ? 1 : _params$quantity,
-    discounts = params.discounts;
+    quantity = _params$quantity === void 0 ? 1 : _params$quantity;
   var num = quantity; // 当前按照单个商品加入购物车
   if (product) {
     cartItem.id = product === null || product === void 0 ? void 0 : product.id;
@@ -65,16 +59,14 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       product: product,
       bundle: bundle,
       options: options,
-      num: num,
-      discounts: discounts
+      num: num
     });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
       bundle: bundle,
       options: options,
-      num: num,
-      discounts: discounts
+      num: num
     });
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
@@ -90,17 +82,17 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   }
   // 拼装出 product_option_string
   if (product_variant_id) {
-    var _product$variant2;
-    var sku_key = product === null || product === void 0 || (_product$variant2 = product.variant) === null || _product$variant2 === void 0 || (_product$variant2 = _product$variant2.find(function (n) {
+    var _product$variant$find;
+    var sku_key = (_product$variant$find = product.variant.find(function (n) {
       return n.id === product_variant_id;
-    })) === null || _product$variant2 === void 0 ? void 0 : _product$variant2.sku_key;
+    })) === null || _product$variant$find === void 0 ? void 0 : _product$variant$find.sku_key;
     if (sku_key) {
       var sku_key_arr = sku_key.split('_');
       var product_option_string = [];
       sku_key_arr.forEach(function (item) {
-        var _product$variant_grou, _targetVariantGroup$v;
+        var _targetVariantGroup$v;
         var keyMap = item.split(':');
-        var targetVariantGroup = product === null || product === void 0 || (_product$variant_grou = product.variant_group) === null || _product$variant_grou === void 0 ? void 0 : _product$variant_grou.find(function (n) {
+        var targetVariantGroup = product.variant_group.find(function (n) {
           return String(n.position_id) === keyMap[0];
         });
         var targetVariantItem = targetVariantGroup === null || targetVariantGroup === void 0 || (_targetVariantGroup$v = targetVariantGroup.variant_item) === null || _targetVariantGroup$v === void 0 ? void 0 : _targetVariantGroup$v.find(function (n) {
@@ -169,8 +161,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
 export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options,
-    discounts = params.discounts;
+    options = params.options;
   // const num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -185,18 +176,6 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-
-  // 如果商品有折扣，则计算折扣
-  if (discounts !== null && discounts !== void 0 && discounts.length) {
-    discounts.forEach(function (currentValue) {
-      // 不是商品券则代表折扣卡，计算打折后的价格
-      // 一个商品折扣卡只能存在于一张
-      if (currentValue.type !== 'good_pass') {
-        var discountPrice = new Decimal(100).minus(currentValue.discount.percent || 0).div(100).mul(new Decimal(price || 0)).toFixed(2);
-        price = Number(discountPrice);
-      }
-    });
-  }
   return price;
 };
 
@@ -209,11 +188,19 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
 export var getProductOriginTotalPrice = function getProductOriginTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options,
-    discounts = params.discounts;
+    options = params.options;
   var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
   var price = Number(product.original_price);
-  if ((isNaN(price) || price === 0) && !(discounts !== null && discounts !== void 0 && discounts.length)) {
+
+  // if (product.discount_list?.length) {
+  //   price = product.discount_list.reduce((accumulator: any, currentValue: any) => {
+  //     return (
+  //       accumulator + Number(currentValue.price) * Number(currentValue.num)
+  //     );
+  //   }, price);
+  // }
+
+  if (isNaN(price) || price === 0) {
     return undefined;
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -346,38 +333,16 @@ export var getProductDeposit = function getProductDeposit(params) {
         productHasDeposit = true;
       }
     } else {
-      // 组合规格商品
-      if (product !== null && product !== void 0 && product.product_variant_id) {
-        var _product$variant3;
-        var variantProduct = product === null || product === void 0 || (_product$variant3 = product.variant) === null || _product$variant3 === void 0 ? void 0 : _product$variant3.find(function (item) {
-          return (item === null || item === void 0 ? void 0 : item.id) === (product === null || product === void 0 ? void 0 : product.product_variant_id);
-        });
-        if (variantProduct) {
-          var depositData = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.custom_deposit_data;
-          var _handleProductDeposit2 = handleProductDeposit({
-              depositData: depositData,
-              total: (cartItem === null || cartItem === void 0 ? void 0 : cartItem.total) || 0,
-              num: num
-            }),
-            _depositTotal = _handleProductDeposit2.depositTotal,
-            _result = _handleProductDeposit2.result;
-          if (_result) {
-            total = _depositTotal;
-            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
-            productHasDeposit = true;
-          }
-        }
-      }
       if (bundle !== null && bundle !== void 0 && bundle.length) {
         total = bundle.reduce(function (accumulator, currBundleProduct) {
           var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
-          var _handleProductDeposit3 = handleProductDeposit({
+          var _handleProductDeposit2 = handleProductDeposit({
               depositData: depositData,
               total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
               num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
             }),
-            depositTotal = _handleProductDeposit3.depositTotal,
-            result = _handleProductDeposit3.result;
+            depositTotal = _handleProductDeposit2.depositTotal,
+            result = _handleProductDeposit2.result;
           if (result) {
             protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
             productHasDeposit = true;

package/dist/modules/Cart/utils/changePrice.js

@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _item$_productOrigin, _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
+            var _bundle;
+            var item, targetProduct, cartProduct, productInfo, bundle;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,7 +40,6 @@ function _updateAllCartItemPrice() {
                   bundle = item._bundleOrigin;
                   productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
                   productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -63,29 +62,12 @@ function _updateAllCartItemPrice() {
                     }
                     return n;
                   });
-                  // 如果有返回variant，则把对应variant的数据也补充进去
-                  if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
-                    productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
-                      var _targetProduct$varian;
-                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
-                        return m.id === n.id;
-                      });
-                      if (targetVariant) {
-                        return _objectSpread(_objectSpread({}, n), {}, {
-                          price: targetVariant.price,
-                          base_price: targetVariant.base_price
-                        });
-                      }
-                      return n;
-                    });
-                  }
                   updateCart({
                     _id: item._id,
                     product: productInfo,
-                    bundle: bundle,
-                    options: item._optionsOrigin
+                    bundle: bundle
                   });
-                case 13:
+                case 11:
                 case "end":
                   return _context.stop();
               }

package/dist/modules/Date/index.js

@@ -93,14 +93,11 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     key: "getResourceDates",
     value: function () {
       var _getResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _params$query, currentDateList, currentDateListMap, resourceIds, hasResource, dates;
+        var _params$query;
+        var 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) {
@@ -115,18 +112,18 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 });
               });
               if (!hasResource) {
-                _context2.next = 7;
+                _context2.next = 6;
                 break;
               }
               return _context2.abrupt("return", currentDateList);
-            case 7:
-              _context2.next = 9;
+            case 6:
+              _context2.next = 8;
               return this.getResourceAvailableTimeList(params);
-            case 9:
+            case 8:
               dates = _context2.sent;
               this.setDateList(dates);
               return _context2.abrupt("return", dates);
-            case 12:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -154,7 +151,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource, _currentItem$resource3;
+          var _item$resource;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
           var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
@@ -163,16 +160,6 @@ 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 {
@@ -185,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, _params$useCache, useCache, fetchUrl, _ref, start_date, end_date, resource_ids, res;
+        var url, query, 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, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache;
+              url = params.url, query = params.query;
               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;
@@ -198,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: useCache && this.cacheId
+                front_end_cache_id: this.cacheId
               }, {
-                useCache: useCache
+                useCache: true
               });
             case 6:
               res = _context3.sent;

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

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

package/dist/modules/Discount/index.js

@@ -129,9 +129,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
+              goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || [];
+              this.setDiscountList(goodPassList);
               return _context3.abrupt("return", goodPassList);
-            case 5:
+            case 6:
             case "end":
               return _context3.stop();
           }