@pisell/private-materials 6.6.5 → 6.6.6

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

@@ -878,23 +878,24 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 7:
+            debugger;
             hasUnspecifiedHolderProduct = (_state$service$value2 = state.service.value) === null || _state$service$value2 === void 0 ? void 0 : _state$service$value2.some(function (item) {
               var _item$_extend, _item$_extend2;
               return (!((_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id) || ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) === 0) && !isNormalProductByDurationSchedule(item);
             });
             if (!(!isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && getIsSubjectRequire(state) && hasUnspecifiedHolderProduct)) {
-              _context6.next = 11;
+              _context6.next = 12;
               break;
             }
-            _context6.next = 11;
+            _context6.next = 12;
             return showConfirmHolderModal(state, dispatch);
-          case 11:
+          case 12:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 13;
+              _context6.next = 14;
               break;
             }
             return _context6.abrupt("return");
-          case 13:
+          case 14:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -903,34 +904,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 26;
+              _context6.next = 27;
               break;
             }
-            _context6.next = 22;
+            _context6.next = 23;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 22:
+          case 23:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 25;
+              _context6.next = 26;
               break;
             }
             _context6.t0 = {};
-          case 25:
-            saveOtherValue = _context6.t0;
           case 26:
-            _context6.prev = 26;
+            saveOtherValue = _context6.t0;
+          case 27:
+            _context6.prev = 27;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 32;
+              _context6.next = 33;
               break;
             }
             return _context6.abrupt("return", values);
-          case 32:
+          case 33:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 42;
+              _context6.next = 43;
               break;
             }
             subtotal_info = {
@@ -939,7 +940,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 37;
+            _context6.next = 38;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -947,10 +948,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 37:
-            _context6.next = 39;
+          case 38:
+            _context6.next = 40;
             return checkout.manualSyncOrderAsync();
-          case 39:
+          case 40:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -958,7 +959,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 42:
+          case 43:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1022,43 +1023,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 48;
+              _context6.next = 49;
               break;
             }
-            _context6.next = 48;
+            _context6.next = 49;
             return handleSaveAddons();
-          case 48:
+          case 49:
             if (!infoEdit) {
-              _context6.next = 53;
+              _context6.next = 54;
               break;
             }
-            _context6.next = 51;
+            _context6.next = 52;
             return api(values, state.bookingId || editOrderId);
-          case 51:
+          case 52:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 53:
+          case 54:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 58:
-            _context6.prev = 58;
-            _context6.t1 = _context6["catch"](26);
+          case 59:
+            _context6.prev = 59;
+            _context6.t1 = _context6["catch"](27);
             console.log(_context6.t1);
             if ((_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) === 70101) {
               message.error(_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message);
             }
             _setLoading(false);
-          case 63:
+          case 64:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[26, 58]]);
+      }, _callee6, null, [[27, 59]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1747,7 +1748,8 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$service4;
+    var _state$client4, _state$service4;
+    var beforeValue = state === null || state === void 0 || (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -1755,6 +1757,7 @@ var Footer = function Footer(props) {
         edit: true
       }
     });
+    if ((beforeValue === null || beforeValue === void 0 ? void 0 : beforeValue.id) === (value === null || value === void 0 ? void 0 : value.id)) return;
     if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length) {
       // 还需要清空商品内的 holder 信息
       dispatch({

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

@@ -16,6 +16,11 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,6 +42,20 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 /**
  * @title: 是否包含跨日预约商品
  * @description:

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

@@ -4,6 +4,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 dayjs from 'dayjs';
 import { flexibleObj, isNowTime, getNowTime } from "../../utils";
 import { isWalkIn } from "../../utils";
@@ -11,7 +17,7 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
-import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
+import { isArr, locales, sendWarningLog, getUniqueId, isNumber, isString } from '@pisell/utils';
 import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
@@ -106,6 +112,8 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     return {
+      "is_charge_tax": d.is_charge_tax,
+      "tax_fee": d.tax_fee,
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
       "bundle_product_id": (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? void 0 : d.product_id),
@@ -113,16 +121,44 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      "price": Number(d === null || d === void 0 ? void 0 : d.price),
-      // checkout 2.0 新增
+      "price": Number(d === null || d === void 0 ? void 0 : d.product_price),
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
-      // checkout 2.0 新增
-      "custom_price": Math.abs(new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
+      "price_type_ext": d === null || d === void 0 ? void 0 : d.price_type_ext,
+      "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
-      "option": option
+      "option": option,
+      "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
+      // "bundle_sum_price": d?.original_price || d?.original_total,
+      "metadata": {
+        custom_product_bundle_map_id: d._id,
+        // 子商品单数量附加费
+        "surcharge_fee": d.surcharge_fee,
+        // 可选，附加费均摊舍入金额
+        "surcharge_rounding_remainder": d.surcharge_rounding_remainder,
+        relation_surcharge_ids: d.relation_surcharge_ids || []
+      }
     };
   });
 };
+
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export var getBundleDiscountList = function getBundleDiscountList(bundle) {
+  if (!bundle) {
+    return [];
+  }
+  var discountList = [];
+  bundle.forEach(function (d) {
+    if (d.discount_list && isArr(d.discount_list)) {
+      discountList.push.apply(discountList, _toConsumableArray(d.discount_list.filter(function (item) {
+        return !item.id;
+      })));
+    }
+  });
+  return discountList;
+};
 var getSubType = function getSubType(item) {
   var _item$duration;
   var _type = (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.type;
@@ -238,9 +274,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$_extend7, _item$variant;
+  var _item$_extend6, _item$price, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
-  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+  var price = Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
@@ -267,7 +303,7 @@ export var formatProductPrice = function formatProductPrice(item) {
  * @param item
  * @returns
  */
-var formatOriginalPrice = function formatOriginalPrice(item) {
+export var formatOriginalPrice = function formatOriginalPrice(item) {
   var _item$_extend8;
   return Number((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.origin_total);
 };
@@ -277,7 +313,7 @@ var formatOriginalPrice = function formatOriginalPrice(item) {
  * @param item
  * @returns
  */
-var formatSellingPrice = function formatSellingPrice(item) {
+export var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
@@ -304,6 +340,35 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   }
   return metadata;
 };
+var formatProductMetadata = function formatProductMetadata(item) {
+  var _item$_extend17, _item$_extend19, _item$_extend21, _item$_extend23;
+  var metadata = {};
+
+  // 主商品+非原价(加减价)子商品附加费
+  if ((_item$_extend17 = item._extend) !== null && _item$_extend17 !== void 0 && _item$_extend17.surcharge_fee) {
+    var _item$_extend18;
+    metadata.main_product_attached_bundle_surcharge_fee = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.surcharge_fee;
+  }
+
+  // 主商品+非原价(加减价)子商品税费
+  if ((_item$_extend19 = item._extend) !== null && _item$_extend19 !== void 0 && _item$_extend19.main_product_attached_bundle_tax_fee) {
+    var _item$_extend20;
+    metadata.main_product_attached_bundle_tax_fee = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.main_product_attached_bundle_tax_fee;
+  }
+
+  // 可选，附加费均摊舍入金额
+  if ((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.surcharge_rounding_remainder) {
+    var _item$_extend22;
+    metadata.surcharge_rounding_remainder = (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.surcharge_rounding_remainder;
+  }
+
+  // 使用的附加费id列表
+  if ((_item$_extend23 = item._extend) !== null && _item$_extend23 !== void 0 && _item$_extend23.relation_surcharge_ids) {
+    var _item$_extend24;
+    metadata.relation_surcharge_ids = (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.relation_surcharge_ids;
+  }
+  return metadata;
+};
 
 // const formatDiscountList = (list: any[]) => {
 //   return list.map(item => {
@@ -320,10 +385,10 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
 // }
 
 // 获取商品价格 包含组合规格
-var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend17, _item$_extend18, _item$variant2;
-  var other = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.other;
-  var price = Number((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.price);
+export var getSourceProductPrice = function getSourceProductPrice(item) {
+  var _item$_extend25, _item$_extend26, _item$variant2;
+  var other = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.other;
+  var price = Number((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
@@ -337,6 +402,25 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
   return price;
 };
 
+// 获取主商品价格 要增加option
+export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
+  var _item$_extend27, _item$_extend28, _item$_extend$other, _item$_extend$other2, _item$_extend29;
+  if (!isNumber((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.main_product_selling_price) && !isString((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.main_product_selling_price)) {
+    return undefined;
+  }
+  var optionPrice = new Decimal(0);
+  // 单规格
+  if ((_item$_extend$other = item._extend.other) !== null && _item$_extend$other !== void 0 && _item$_extend$other.option && Array.isArray((_item$_extend$other2 = item._extend.other) === null || _item$_extend$other2 === void 0 ? void 0 : _item$_extend$other2.option)) {
+    var _item$_extend$other3;
+    optionPrice = (_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option.reduce(function (accumulator, currentValue) {
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
+    }, optionPrice);
+  }
+  return new Decimal((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price).add(optionPrice).toNumber();
+};
+
 /**
  * @title: 格式化商品数据
  * @description:
@@ -346,11 +430,13 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22;
+  var _item$_extend30, _getMainProductSellin, _item$_extend31, _item$_extend32, _item$_extend33, _item$_extend34;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var discount_list = (item === null || item === void 0 ? void 0 : item.discount_list) || [];
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 || (_item$_extend30 = _item$_extend30.other) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.bundle) || []);
+  var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
+  discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
   // 加价时type使用change_price
   var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
@@ -368,30 +454,31 @@ var formatProducts = function formatProducts(item, quantity) {
     item.product_id = 0;
   }
   return {
-    name: item.name,
-    num: quantity || item._extend.quantity,
-    price: formatProductPrice(item),
-    source_product_price: getSourceProductPrice(item),
-    product_id: item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
-    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
-    product_discount_reason: item._extend.discount_reason || '',
-    is_charge_tax: item.is_charge_tax,
-    note: ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note) || '',
-    discountway: item._extend.discountway || 'num',
-    discount_per: item._extend.discount_per,
-    discount_type: item._extend.discount_type || discount_type,
-    order_detail_id: item._extend.order_detail_id || 0,
-    product_bundle: formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    product_option_item: formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
-    product_variant_id: ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
-    discount_list: notManualDiscount,
-    metadata: formatMetaData(item, false),
+    "name": item.name,
+    "num": quantity || item._extend.quantity,
+    "price": formatProductPrice(item),
+    "main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
+    "source_product_price": getSourceProductPrice(item),
+    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
+    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
+    "product_discount_reason": item._extend.discount_reason || '',
+    "is_charge_tax": item.is_charge_tax,
+    "note": ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.note) || '',
+    "discountway": item._extend.discountway || "num",
+    "discount_per": item._extend.discount_per,
+    "discount_type": item._extend.discount_type || discount_type,
+    "order_detail_id": item._extend.order_detail_id || 0,
+    "product_bundle": formatProductBundle((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.bundle),
+    "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
+    "product_option_item": formatProductOption((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.option),
+    "product_variant_id": ((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.product_variant_id) || 0,
+    "discount_list": notManualDiscount,
+    metadata: formatProductMetadata(item),
     // checkout 需求新增字段
-    calculated_original_price: formatOriginalPrice(item),
-    calculated_selling_price: formatSellingPrice(item),
-    tax_fee: item._extend.tax_fee,
-    custom_deposit_data: item.custom_deposit_data
+    "calculated_original_price": formatOriginalPrice(item),
+    "calculated_selling_price": formatSellingPrice(item),
+    "tax_fee": item._extend.tax_fee,
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 
@@ -409,8 +496,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend23;
-    var holderId = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id;
+    var _item$_extend35;
+    var holderId = (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -436,15 +523,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend24;
-      return ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend36;
+      return ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend25;
-      var key = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id; // 分组键
+      var _item$_extend37;
+      var key = (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -480,8 +567,8 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
 export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
   var list = data.service.value;
   var isHas = list.some(function (item) {
-    var _item$_extend26;
-    return (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.groupId;
+    var _item$_extend38;
+    return (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.groupId;
   });
   return isHas;
 };
@@ -521,7 +608,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend27, _item$_extend32, _item$_extend33;
+    var _item$_extend39, _item$_extend44, _item$_extend45;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -531,7 +618,7 @@ var formatBookings = function formatBookings(data, values) {
     }
 
     // 当前商品是跨日预约商品
-    var isMultiDay = (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.groupId;
+    var isMultiDay = (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -545,9 +632,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend28, _item$_extend29, _item$_extend30, _item$_extend31;
-      var startDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.startDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.start_date);
-      var endDate = ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.endDate) || ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.end_date);
+      var _item$_extend40, _item$_extend41, _item$_extend42, _item$_extend43;
+      var startDate = ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.startDate) || ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.start_date);
+      var endDate = ((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.endDate) || ((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -573,8 +660,8 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.groupId];
-    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend44 = item._extend) === null || _item$_extend44 === void 0 ? void 0 : _item$_extend44.groupId];
+    if (!((_item$_extend45 = item._extend) !== null && _item$_extend45 !== void 0 && _item$_extend45.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -615,13 +702,25 @@ var formatBookings = function formatBookings(data, values) {
     for (var i = 0; i < (item._extend.quantity || 1); i++) {
       var newItem = cloneDeep(item);
       newItem._extend.unique_identification_number = "".concat(item._extend.unique_identification_number, "_").concat(i);
+      // 舍入金额已基于数量计算，拆分时只保留第一个的 surcharge_rounding_remainder
+      if (i > 0) {
+        var _newItem$_extend;
+        // 清除主商品的舍入金额
+        newItem._extend.surcharge_rounding_remainder = undefined;
+        // 清除 bundle 子商品的舍入金额
+        if (((_newItem$_extend = newItem._extend) === null || _newItem$_extend === void 0 || (_newItem$_extend = _newItem$_extend.other) === null || _newItem$_extend === void 0 || (_newItem$_extend = _newItem$_extend.bundle) === null || _newItem$_extend === void 0 ? void 0 : _newItem$_extend.length) > 0) {
+          newItem._extend.other.bundle.forEach(function (bundleItem) {
+            bundleItem.surcharge_rounding_remainder = undefined;
+          });
+        }
+      }
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
         product: formatProducts(newItem, 1),
         number: item._extend.capacity ? getSumCapacity({
           cacheItem: newItem
         }, false) : newItem._extend.number || 1,
         holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem)
+        metadata: formatMetaData(newItem, false)
       }));
     }
   });
@@ -641,16 +740,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend34;
+    var _item$_extend46;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend46 = item._extend) === null || _item$_extend46 === void 0 ? void 0 : _item$_extend46.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend35;
-    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
+    var _item$_extend47;
+    if (!((_item$_extend47 = item._extend) !== null && _item$_extend47 !== void 0 && _item$_extend47.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -669,8 +768,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend36;
-    if (!((_item$_extend36 = item._extend) !== null && _item$_extend36 !== void 0 && _item$_extend36.unique_identification_number)) {
+    var _item$_extend48;
+    if (!((_item$_extend48 = item._extend) !== null && _item$_extend48 !== void 0 && _item$_extend48.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -795,19 +894,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend$holder_, _item$_extend38;
+    var _item$_extend$holder_, _item$_extend50;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_item$_extend$holder_ = item._extend.holder_id) === null || _item$_extend$holder_ === void 0 ? void 0 : _item$_extend$holder_.length) === 0)) {
-      var _item$_extend37;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.other) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.rowKey);
+      var _item$_extend49;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 || (_item$_extend49 = _item$_extend49.other) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.holder_id) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.length) !== item._extend.quantity) {
-      var _item$_extend39;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 || (_item$_extend39 = _item$_extend39.other) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend50 = item._extend) === null || _item$_extend50 === void 0 || (_item$_extend50 = _item$_extend50.holder_id) === null || _item$_extend50 === void 0 ? void 0 : _item$_extend50.length) !== item._extend.quantity) {
+      var _item$_extend51;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend51 = item._extend) === null || _item$_extend51 === void 0 || (_item$_extend51 = _item$_extend51.other) === null || _item$_extend51 === void 0 ? void 0 : _item$_extend51.rowKey);
       return true;
     }
     return false;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;