@pisell/private-materials 6.4.75 → 6.4.76

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

@@ -35,7 +35,8 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues
+  formatValues: () => formatValues,
+  getBundleDiscountList: () => getBundleDiscountList
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -116,16 +117,32 @@ var formatProductBundle = (bundle) => {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      "price": Number(d == null ? void 0 : d.price),
-      // checkout 2.0 新增
+      "price": Number(d == null ? void 0 : d.product_price),
       "price_type": d == null ? void 0 : d.price_type,
-      // checkout 2.0 新增
-      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
+      "price_type_ext": d == null ? void 0 : d.price_type_ext,
+      "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default(d == null ? void 0 : d.product_price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
-      "option": option
+      "option": option,
+      "bundle_selling_price": d == null ? void 0 : d.price,
+      "bundle_sum_price": (d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.original_total),
+      metadata: {
+        custom_product_bundle_map_id: d._id
+      }
     };
   });
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && (0, import_utils5.isArr)(d.discount_list)) {
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
 var getSubType = (item) => {
   var _a;
   const _type = (_a = item.duration) == null ? void 0 : _a.type;
@@ -272,11 +289,13 @@ var getSourceProductPrice = (item) => {
   return price;
 };
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
-  const discount_list = (item == null ? void 0 : item.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+  const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+  discount_list.push(...bundleDiscountList);
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   discount_list.forEach((d) => {
     d.metadata = {
@@ -291,30 +310,31 @@ var 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 ? 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: ((_a = item._extend) == null ? void 0 : _a.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((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-    product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.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": item._extend.main_product_selling_price ?? formatProductPrice(item),
+    "source_product_price": getSourceProductPrice(item),
+    "product_id": (item == null ? 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": ((_c = item._extend) == null ? void 0 : _c.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((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+    "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
+    "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
+    "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.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,
-    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
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -612,5 +632,6 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues
+  formatValues,
+  getBundleDiscountList
 });

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -103,11 +103,17 @@ var VoucherCard = (props) => {
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,
         discount_list: value.discount_list,
         origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
-        quantity: value._extend.quantity
+        quantity: value._extend.quantity,
+        startDate: value._extend.startDate
       };
     });
     return val;
   }, [state.service.value]);
+  const serviceTotal = (0, import_react.useMemo)(() => {
+    return serviceMemo.reduce((total, item) => {
+      return total + (item.total || 0);
+    }, 0);
+  }, [serviceMemo]);
   const onScanWallPassCode = (0, import_ahooks.useMemoizedFn)((e) => {
     if (!e.detail.code) {
       return;
@@ -227,6 +233,12 @@ var VoucherCard = (props) => {
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
     var _a2;
     const { serviceList, addonsList } = (0, import_utils2.getServiceAddons)(list);
+    const newTotal = serviceList.reduce((total, item) => {
+      return total + (item._extend.total || 0);
+    }, 0);
+    if (newTotal !== serviceTotal) {
+      edit = true;
+    }
     serviceValueRef.current = serviceList;
     addonsValueRef.current = addonsList;
     let other = {};
@@ -243,12 +255,14 @@ var VoucherCard = (props) => {
       }
     });
     if (!((_a2 = props == null ? void 0 : props.state) == null ? void 0 : _a2.isBookingTicket2)) {
-      dispatch({
-        type: "setAddons",
-        payload: {
-          value: addonsList,
-          ...other
-        }
+      setTimeout(() => {
+        dispatch({
+          type: "setAddons",
+          payload: {
+            value: addonsList,
+            ...other
+          }
+        });
       });
     }
   });

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

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

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

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

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

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

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

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

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info/service2/utils.js

@@ -378,6 +378,7 @@ var formatBundle = (bundle) => {
       num: item == null ? void 0 : item.num,
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
+      origin_total: item.original_total,
       price_type: item == null ? void 0 : item.price_type,
       bundle_sum_price: item == null ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item == null ? void 0 : item.bundle_sum_type,

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -243,13 +243,12 @@ var Info = (props) => {
           _extend: {
             start_date: state.date.value,
             quantity: (e == null ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other
           },
           new: 1
         };
-        console.log(cacheItem, "cacheItem", e);
+        cacheItem._extend.price = (0, import_utils3.getMainPrice)(_detail, _detail.price);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;

package/lib/components/booking/info2/service/contactInfoMode/index.d.ts

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

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/booking/utils.d.ts

@@ -153,6 +153,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration

package/lib/components/booking/utils.js

@@ -46,6 +46,7 @@ __export(utils_exports, {
   getIsEject: () => getIsEject,
   getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
+  getMainPrice: () => getMainPrice,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
@@ -610,6 +611,15 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
   }
   return _extend;
 };
+var getMainPrice = (item, price) => {
+  var _a;
+  let newPrice = new import_decimal.default(price || item._extend.price || 0);
+  let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    newPrice = new import_decimal.default((other == null ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
 var getProductTotalPrice = (item) => {
   var _a;
   let price = new import_decimal.default(item._extend.price || 0);
@@ -703,6 +713,7 @@ var getIsEdit = (state) => {
   getIsEject,
   getIsOnlySession,
   getLastServer,
+  getMainPrice,
   getNowTime,
   getProductTotalPrice,
   getResourceTimeIsUsable,

package/lib/components/eftpos/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/lib/components/eftpos/pos.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/lib/components/eftposPay/amount.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -41,6 +41,7 @@ var import_const = require("../../const");
 var import_const2 = require("../const");
 var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
+var QUERY_INTERVAL = 1e3 * 2;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
   const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
@@ -56,6 +57,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const startTimeRef = (0, import_react.useRef)(null);
   const isQueryFinishedRef = (0, import_react.useRef)(true);
   const queryIdRef = (0, import_react.useRef)(null);
+  const queryIntervalTimerRef = (0, import_react.useRef)(null);
   const _resultQuery = async () => {
     var _a, _b;
     if (controllerRef.current) {
@@ -107,9 +109,9 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("交易状态为0需要继续查询");
         _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (data.status < 0) {
@@ -145,18 +147,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
         _log("NetworkError" /* NetworkError */);
         console.log("Error: 网关类报错，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       _log("Error" /* Error */, error);
@@ -203,6 +205,10 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+      queryIntervalTimerRef.current = null;
+    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;

package/lib/components/eftposPay/pay.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {