@pisell/pisellos 3.0.46 → 3.0.47

package/dist/modules/Rules/index.js

@@ -429,7 +429,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _originProduct$_produ, _product$discount_lis11;
+          var _product$discount_lis11, _originProduct$_produ;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -440,14 +440,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
           var productOriginTotal = product.origin_total || product.total || 0;
+          // 如果当前 product 有 discount_list，则先从 origin_total 拿
+          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
+            productOriginTotal = product.origin_total;
+          }
           // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
           if (Number((originProduct === null || originProduct === void 0 || (_originProduct$_produ = originProduct._productInit) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
-            productOriginTotal = product.origin_total;
-          }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           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();

package/lib/modules/Rules/index.js

@@ -302,12 +302,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
-        if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
-          productOriginTotal = product.total;
-        }
-        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
+        if (((_g = product.discount_list) == null ? void 0 : _g.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
+        if (Number(((_h = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _h.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          productOriginTotal = product.total;
+        }
         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(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),

package/package.json

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