@pisell/pisellos 0.0.473 → 0.0.475

package/dist/modules/Rules/index.js

@@ -1178,15 +1178,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _product$main_product, _ref8, _product$_promotion$f, _product13, _product$main_product2;
+              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
+              var total = product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
+              if ((product.discount_list || []).some(function (item) {
+                return item.type === 'promotion';
+              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+                var _product$total, _product$main_product;
+                total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
+              }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price
+                price: product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
-                total: product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : product.origin_total || product.total,
+                total: total,
                 price: product.price,
-                main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
+                main_product_selling_price: main_product_selling_price
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
@@ -1334,13 +1342,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
-            var total = targetProductTotal;
+            var _total = targetProductTotal;
             if (product.options) {
-              total = product.options.reduce(function (accumulator, currentValue) {
+              _total = product.options.reduce(function (accumulator, currentValue) {
                 var currentPrice = new Decimal(currentValue.price || 0);
                 var currentNum = new Decimal(currentValue.num || 0);
                 return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(total)).toNumber();
+              }, new Decimal(_total)).toNumber();
             }
 
             // 记录应用了优惠券的商品

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/modules/Rules/index.js

@@ -869,16 +869,21 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               })
             ]);
           } else {
+            let total = product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
+            let main_product_selling_price = product.price ?? product.main_product_selling_price;
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+              total = product.total ?? product.origin_total;
+              main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
+            }
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
-                  total: product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total || product.total,
+                  total,
                   price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  main_product_selling_price
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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