@pisell/private-materials 6.5.4 → 6.5.6

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

@@ -11,9 +11,10 @@ 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 } from '@pisell/utils';
+import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 import { getClientName } from "../../../../plus/clientName/utils";
+import { cloneDeep } from 'lodash';
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -274,7 +275,7 @@ var formatSellingPrice = function formatSellingPrice(item) {
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
 var formatMetaData = function formatMetaData(item) {
-  var _item$_extend10, _item$_extend11, _item$_extend13;
+  var _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend15;
   var metadata = {};
   if ((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -290,6 +291,10 @@ var formatMetaData = function formatMetaData(item) {
     var _item$_extend14;
     metadata.multiDayPrices = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.multiDayPrices;
   }
+  if ((_item$_extend15 = item._extend) !== null && _item$_extend15 !== void 0 && _item$_extend15.unique_identification_number) {
+    var _item$_extend16;
+    metadata.unique_identification_number = (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.unique_identification_number;
+  }
   return metadata;
 };
 
@@ -309,9 +314,9 @@ var formatMetaData = function formatMetaData(item) {
 
 // 获取商品价格 包含组合规格
 var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend15, _item$_extend16, _item$variant2;
-  var other = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.other;
-  var price = Number((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price);
+  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);
 
   // 组合规格: 根据当前选择的组合规格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) {
@@ -334,7 +339,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
+  var _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -342,6 +347,11 @@ var formatProducts = function formatProducts(item, quantity) {
 
   // 加价时type使用change_price
   var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
+  discount_list.forEach(function (d) {
+    d.metadata = _objectSpread(_objectSpread({}, d.metadata), {}, {
+      unique_identification_number: "".concat(item._extend.unique_identification_number, "_").concat(d.discount.resource_id)
+    });
+  });
 
   // 非手动折扣
   var notManualDiscount = discount_list.filter(function (item) {
@@ -359,21 +369,22 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.note) || '',
+    "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$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.bundle),
+    "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$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.option),
-    "product_variant_id": ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_variant_id) || 0,
+    "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),
     // checkout 需求新增字段
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
-    "tax_fee": item._extend.tax_fee
+    "tax_fee": item._extend.tax_fee,
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 
@@ -391,8 +402,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend21;
-    var holderId = (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.holder_id;
+    var _item$_extend23;
+    var holderId = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -418,15 +429,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend22;
-      return ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend24;
+      return ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend23;
-      var key = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id; // 分组键
+      var _item$_extend25;
+      var key = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -487,6 +498,7 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   list.forEach(function (item) {
+    var _item$_extend30;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -507,9 +519,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
-      var startDate = ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.startDate) || ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.start_date);
-      var endDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.endDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.end_date);
+      var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
+      var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
+      var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -531,8 +543,13 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
+    if (!((_item$_extend30 = item._extend) !== null && _item$_extend30 !== void 0 && _item$_extend30.unique_identification_number)) {
+      var unique_identification_number = getUniqueId();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     var booking = _objectSpread(_objectSpread({
       "product": formatProducts(item),
+      "metadata": formatMetaData(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id || 0,
@@ -551,7 +568,6 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item),
       "note": item._extend.note
     }, eventOtherParams || {}), dayParams);
     if (isDay) {
@@ -559,12 +575,15 @@ var formatBookings = function formatBookings(data, values) {
       return;
     }
     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);
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
-        "product": formatProducts(item, 1),
+        "product": formatProducts(newItem, 1),
         "number": item._extend.capacity ? getSumCapacity({
-          cacheItem: item
-        }, false) : item._extend.number || 1,
-        "holder": getHolderByIndex(booking.holder, i)
+          cacheItem: newItem
+        }, false) : newItem._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i),
+        "metadata": formatMetaData(newItem)
       }));
     }
   });
@@ -584,14 +603,19 @@ 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$_extend28;
+    var _item$_extend31;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
+    var _item$_extend32;
+    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+      var unique_identification_number = getUniqueId();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     return formatProducts(item);
   });
   return relationProducts || [];
@@ -607,6 +631,11 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
+    var _item$_extend33;
+    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
+      var unique_identification_number = getUniqueId();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
     return formatProducts(item);
   });
   return relationProducts || [];
@@ -721,19 +750,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend30;
+    var _item$_extend35;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend29;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 || (_item$_extend29 = _item$_extend29.other) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.rowKey);
+      var _item$_extend34;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 || (_item$_extend30 = _item$_extend30.holder_id) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.length) !== item._extend.quantity) {
-      var _item$_extend31;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.holder_id) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.length) !== item._extend.quantity) {
+      var _item$_extend36;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
       return true;
     }
     return false;

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

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/model.js

@@ -31,6 +31,11 @@ var _miniRedux = miniRedux({
           service: _objectSpread(_objectSpread(_objectSpread({}, state.service), payload), obj)
         });
       },
