@pisell/private-materials 6.7.9 → 6.8.1

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

@@ -17,6 +17,7 @@ import React, { useContext, useEffect, useImperativeHandle, useMemo, useState, f
 import { useMemoizedFn, useDebounceFn } from 'ahooks';
 import { PisellModal, useToast } from '@pisell/materials';
 import { locales } from '@pisell/utils';
+import { cloneDeep } from 'lodash';
 import localeTexts from "./locales";
 import ClientCard from "../../../../plus/clientCard";
 import ClientSearch from "../../../../plus/clinetSearch";
@@ -186,12 +187,40 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理查看客户
   var handleViewClient = function handleViewClient(data) {
+    var newSelectedCustomer = cloneDeep(selectedCustomer);
     state.action({
       type: 'pisell1.handleOpenCustomerModal',
       data: {
         id: state.client.value.id
       },
-      callback: function callback(data) {}
+      callback: function callback(data) {
+        console.log('data>>>>>', data);
+        var _selectedCustomer = _objectSpread(_objectSpread({}, newSelectedCustomer || {}), {}, {
+          display_name: (data === null || data === void 0 ? void 0 : data.display_name) || "",
+          email: (data === null || data === void 0 ? void 0 : data.email) || "",
+          phone: (data === null || data === void 0 ? void 0 : data.phone) || "",
+          nickname: (data === null || data === void 0 ? void 0 : data.nickname) || "",
+          country_calling_code: (data === null || data === void 0 ? void 0 : data.country_calling_code) || "",
+          first_name: (data === null || data === void 0 ? void 0 : data.first_name) || "",
+          last_name: (data === null || data === void 0 ? void 0 : data.last_name) || "",
+          contacts_info: (data === null || data === void 0 ? void 0 : data.contacts_info) || null
+        });
+        selectCustomer(_selectedCustomer);
+
+        // 如果联系信息发生变动需要更新
+        if (JSON.stringify((newSelectedCustomer === null || newSelectedCustomer === void 0 ? void 0 : newSelectedCustomer.contacts_info) || {}) !== JSON.stringify((data === null || data === void 0 ? void 0 : data.contacts_info) || {})) {
+          dispatch({
+            type: 'setContactsInfo',
+            payload: {
+              value: (data === null || data === void 0 ? void 0 : data.contacts_info) || {},
+              client_id: data === null || data === void 0 ? void 0 : data.id
+            }
+          });
+        }
+
+        // 重置客户搜索框内容
+        handleSearchClient('');
+      }
     });
   };
 
@@ -321,11 +350,6 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setHandleSetClient(handleSetClient);
     }
   }, [isActive]);
-  useEffect(function () {
-    return function () {
-      setHandleSetClient(null);
-    };
-  }, [isActive]);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

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

@@ -33,9 +33,9 @@ import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
-import ContactInfoMode from "./service/contactInfoMode";
 import CartClientCard from "./cartClientCard";
 import { Iconfont, useToast } from '@pisell/materials';
+import ContactInfoMode from "./service/contactInfoMode";
 var defaultModules = {
   client: 1,
   date: 1,

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

@@ -30,7 +30,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
@@ -297,13 +297,12 @@ var Info = function Info(props) {
           _extend: {
             start_date: state.date.value,
             quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other: other
           },
           new: 1
         });
-        console.log(cacheItem, 'cacheItem', e);
+        cacheItem._extend.price = getMainPrice(cacheItem, _detail.price);
         var _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;

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

@@ -2,6 +2,7 @@ import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'reac
 import { useMemoizedFn } from 'ahooks';
 import SkuDetailModal from "../../../../../pro/skuDetailModal";
 import { Context } from "../../../info/model";
+import { setProductPrice } from "../editService/utils";
 var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -33,6 +34,11 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
     var _ref2, _state$service2;
     var newProducts = (_ref2 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
       if (item._id == data._id) {
+        var _data$_extend, _data$_extend2;
+        data = setProductPrice(data, {
+          newTotal: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.total,
+          origin_total: (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.origin_total
+        });
         return data;
       }
       return item;

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

@@ -37,6 +37,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import { setProductPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 var submitLock = false;
@@ -240,7 +241,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _item2, _item$_extend2, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -277,7 +278,11 @@ var Info = function Info(_, ref) {
     _item._extend = _extend;
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
-    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
+    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
+    _item = setProductPrice(_item, {
+      newTotal: values.total,
+      origin_total: (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.origin_total
+    });
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
@@ -288,7 +293,12 @@ var Info = function Info(_, ref) {
     } else {
       // 手动改价时移除优惠券使用
       if (isChangeTotal.current) {
+        var _item$_extend3;
         delete _item.discount_list;
+        _item = setProductPrice(_item, {
+          newTotal: values.total,
+          origin_total: (_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.origin_total
+        });
       }
       _list = _list.map(function (d) {
         return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
@@ -483,11 +493,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend2, _item$_extend3, _item$_extend4;
+      var _item$_extend4, _item$_extend5, _item$_extend6;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
-        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
+        startDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.end_date,
+        duration: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.duration
       };
     }
 

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

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;

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

@@ -14,7 +14,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
+import { isArr } from "@pisell/utils";
 import { isBoolean } from "@pisell/utils";
+import Decimal from "decimal.js";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -52,4 +54,68 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
   } else {
     localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
   }
+};
+
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ * 
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ * 
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref2.newTotal,
+    origin_total = _ref2.origin_total;
+  // 计算折扣比例
+  var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
+
+  // 用于累加子商品总价c
+  var subTotal = new Decimal(0);
+
+  // 处理 bundle 子商品
+  if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
+    var _cacheItem$_extend$ot3;
+    (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
+      var _ref3, _bundle$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      bundle.price = newPrice;
+    });
+  }
+
+  // 处理 option 子商品
+  if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
+    var _cacheItem$_extend$ot6;
+    (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
+      var _ref4, _option$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      option.price = newPrice;
+    });
+  }
+
+  // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
+  cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
 };

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

@@ -152,6 +152,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/es/components/booking/utils.js

@@ -18,7 +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';
+import Decimal from "decimal.js";
 
 /**
  * @title: 高阶函数结果缓存（Memoization）
@@ -789,11 +789,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
+// 获取主商品价格 包含组合规格
+export var getMainPrice = function getMainPrice(item, price) {
+  var _item$_extend;
+  var newPrice = new Decimal(price || 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) {
+    newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
+
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend;
+  var _item$_extend2;
   var price = new Decimal(item._extend.price || 0);
-  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {

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

@@ -15,16 +15,24 @@ interface PaymentModalProps {
     data?: PaymentModalData;
     callback?: (result: any) => void;
     onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
+    paymentResultDisplayMode?: string;
+    shopDiscount?: number;
+    client?: any;
+    currentTotalPrice?: number;
+    config?: any;
+    onChangeShopDiscount?: (discount: string) => void;
+    onChangeOrderNote?: (note: string) => void;
+    onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;
+    config?: {
+        showHeaderCenter?: boolean;
+        showHeaderRightButton?: boolean;
+        disabledSwitchClient?: boolean;
+    };
 }
 declare const PaymentModal: React.FC<PaymentModalMainProps>;
 export type { PaymentModalData, PaymentModalProps };