@pisell/private-materials 6.4.72 → 6.4.73

package/es/components/booking/hooks/useQuotation.js

@@ -18,9 +18,8 @@ import { getProductTotalPrice } from "../utils";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
-import { getNormalAndMultiDayProductPrice } from "../info/service/serve";
+import { getProductPrice } from "../info/service/serve";
 import Decimal from 'decimal.js';
-import dayjs from 'dayjs';
 var formatBundleItemMap = function formatBundleItemMap(product) {
   return product.bundle_group.reduce(function (pre, cur) {
     var curObj = {};
@@ -54,17 +53,10 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
   // 是否套餐子商品被删除
   var isNotFoundBundle = false;
   var notFoundProducts = [];
-
-  // 缓存跨日商品的 multiDayPrices，避免同一 groupId 重复计算
-  var multiDayPricesCache = new Map();
   var value = cartValue.map(function (item) {
-    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
-    // 格式化商品日期用于匹配
-    var itemScheduleDate = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : '';
-
-    // 根据 product_id 和 schedule_date 匹配
+    var _item$_extend, _item$_extend2;
     var newProduct = newProducts.find(function (newItem) {
-      return newItem.id === item.product_id && newItem.schedule_date === itemScheduleDate;
+      return newItem.id === item.product_id;
     });
     if (!newProduct) {
       return item;
@@ -72,7 +64,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     // 是否报价单变更价格更新
     var isChangePrice = newProduct.price != item.price;
     var bundleItemMap = formatBundleItemMap(newProduct);
-    var newBundle = (((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || []).map(function (bundle) {
+    var newBundle = (((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).map(function (bundle) {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some(function (p) {
@@ -100,36 +92,6 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
       });
     });
 
-    // 处理跨日商品的 multiDayPrices
-    if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.groupId) {
-      // 检查缓存中是否已经计算过该 groupId
-      if (!multiDayPricesCache.has(item._extend.groupId)) {
-        // 找到该商品所有日期的价格记录
-        var productPrices = newProducts.filter(function (p) {
-          return p.id === item.product_id;
-        });
-
-        // 构建 multiDayPrices 对象
-        var multiDayPrices = {};
-        productPrices.forEach(function (priceItem) {
-          multiDayPrices[priceItem.schedule_date] = {
-            total: Number(priceItem.price),
-            origin_total: Number(priceItem.price),
-            num: 1,
-            quotation_id: priceItem.quotation_id || 0,
-            start_date: priceItem.schedule_date,
-            end_date: dayjs(priceItem.schedule_date).add(1, 'day').format('YYYY-MM-DD')
-          };
-        });
-
-        // 缓存结果
-        multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
-      }
-
-      // 从缓存获取并设置到商品
-      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
-    }
-
     // 价格都没有变动时返回原始信息
     if (!isChangePrice) {
       return item;
@@ -145,7 +107,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         // total: newProduct.total,
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: _objectSpread(_objectSpread({}, item._extend.other), {}, {
-          option: (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option,
+          option: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.option,
           bundle: newBundle
         })
       })
@@ -177,7 +139,7 @@ var useQuotation = function useQuotation(state, dispatch) {
   cartValueRef.current = state.service.value;
   var getCartQuotation = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var queryData, data;
+      var ids, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -187,38 +149,28 @@ var useQuotation = function useQuotation(state, dispatch) {
             }
             return _context.abrupt("return");
           case 2:
-            if (params !== null && params !== void 0 && params.customer_id) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return");
-          case 4:
-            // 构建查询参数：为每个商品生成 { product_id, schedule_date }
-            queryData = cartValueRef.current.filter(function (item) {
+            ids = cartValueRef.current.filter(function (item) {
               return !item.isCustomItem;
             }) // 过滤掉自定义商品
             .map(function (item) {
-              var _item$_extend5;
-              return {
-                product_id: item.product_id,
-                schedule_date: (_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
-              };
+              return item.product_id;
             });
-            if (queryData.length) {
-              _context.next = 7;
+            if (ids.length) {
+              _context.next = 5;
               break;
             }
             return _context.abrupt("return");
-          case 7:
-            _context.next = 9;
-            return getNormalAndMultiDayProductPrice({
-              customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
-              data: queryData
+          case 5:
+            _context.next = 7;
+            return getProductPrice({
+              ids: ids,
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
             });
-          case 9:
+          case 7:
             data = _context.sent;
-            return _context.abrupt("return", data.data);
-          case 11:
+            return _context.abrupt("return", data);
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -241,13 +193,13 @@ var useQuotation = function useQuotation(state, dispatch) {
             return getCartQuotation(params);
           case 2:
             data = _context2.sent;
-            if (!(!data || !data.length)) {
+            if (data !== null && data !== void 0 && data.data) {
               _context2.next = 5;
               break;
             }
             return _context2.abrupt("return");
           case 5:
-            _setNewCartValue = setNewCartValue(cartValueRef.current, data), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
+            _setNewCartValue = setNewCartValue(cartValueRef.current, data.data), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
             if (!isNotFoundBundle) {
               _context2.next = 10;
               break;

package/es/components/booking/info/service/Lists.js

@@ -104,7 +104,7 @@ var Lists = function Lists(_ref) {
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
-    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, true, true, isParallelResource);
+    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
     console.timeEnd('products');
     return p;
   }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state]);

package/es/components/booking/info/service/serve.d.ts

@@ -18,17 +18,3 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date: string;
 }) => Promise<any>;
-declare type MultiDayProductPriceParams = {
-    customer_id: number;
-    data: {
-        product_id: number;
-        schedule_date: string;
-    }[];
-};
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
-export {};

package/es/components/booking/info/service/serve.js

@@ -22,7 +22,7 @@ export var getProductDetail = /*#__PURE__*/function () {
 
 /**
  * @title: 跨日预约获取预约商品报价单
- * @description:
+ * @description: 
  * @param {string} id
  * @param {any} params
  * @return {*}
@@ -67,25 +67,4 @@ export var getProductPrice = /*#__PURE__*/function () {
   return function getProductPrice(_x5) {
     return _ref3.apply(this, arguments);
   };
-}();
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export var getNormalAndMultiDayProductPrice = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          return _context4.abrupt("return", request.getRequest().post("/shop/product/query/shelf/price", params));
-        case 1:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return function getNormalAndMultiDayProductPrice(_x6) {
-    return _ref4.apply(this, arguments);
-  };
 }();

package/es/components/booking/info/service2/Group/utils.js

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
-import { genServiceKey } from "../../../../ticketBooking/utils";
 
 // 创建group
 
@@ -108,7 +107,6 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = totalPrice;
     cacheItem._extend.items = undefined;
-    cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {

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

@@ -67,7 +67,39 @@ export declare const genRowKey: (key: string) => string;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
+    id: any;
+    _id: any;
+    name: any;
+    title: any;
+    price: any;
+    total: number;
+    origin_total: number;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
+    locale: any;
+    symbol: any;
+    relation_products: any;
+    items: any[];
+}[];
 /**
  * @title: 禁用日期
  * @description:
@@ -216,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) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

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

@@ -28,7 +28,7 @@ import localeTexts from "../../locales";
 import { concatBookings, isGroupBooking, getProductByGroupId } from "./Group/utils";
 import { isShowAddTime } from "../utils";
 import { formatResources } from "../service/addService/utils";
-import { getProductExtend, isMultiDayProduct } from "../../info2/service/addService/utils";
+import { getProductExtend } from "../../info2/service/addService/utils";
 import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
 import { getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
@@ -616,11 +616,10 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     }];
   }
   var isNormalProduct = isNormalProductByDurationSchedule(item);
-  var isMultiDay = isMultiDayProduct(item);
   return _objectSpread({
     format: ['HH:mm', 'HH:mm'],
     show_time: true,
-    duration_type: isMultiDay ? 'days' : 'minutes',
+    duration_type: 'minutes',
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -656,6 +655,8 @@ export var formatProducts = function formatProducts(lists, state) {
   var isGeneral = arguments.length > 3 ? arguments[3] : undefined;
   var isParallelResource = arguments.length > 4 ? arguments[4] : undefined;
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
+  var normalList = [];
+  var groupList = [];
   var formItem = function formItem(item) {
     var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
@@ -710,78 +711,31 @@ export var formatProducts = function formatProducts(lists, state) {
       _origin: item
     });
   };
+  console.log(normalList, 'normalList');
   if (isRenderGroup) {
-    // 记录每个商品在原始列表中的索引
-    var normalItemsWithIndex = [];
-    var groupItemsWithIndex = [];
-    // 记录每个组第一次出现的索引
-    var groupFirstIndexMap = {};
-
-    // 将商品分为组商品和非组商品，并记录索引
-    lists.forEach(function (item, index) {
+    // 将商品分为组商品和非组商品
+    lists.forEach(function (item) {
       var _item$_extend29;
       if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
-        normalItemsWithIndex.push({
-          item: item,
-          index: index
-        });
+        normalList.push(formItem(item));
       } else {
-        var _item$_extend30;
-        var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
-        groupItemsWithIndex.push({
-          item: item,
-          index: index
-        });
-        // 记录组第一次出现的索引
-        if (groupFirstIndexMap[groupId] === undefined) {
-          groupFirstIndexMap[groupId] = index;
-        }
+        groupList.push(item);
       }
     });
 
     // 根据item._extend.groupId 进行分组
-    var groups = groupItemsWithIndex.reduce(function (prev, _ref11) {
-      var _item$_extend31;
-      var item = _ref11.item;
-      var groupId = item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId;
+    var groups = groupList.reduce(function (prev, item) {
+      var _item$_extend30;
+      var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
       prev[groupId].push(item);
       return prev;
     }, {});
-
-    // 将分组商品转换为合并后的商品，并记录组第一次出现的索引
-    var mergedGroupItems = Object.entries(groups).map(function (_ref12) {
-      var _ref13 = _slicedToArray(_ref12, 2),
-        groupId = _ref13[0],
-        items = _ref13[1];
-      return {
-        item: formItem(concatBookings(items)),
-        index: groupFirstIndexMap[groupId]
-      };
-    });
-
-    // 将非组商品格式化
-    var formattedNormalItems = normalItemsWithIndex.map(function (_ref14) {
-      var item = _ref14.item,
-        index = _ref14.index;
-      return {
-        item: formItem(item),
-        index: index
-      };
-    });
-
-    // 合并分组商品和非组商品，按照原始索引排序
-    var allItems = [].concat(_toConsumableArray(mergedGroupItems), _toConsumableArray(formattedNormalItems)).sort(function (a, b) {
-      return a.index - b.index;
-    });
-
-    // 返回格式化后的商品列表
-    return allItems.map(function (_ref15) {
-      var item = _ref15.item;
-      return item;
-    });
+    return Object.values(groups).map(function (d) {
+      return formItem(concatBookings(d));
+    }).concat(normalList);
   } else {
     return lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
       return formItem(item);
@@ -861,9 +815,9 @@ export var formatDayDate = function formatDayDate(_extend) {
  * @Author: WangHan
  * @Date: 2024-12-04 12:07
  */
-export var formatDayTime = function formatDayTime(_ref16) {
-  var startDate = _ref16.startDate,
-    endDate = _ref16.endDate;
+export var formatDayTime = function formatDayTime(_ref11) {
+  var startDate = _ref11.startDate,
+    endDate = _ref11.endDate;
   // 营业日时间
   var shopOpeningTime = localStorage.getItem('shopOpeningHours') || '00:00';
 
@@ -940,8 +894,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend32;
-        return ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend31;
+        return ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });
@@ -1120,10 +1074,10 @@ function updateSinglePrice(currentValue, single) {
  * @Author: WangHan
  * @Date: 2024-12-31 15:17
  */
-function updateBundlePrice(currentValue, _ref17) {
-  var _ref18 = _slicedToArray(_ref17, 2),
-    bundle = _ref18[0],
-    single = _ref18[1];
+function updateBundlePrice(currentValue, _ref12) {
+  var _ref13 = _slicedToArray(_ref12, 2),
+    bundle = _ref13[0],
+    single = _ref13[1];
   var _bundle = [];
   var _loop2 = function _loop2() {
     var item = currentValue[index];
@@ -1259,7 +1213,7 @@ export function updateNormalBundlePrice(currentValue, newBundleData) {
  * @Date: 2024-12-31 15:15
  */
 var normalServicePrice = /*#__PURE__*/function () {
-  var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
+  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
     var _state$service6, _state$client, _data$list;
     var services, customerId, data, _lists;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -1334,7 +1288,7 @@ var normalServicePrice = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function normalServicePrice(_x, _x2) {
-    return _ref19.apply(this, arguments);
+    return _ref14.apply(this, arguments);
   };
 }();
 
@@ -1348,13 +1302,13 @@ var normalServicePrice = /*#__PURE__*/function () {
  * @Date: 2024-12-25 16:41
  */
 export var updateAppointmentServicePrice = /*#__PURE__*/function () {
-  var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref20) {
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref15) {
     var _state$service7;
     var start_date, end_date, product_id, defaultReturn, _state$client2, _state$service$cacheI, _res$data, _res$data2, format, customer_id, _product_id, multi_day_price, startDate, endDate, params, res, _prices;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          start_date = _ref20.start_date, end_date = _ref20.end_date, product_id = _ref20.product_id;
+          start_date = _ref15.start_date, end_date = _ref15.end_date, product_id = _ref15.product_id;
           defaultReturn = {
             multiDayPrices: [],
             price: Number(state === null || state === void 0 || (_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 ? void 0 : _state$service7.price) || 0
@@ -1417,7 +1371,7 @@ export var updateAppointmentServicePrice = /*#__PURE__*/function () {
     }, _callee2, null, [[2, 21]]);
   }));
   return function updateAppointmentServicePrice(_x3, _x4) {
-    return _ref21.apply(this, arguments);
+    return _ref16.apply(this, arguments);
   };
 }();
 

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

@@ -7,7 +7,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from "dayjs";
 import { getDays, getIsEdit, isSessionProduct } from "../utils";
 import { isUsableProduct } from "../info2/service/addTimeModal/utils";
-import { isMultiDayProduct } from "../info2/service/addService/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -162,10 +161,6 @@ export var isOpenAddTime = function isOpenAddTime(state) {
 
 // 是否展示加时按钮
 export var isShowAddTime = function isShowAddTime(state, currentService) {
-  // 跨日预约不显示加时按钮
-  if (isMultiDayProduct(currentService)) {
-    return false;
-  }
   if (!isOpenAddTime(state)) {
     return false;
   }