@pisell/pisellos 0.0.166 → 0.0.168

package/dist/modules/Rules/index.js

@@ -316,7 +316,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct, i) {
-        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
+        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8;
         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);
@@ -352,7 +352,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && product.discount_list.some(function (item) {
+        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
           var _item$discount;
           return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
         })) {
@@ -452,6 +452,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
+              variant: originProduct._productInit.variant,
               original_price: new Decimal(product.price || 0).toNumber(),
               total: targetProductTotal
             }));

package/lib/modules/Rules/index.js

@@ -206,7 +206,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f;
       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]);
@@ -228,10 +228,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
       const selectedDiscount = applicableDiscounts[0];
       let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
-      if ((options == null ? void 0 : options.discountId) && product.discount_list.some((item) => {
+      if ((options == null ? void 0 : options.discountId) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
         var _a2;
         return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
-      })) {
+      }))) {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
@@ -320,6 +320,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
+            variant: originProduct._productInit.variant,
             original_price: new import_decimal.default(product.price || 0).toNumber(),
             total: targetProductTotal
           }));

package/package.json

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