+      setPaymentPaid: function setPaymentPaid(state, payload) {
+        state.setGlobalState({
+          paymentPaid: _objectSpread(_objectSpread({}, state.paymentPaid), payload)
+        });
+      },
       setDate: function setDate(state, payload) {
         state.setGlobalState({
           date: _objectSpread(_objectSpread({}, state.date), payload)

package/es/components/booking/info/service/addService/index.js

@@ -173,7 +173,8 @@ var Info = function Info(props) {
             _context.next = 13;
             return getProductDetail(product.id, {
               schedule_date: state.date.value.format('YYYY-MM-DD'),
-              customer_id: customerId
+              customer_id: customerId,
+              open_deposit: 1
             });
           case 13:
             detail = _context.sent;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -34,7 +34,7 @@ import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
 import CartClientCard from "./cartClientCard";
-import { Iconfont } from '@pisell/materials';
+import { Iconfont, useToast } from '@pisell/materials';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -80,6 +80,7 @@ var Info = Provider(function (props) {
       });
     }
   }, []);
+  var Toast = useToast();
   useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
     // TODO: 优化 内部每次设置state会触发两次渲染
@@ -95,6 +96,41 @@ var Info = Provider(function (props) {
       })
     });
   }, [globalState]);
+  var dropdownProps = useMemo(function () {
+    var icon = /*#__PURE__*/React.createElement(Iconfont, {
+      type: 'pisell2-switch-horizontal-01',
+      size: 24,
+      style: {
+        color: '#667085'
+      }
+    });
+    // if (globalState?.isBookingTicket2) {
+    //   if (modal.state?.service?.value?.some((n: any) => n?.edit)) {
+    //     return {
+    //       open: false,
+    //       buttonProps: {
+    //         icon,
+    //         size: 'default',
+    //         onClick: () => {
+    //           // todo 根据当前订单付款情况判断是否可以切换
+    //           Toast?.info?.(
+    //             locales.getText(
+    //               'pisell2.checkout.client-card.tip.partially-paid'
+    //             )
+    //           );
+    //         },
+    //         style: { cursor: 'not-allowed' },
+    //       },
+    //     };
+    //   }
+    // }
+    return {
+      buttonProps: {
+        icon: icon,
+        size: 'default'
+      }
+    };
+  }, [modal.state]);
   var addNote = function addNote(e) {
     modal.dispatch({
       type: 'setNotes',
@@ -288,7 +324,11 @@ var Info = Provider(function (props) {
       flex: 1,
       overflow: 'hidden'
     }
-  }, /*#__PURE__*/React.createElement(CartClientCard, null)) : /*#__PURE__*/React.createElement(Client, null) : null, globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(CartClientCard, {
+    clientCardProps: {
+      dropdown: dropdownProps
+    }
+  })) : /*#__PURE__*/React.createElement(Client, null) : null, globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
     className: "booking-info-client-line-code",
     onClick: function onClick() {
       var _globalState$onQrCode;

package/es/components/booking/info2/service/addService/index.js

@@ -115,7 +115,8 @@ var Info = function Info(props) {
             product = list[0];
             _context.next = 13;
             return getProductDetail(product.id, {
-              schedule_date: state.date.value.format('YYYY-MM-DD')
+              schedule_date: state.date.value.format('YYYY-MM-DD'),
+              open_deposit: 1
             });
           case 13:
             detail = _context.sent;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/editService/index.js

@@ -30,7 +30,7 @@ import { renderBundles } from "../../../components/collapsibleList/utils";
 import "./index.less";
 import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
-import { PisellAdjustPriceInputNumber, ConfigProvider } from '@pisell/materials';
+import { ConfigProvider, Iconfont } from '@pisell/materials';
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { editSessionProduct } from "../../../info/utils";
@@ -38,6 +38,7 @@ import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProd
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import NoteModal from "../../../../../plus/noteModal";
+import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI6, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI11, _state$bookingConfig5, _state$service$cacheI12, _state$service$cacheI13, _state$service9, _state$service$resour2, _state$service$cacheI14, _state$service$cacheI15;
@@ -666,7 +667,7 @@ var Info = function Info(_, ref) {
         required: true
       }],
       extra: useTotal !== ((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
-    }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
+    }, /*#__PURE__*/React.createElement(DiscountKeyboard.InputNumber, {
       style: {
         width: '100%'
       },
@@ -675,8 +676,15 @@ var Info = function Info(_, ref) {
       prefix: state.amountSymbol,
       onChange: handleTotalChange,
       disabled: state.channelDisabledEdit,
-      originValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
-      placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0'
+      originalValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
+      placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0',
+      size: "large",
+      keyboardProps: {
+        containerProps: {
+          renderType: 'modal'
+        },
+        selectType: 'dark'
+      }
     })));
   }, [useTotal, (_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total, state.amountSymbol, state.channelDisabledEdit]);
   var reason = useMemo(function () {

package/es/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/utils.js

@@ -18,6 +18,7 @@ import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
+import Decimal from 'decimal.js';
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -757,27 +758,31 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
   var _item$_extend;
-  var price = Number(item._extend.price);
+  var price = new Decimal(item._extend.price || 0);
   var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {
-    price = Number(other === null || other === void 0 ? void 0 : other.price);
+    price = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
   }
   if (other !== null && other !== void 0 && other.bundle) {
     // bundle
     price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
     }, price);
   }
 
   // 单规格
   if (other !== null && other !== void 0 && other.option) {
     price = other === null || other === void 0 ? void 0 : other.option.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
     }, price);
   }
-  return price;
+  return price.toNumber();
 };
 /**
  * @title: 判断 duration

package/es/components/checkout/PaymentModal.d.ts

@@ -23,6 +23,8 @@ interface PaymentModalProps {
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
+    setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
+    editOrderId?: number;
 }
 declare const PaymentModal: React.FC<PaymentModalMainProps>;
 export type { PaymentModalData, PaymentModalProps };