@pisell/private-materials 3.0.13 → 3.0.14-2.gray

package/es/components/booking/components/footer/amount.js

@@ -9,6 +9,24 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
+var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
+  var total = 0;
+  var _iterator = _createForOfIteratorHelper(relation_details),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      var number = item.product_quantity || item.num;
+      var price = item.payment_price || item.price;
+      total += Number(price) * Number(number);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return total;
+};
 /**
  * 总金额
  * @param state 
@@ -20,30 +38,35 @@ var getProductAmount = function getProductAmount(state, isEdit) {
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
-      var _iterator = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var item = _step.value;
-          price += Number(item._extend.price) * (item._extend.quantity || 1);
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var item = _step2.value;
+          // 预约商品
+          price += Number(item._extend.total);
+
+          // 附加商品
+          price += getRelationDetailsTotal(item._extend.relation_details || []);
+          // price += 
           duration += flexibleObj.getValue(item._extend.duration);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
-      var _iterator2 = _createForOfIteratorHelper(state.addons.value),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(state.addons.value),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _item = _step2.value;
-          price += Number(_item.price) * _item.quantity;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _item = _step3.value;
+          price += Number(_item._extend.total) * _item._extend.quantity;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
     }
   } else {
@@ -62,7 +85,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
 var getProductItemTax = function getProductItemTax(item, bookingDetail) {
   var price = 0;
   // 折扣后的金额 = 商品金额 - 商品折扣
-  var productDiscountPrice = Number(item.price);
+  var productDiscountPrice = Number(item.total);
   // 店铺税 = 折扣后的金额 * 店铺税率 * 商品是否收税  (is_charge_tax 0 为不收税)
   var shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   // 店铺税率  =  1 + 店铺税率 * 是否含税
@@ -83,10 +106,7 @@ var getProductItemTax = function getProductItemTax(item, bookingDetail) {
  * @Date: 2024-02-28 10:56
  */
 var getTotal = function getTotal(item) {
-  return item._extend.payment_price !== undefined ? item._extend.payment_price : item._extend.price;
-};
-var getAddonsTotal = function getAddonsTotal(item) {
-  return item.payment_price !== undefined ? item.payment_price : item.price;
+  return item._extend.payment_price !== undefined ? item._extend.payment_price : item._extend.total;
 };
 
 /**
@@ -106,35 +126,37 @@ var getTax = function getTax(state, isEdit) {
     return Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee);
   }
   if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
-    var _iterator3 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
-      _step3;
+    var _iterator4 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
+      _step4;
     try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var item = _step3.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var item = _step4.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
-          price: getTotal(item),
+          total: getTotal(item),
+          price: item._extend.price,
           quantity: item._extend.quantity
         }), state.bookingDetail);
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator3.f();
+      _iterator4.f();
     }
-    var _iterator4 = _createForOfIteratorHelper(state.addons.value),
-      _step4;
+    var _iterator5 = _createForOfIteratorHelper(state.addons.value),
+      _step5;
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var _item2 = _step4.value;
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _item2 = _step5.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, _item2), {}, {
-          price: getAddonsTotal(_item2),
-          quantity: _item2.quantity
+          total: getTotal(_item2),
+          price: _item2._extend.price,
+          quantity: _item2._extend.quantity
         }), state.bookingDetail);
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator4.f();
+      _iterator5.f();
     }
   }
   return price;
@@ -241,6 +263,15 @@ var getShopDiscount = function getShopDiscount(state) {
   var _state$bookingDetail8;
   return Number((_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.shop_discount) || 0;
 };
+var getRoundingAmount = function getRoundingAmount(state) {
+  var _state$bookingDetail9;
+  return Number(state === null || state === void 0 ? void 0 : (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
+};
+var getSumTotalAmount = function getSumTotalAmount(_ref2) {
+  var expectAmount = _ref2.expectAmount,
+    roundingAmount = _ref2.roundingAmount;
+  return expectAmount + roundingAmount;
+};
 
 /**
  * 总金额
@@ -253,6 +284,9 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
     price = _getProductAmount.price,
     duration = _getProductAmount.duration;
 
+  // 舍入金额
+  var roundingAmount = getRoundingAmount(state);
+
   // 税费
   var tax = getTax(state, isEdit);
 
@@ -285,7 +319,10 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
   });
 
   // 总支付金额  总计
-  var sumTotalAmount = expectAmount;
+  var sumTotalAmount = getSumTotalAmount({
+    expectAmount: expectAmount,
+    roundingAmount: roundingAmount
+  });
 
   // 未支付的金额  负数代表着欠款
   var notPaidAmount = Number(formatAmount(sumTotalAmount, 2, '')) - orderPaidAmount;
@@ -310,6 +347,7 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
     actualPaidAmount: actualPaidAmount,
     orderPaidAmount: orderPaidAmount,
     totalRefundAmount: totalRefundAmount,
-    dueAmount: dueAmount
+    dueAmount: dueAmount,
+    roundingAmount: roundingAmount
   };
 };

package/es/components/booking/components/footer/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 /**
  * @title: 底部
  * @description: