@pisell/private-materials 3.3.70 → 3.3.71

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

@@ -11,7 +11,7 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
-import { locales, sendWarningLog } from '@pisell/utils';
+import { isArr, locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
   var _data$notes;
@@ -198,12 +198,17 @@ var formatResource = function formatResource(service) {
  * @Date: 2024-12-07 14:52
  */
 var formatHolders = function formatHolders(state, item, values) {
-  var _state$bookingConfig, _item$_extend, _item$_extend2;
+  var _state$bookingConfig, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
   var form_id = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.appointment_subject) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.form_id) || 0;
+  var form_record = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id ? [(_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.holder_id] : [];
+  if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.holder_id && isArr((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.holder_id)) {
+    var _item$_extend5;
+    form_record = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id;
+  }
   var obj = {
     customer_id: values.customer_id,
     form_id: form_id,
-    form_record: (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id ? [(_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.holder_id] : []
+    form_record: form_record
   };
 
   // 连锁加盟子店铺 增加参数
@@ -222,9 +227,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend3, _item$_extend4;
-  var other = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other;
-  var price = Number((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.price);
+  var _item$_extend6, _item$_extend7;
+  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);
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -235,21 +240,21 @@ export var formatProductPrice = function formatProductPrice(item) {
   return price;
 };
 var formatMetaData = function formatMetaData(item) {
-  var _item$_extend5, _item$_extend6, _item$_extend8;
+  var _item$_extend8, _item$_extend9, _item$_extend11;
   var metadata = {};
-  if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.capacity) {
+  if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.capacity) {
     metadata.capacity = item._extend.capacity;
   }
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_item$_extend6 = item._extend) !== null && _item$_extend6 !== void 0 && _item$_extend6.holder_id) {
-    var _item$_extend7;
-    metadata.holder_id = (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id;
+  if ((_item$_extend9 = item._extend) !== null && _item$_extend9 !== void 0 && _item$_extend9.holder_id) {
+    var _item$_extend10;
+    metadata.holder_id = (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id;
   }
-  if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.multiDayPrices) {
-    var _item$_extend9;
-    metadata.multiDayPrices = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.multiDayPrices;
+  if ((_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
+    var _item$_extend12;
+    metadata.multiDayPrices = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.multiDayPrices;
   }
   return metadata;
 };
@@ -276,8 +281,8 @@ var formatMetaData = function formatMetaData(item) {
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item) {
-  var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend13;
+var formatProducts = function formatProducts(item, quantity) {
+  var _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -291,9 +296,9 @@ var formatProducts = function formatProducts(item) {
     return item.type !== 'product';
   });
   return {
-    "num": item._extend.quantity,
+    "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.price,
+    "source_product_price": (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -303,10 +308,10 @@ var formatProducts = function formatProducts(item) {
     "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$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.bundle),
+    "product_bundle": formatProductBundle((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.option),
-    "product_variant_id": ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.option),
+    "product_variant_id": ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -326,8 +331,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend14;
-    var holderId = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id;
+    var _item$_extend17;
+    var holderId = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -353,15 +358,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend15;
-      return ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend18;
+      return ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend16;
-      var key = (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id; // 分组键
+      var _item$_extend19;
+      var key = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -381,6 +386,12 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
     return list || [];
   } catch (error) {}
 };
+var getHolderByIndex = function getHolderByIndex(holder, index) {
+  var _holder$form_record;
+  return _objectSpread(_objectSpread({}, holder), {}, {
+    form_record: [holder === null || holder === void 0 || (_holder$form_record = holder.form_record) === null || _holder$form_record === void 0 ? void 0 : _holder$form_record[index]].filter(Boolean)
+  });
+};
 
 /**
  * @title: 预约商品信息
@@ -414,7 +425,7 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
-  bookings = list.map(function (item) {
+  list.forEach(function (item) {
     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");
@@ -428,9 +439,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
-      var startDate = ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.startDate) || ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.start_date);
-      var endDate = ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.endDate) || ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.end_date);
+      var _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
+      var startDate = ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.startDate) || ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.start_date);
+      var endDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.endDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -452,7 +463,7 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    return _objectSpread(_objectSpread({
+    var booking = _objectSpread(_objectSpread({
       "product": formatProducts(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
@@ -474,6 +485,19 @@ var formatBookings = function formatBookings(data, values) {
       "resources": formatResource(item),
       "metadata": formatMetaData(item)
     }, eventOtherParams || {}), dayParams);
+    if (isDay) {
+      bookings.push(booking);
+      return;
+    }
+    for (var i = 0; i < (item._extend.quantity || 1); i++) {
+      bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
+        "product": formatProducts(item, 1),
+        "number": item._extend.capacity ? getSumCapacity({
+          cacheItem: item
+        }, false) : item._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i)
+      }));
+    }
   });
   return bookings;
 };
@@ -491,8 +515,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
   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$_extend21;
-    return !((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.holder_id);
+    var _item$_extend24;
+    return !((_item$_extend24 = item._extend) !== null && _item$_extend24 !== void 0 && _item$_extend24.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
@@ -587,7 +611,11 @@ export var formatValues = function formatValues(state) {
   if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state);
   } else {
+    var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
+    if (!((_values$relation_prod = values.relation_products) !== null && _values$relation_prod !== void 0 && _values$relation_prod.length)) {
+      values.relation_products = undefined;
+    }
   }
   // 服务
   values.bookings = formatBookings(state, values);
@@ -617,8 +645,18 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
+    var _item$_extend25;
     // 普通商品不需要检测holder
-    return !item._extend.holder_id && !isNormalProductByDurationSchedule(item);
+    if (isNormalProductByDurationSchedule(item)) {
+      return false;
+    }
+    if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      return true;
+    }
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
+      return true;
+    }
+    return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {

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;

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

@@ -7,6 +7,10 @@ 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -22,7 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn, useDebounceFn } from 'ahooks';
+import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
+import { getServiceAddons } from "./utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -35,10 +40,11 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value;
+  var _context$appHelper, _state$client$value, _state$service2;
   var context = useEngineContext();
   var state = props.state,
-    dispatch = props.dispatch;
+    dispatch = props.dispatch,
+    source = props.source;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
@@ -53,35 +59,27 @@ var VoucherCard = function VoucherCard(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     discountList = _useState6[0],
     setDisCountList = _useState6[1];
-  var productRef = useRef(state.service.value);
+  var serviceValueRef = useRef(state.service.value);
+  var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
   var shopDiscount = pisellos.getModule('shopDiscount');
   services = state.service;
-  var availableData = useMemo(function () {
-    if (!isBooking4Shop) return [];
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    return discountList.filter(function (item) {
-      return !!item.isAvailable;
-    }).map(function (discount) {
-      return _objectSpread(_objectSpread({}, discount), {}, {
-        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
-      });
-    });
-  }, [discountList, isBooking4Shop]);
 
   // 设置client
-  useEffect(function () {
+  useDebounceEffect(function () {
     if (isBooking4Shop) {
       shopDiscount.setCustomer(state.client.value);
     }
-  }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop]);
+  }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop], {
+    wait: 200
+  });
 
   // 设置productList
   useEffect(function () {
     if (isBooking4Shop) {
-      shopDiscount.setProductList(state.service.value);
+      shopDiscount.setProductList([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
     }
-  }, [state.service.value, isBooking4Shop]);
+  }, [state.service.value, state.addons.value, isBooking4Shop]);
   var serviceMemo = useMemo(function () {
     var _ref;
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
@@ -89,7 +87,6 @@ var VoucherCard = function VoucherCard(props) {
       return {
         booking_id: value.booking_id,
         id: value.id,
-        _id: value._id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
         discount_list: value.discount_list,
@@ -98,24 +95,43 @@ var VoucherCard = function VoucherCard(props) {
     });
     return val;
   }, [state.service.value]);
+  var addonsMemo = useMemo(function () {
+    var _ref2;
+    var val = (_ref2 = state.addons.value || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (value) {
+      var _value$_extend3, _value$_extend4;
+      return {
+        booking_id: value.booking_id,
+        id: value.id,
+        _id: value._id,
+        price: value.price,
+        total: value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.total,
+        discount_list: value.discount_list,
+        _key: value._key,
+        num: value === null || value === void 0 || (_value$_extend4 = value._extend) === null || _value$_extend4 === void 0 ? void 0 : _value$_extend4.quantity
+      };
+    });
+    return val;
+  }, [state.addons.value]);
+  var disabled = useMemo(function () {
+    var _state$bookingDetail;
+    if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && [].concat(_toConsumableArray(addonsMemo), _toConsumableArray(serviceMemo)).every(function (item) {
+      return item.booking_id;
+    })) {
+      return true;
+    }
+    return false;
+  }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
       var _state$service;
       // console.log('state.service.value1', state.service.value);
-      if (productRef.current === state.service.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
         return;
       }
       if (isBooking4Shop) {
-        var val = shopDiscount.calcDiscount(state.service.value);
-        // console.log('input: ', state.service.value);
-        // console.log('output: ', val);
-        productRef.current = val.productList;
-        // console.log('val.productList', val.productList);
-        dispatch({
-          type: 'setService',
-          payload: _objectSpread(_objectSpread({}, services), {}, {
-            value: ((val === null || val === void 0 ? void 0 : val.productList) || []).filter(Boolean)
-          })
-        });
+        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
+        console.log('input: ', state.service.value);
+        console.log('output: ', val);
+        productListToValue(val.productList);
       }
     }, {
       wait: 500
@@ -125,7 +141,7 @@ var VoucherCard = function VoucherCard(props) {
   // 更新productList
   useEffect(function () {
     run();
-  }, [JSON.stringify(serviceMemo), isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
     var _result$productList;
     if (!(result !== null && result !== void 0 && result.productList) || result !== null && result !== void 0 && (_result$productList = result.productList) !== null && _result$productList !== void 0 && _result$productList.some(function (item) {
@@ -133,18 +149,13 @@ var VoucherCard = function VoucherCard(props) {
     })) {
       return;
     }
-    dispatch({
-      type: 'setService',
-      payload: _objectSpread(_objectSpread({}, services), {}, {
-        value: result.productList
-      })
-    });
+    productListToValue(result.productList);
   });
 
   // 监听customer变化
   useEffect(function () {
     if (!isBooking4Shop) return;
-    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, function (customer) {
+    var onScanCustomerChange = function onScanCustomerChange(customer) {
       // 更新客户
       dispatch({
         type: 'setClient',
@@ -152,22 +163,49 @@ var VoucherCard = function VoucherCard(props) {
           value: customer
         }
       });
-    });
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
+    };
+    var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
-    });
+    };
+    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
+    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
+    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange);
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange);
+      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
+      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
+      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
+  var productListToValue = useMemoizedFn(function (list, edit) {
+    var _getServiceAddons = getServiceAddons(list),
+      serviceList = _getServiceAddons.serviceList,
+      addonsList = _getServiceAddons.addonsList;
+    serviceValueRef.current = serviceList;
+    addonsValueRef.current = addonsList;
+    var other = {};
+    if (edit) {
+      other = {
+        edit: true
+      };
+    }
+    dispatch({
+      type: 'setService',
+      payload: _objectSpread({
+        value: serviceList
+      }, other)
+    });
+    dispatch({
+      type: 'setAddons',
+      payload: _objectSpread({
+        value: addonsList
+      }, other)
+    });
+  });
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -178,18 +216,11 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             console.log(val);
             if (val !== null && val !== void 0 && val.isAvailable) {
-              productRef.current = val.productList;
-              dispatch({
-                type: 'setService',
-                payload: {
-                  value: val.productList,
-                  edit: true
-                }
-              });
+              productListToValue(val.productList, true);
               setCode('');
             } else {
               PisellToast({
-                content: locales.getText('pisell2.text.goodpass.code-invalid')
+                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
               });
             }
           case 5:
@@ -199,10 +230,27 @@ var VoucherCard = function VoucherCard(props) {
       }, _callee);
     }));
     return function onScanCode() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
+  var availableData = useMemo(function () {
+    if (!isBooking4Shop) return [];
+    var shopDiscount = pisellos.getModule('shopDiscount');
+    return discountList.filter(function (item) {
+      return !!item.isAvailable;
+    }).map(function (discount) {
+      return _objectSpread(_objectSpread({}, discount), {}, {
+        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
+      });
+    });
+  }, [discountList, isBooking4Shop, disabled]);
   if (!isBooking4Shop) return null;
+  var mixedSort = function mixedSort(val) {
+    return _toConsumableArray(val).sort(function (a, b) {
+      return Number(b === null || b === void 0 ? void 0 : b.isSelected) - Number(a === null || a === void 0 ? void 0 : a.isSelected);
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-voucher-container"
   }, /*#__PURE__*/React.createElement("div", {
@@ -227,7 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    dataSource: availableData,
+    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    mixedSort: mixedSort,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({
@@ -235,13 +284,7 @@ var VoucherCard = function VoucherCard(props) {
         isSelected: val.isSelected
       });
       console.log('setDiscountSelected:', detail);
-      dispatch({
-        type: 'setService',
-        payload: {
-          edit: true,
-          value: detail.productList
-        }
-      });
+      productListToValue(detail.productList, true);
     }
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "voucher-code-input-wrapper"
@@ -258,6 +301,7 @@ var VoucherCard = function VoucherCard(props) {
       setCode((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
     },
     size: "small",
+    allowClear: true,
     placeholder: locales.getText('pisell2.text.goodpass.enter-code')
     // suffix={
     //   <PisellTooltip title="">

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

@@ -0,0 +1,4 @@
+export declare const getServiceAddons: (list: any[]) => {
+    serviceList: any[];
+    addonsList: any[];
+};

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

@@ -0,0 +1,15 @@
+export var getServiceAddons = function getServiceAddons(list) {
+  var serviceList = [];
+  var addonsList = [];
+  list.forEach(function (item) {
+    if (item.isAddons) {
+      addonsList.push(item);
+    } else {
+      serviceList.push(item);
+    }
+  });
+  return {
+    serviceList: serviceList,
+    addonsList: addonsList
+  };
+};

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/forms/single/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/es/components/booking/hooks/useQuotation.d.ts

@@ -1,3 +1,4 @@
+export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
     dom: JSX.Element;
 };