@pisell/pisellos 0.0.264 → 0.0.266

package/dist/modules/Rules/index.js

@@ -316,7 +316,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct) {
-            var _discountApplicabilit;
+            var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -328,6 +328,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
@@ -348,7 +349,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       console.log(sortedProductList, 'sortedProductListsortedProductList');
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
-      sortedProductList.forEach(function (originProduct, i) {
+      sortedProductList.forEach(function (originProduct, index) {
         var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10, _product$discount_lis11;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
@@ -440,7 +441,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }))]);
           } else {
             processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-              _id: product._id.split('___')[0] + '___' + i,
+              _id: product._id.split('___')[0] + '___' + index,
               total: product.origin_total || product.total,
               price: product.price
             }), {}, {
@@ -468,10 +469,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id.split('___')[0]
           }));
         }
-        for (var _i = 0; _i < splitCount; _i++) {
-          var _product$discount_lis12, _originProduct$_produ;
+        for (var i = 0; i < splitCount; i++) {
+          var _product$discount_lis12, _originProduct$_produ, _selectedDiscount$met;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
-          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
+          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
           // 标记优惠券为已使用
           usedDiscounts.set(_selectedDiscount.id, true);
 
@@ -496,6 +497,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: discountType,
             discount: {
+              discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,
@@ -532,7 +534,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,

package/lib/modules/Rules/index.js

@@ -198,7 +198,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
@@ -211,6 +211,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
+              discount_card_type: (_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.discount_card_type,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
@@ -227,8 +228,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
-    sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    sortedProductList.forEach((originProduct, index) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
         processedProductsMap.set(product._id, [originProduct]);
@@ -304,7 +305,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             product._id,
             [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
-                _id: product._id.split("___")[0] + "___" + i,
+                _id: product._id.split("___")[0] + "___" + index,
                 total: product.origin_total || product.total,
                 price: product.price
               },
@@ -327,8 +328,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _id: product._id.split("___")[0]
         }));
       }
-      for (let i2 = 0; i2 < splitCount; i2++) {
-        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
+      for (let i = 0; i < splitCount; i++) {
+        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
@@ -344,6 +345,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: discountType,
           discount: {
+            discount_card_type: (_j = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _j.discount_card_type,
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
@@ -375,7 +377,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,

package/package.json

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