@pisell/pisellos 2.2.22 → 2.2.24

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

@@ -130,6 +130,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   return cartItem;
 };
 export var formatProductToCartItemOrigin = function formatProductToCartItemOrigin(params) {
+  var _origin$product;
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
@@ -138,14 +139,24 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
     _params$quantity2 = params.quantity,
     quantity = _params$quantity2 === void 0 ? 1 : _params$quantity2;
   var origin = cartItem._origin;
+  var product_discount_difference = (((_origin$product = origin.product) === null || _origin$product === void 0 ? void 0 : _origin$product.discount_list) || []).filter(function (item) {
+    var _item$metadata;
+    return !(item !== null && item !== void 0 && (_item$metadata = item.metadata) !== null && _item$metadata !== void 0 && _item$metadata.custom_product_bundle_map_id);
+  }).reduce(function (pre, cur) {
+    var _cur$metadata;
+    return pre + ((cur === null || cur === void 0 || (_cur$metadata = cur.metadata) === null || _cur$metadata === void 0 ? void 0 : _cur$metadata.product_discount_difference) || 0);
+  }, 0);
   if (product) {
-    var _origin$product, _origin$product2, _product$duration, _product$duration2;
+    var _origin$product2, _origin$product3, _product$duration, _product$duration2;
     origin.product = _objectSpread(_objectSpread({}, origin.product || {}), {}, {
       num: quantity,
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
-      product_bundle: ((_origin$product = origin.product) === null || _origin$product === void 0 ? void 0 : _origin$product.product_bundle) || [],
-      product_option_item: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_option_item) || []
+      product_bundle: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_bundle) || [],
+      product_option_item: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_option_item) || [],
+      metadata: {
+        product_discount_difference: product_discount_difference
+      }
     });
     // 时长类型
     origin.sub_type = product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.type;
@@ -183,6 +194,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       // 一个商品折扣卡只能存在于一张
       // if (currentValue.type !== 'good_pass') {
       price = getDiscountAmount({
+        amount: currentValue.amount,
         tag: currentValue.type,
         par_value: currentValue.discount.percent,
         metadata: {
@@ -303,6 +315,10 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       var _d$originBundleItem;
       return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
     };
+    var product_discount_difference = ((d === null || d === void 0 ? void 0 : d.discount_list) || []).reduce(function (pre, cur) {
+      var _cur$metadata2;
+      return pre + ((cur === null || cur === void 0 || (_cur$metadata2 = cur.metadata) === null || _cur$metadata2 === void 0 ? void 0 : _cur$metadata2.product_discount_difference) || 0);
+    }, 0);
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -315,7 +331,8 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       discount_list: d.discount_list,
       "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
-        custom_product_bundle_map_id: d._id
+        custom_product_bundle_map_id: d._id,
+        product_discount_difference: product_discount_difference
       }
     };
   });

package/dist/modules/Customer/index.js

@@ -154,7 +154,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
-                with: ['latestWalletDetail.wallet', 'contactsInfo'],
+                with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord'],
                 search_wallet_flag: 1,
                 search_wallet_pass_flag: 1
               }, search && {

package/dist/modules/Discount/index.js

@@ -188,7 +188,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 tags: ['good_pass', 'product_discount_card'],
                 available: 1,
                 relation_product: 1,
-                with: ['extensionData', 'holder.detail'],
+                with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
                 order_behavior_count_customer_id: customerId || 1
               });
@@ -299,9 +299,9 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var _product$discount;
+          var _product$discount, _product$metadata;
           var price = new Decimal((product === null || product === void 0 || (_product$discount = product.discount) === null || _product$discount === void 0 ? void 0 : _product$discount.fixed_amount) || 0).mul((product === null || product === void 0 ? void 0 : product._num) || 1);
-          return new Decimal(total).plus(price).toNumber();
+          return new Decimal(total).plus(price).add((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_difference) || 0).toNumber();
         }, 0);
       }
     }

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

@@ -33,6 +33,9 @@ interface ApplicableProductDetails {
     title: string;
     original_amount: string;
     num: number;
+    metadata?: {
+        product_discount_difference?: number;
+    };
     discount?: {
         fixed_amount?: number;
         product_id?: number;
@@ -81,6 +84,10 @@ export interface Discount {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
+        discount_calculation_mode: 'item_level' | 'order_level';
+        holder: {
+            type: "customer" | "custom";
+        };
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -89,7 +96,9 @@ export interface Discount {
     isEditMode?: boolean;
     isScan?: boolean;
     discount?: {
+        discount_product_id: number;
         resource_id: number;
+        discount_calculation_mode: 'item_level' | 'order_level';
     };
     isManualSelect?: boolean;
     isDisabled?: boolean;

package/dist/modules/Order/utils.js

@@ -56,7 +56,7 @@ export var getAllDiscountList = function getAllDiscountList(cartItem) {
   var _cartItem$_origin, _cartItem$_origin2;
   var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
   ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
-    discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray(item.discount_list || []));
+    discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     item.discount_list = undefined;
   });
   return discountList;