@pisell/private-materials 6.0.25 → 6.2.1

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

@@ -9,3 +9,12 @@ export declare const getProductDetail: (id: string, params: any) => Promise<any>
  * @Date: 2024-12-23 17:06
  */
 export declare const postMultiDay: (id: string, params: any) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date: string;
+}) => Promise<any>;

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

@@ -46,4 +46,25 @@ export var postMultiDay = /*#__PURE__*/function () {
   return function postMultiDay(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
+}();
+
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export var getProductPrice = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getProductPrice(_x5) {
+    return _ref3.apply(this, arguments);
+  };
 }();

package/es/components/booking/info/service/serviceList/index.d.ts

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

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

@@ -26,6 +26,7 @@ var ServiceList = function ServiceList(_ref) {
   var errorTypes = {
     product: locales.getText('pisell2.text.status.service-error-1'),
     time: locales.getText('pisell2.text.status.service-error-2'),
+    limit: locales.getText('pisell2.text.status.service-error-3'),
     maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {

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

@@ -9,7 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { getUniqueId } from '@pisell/utils';
 import { useCallback, useMemo } from 'react';
-import { deleteCacheParams, getProductTotalPrice, getServiceTimes } from "../../../utils";
+import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { concatBookings, createBookingItemsByGroup } from "../../service2/Group/utils";
 import { isBookingProduct, isDayBookingProduct, isDaysBooking, isEventBooking } from "../../service2/utils";
 import { getMultiDay, getProductExtend } from "../addService/utils";
@@ -68,6 +68,11 @@ export var useService = function useService(_ref) {
               cacheItem._extend.end_date = state.date.end_date;
               cacheItem._extend.sub_type = 'days';
             }
+            if (isSessionProduct(cacheItem) && _params.session) {
+              cacheItem._extend.start_date = _params.session.start_at;
+              cacheItem._extend.start_time = _params.session.start_time;
+              cacheItem._extend.end_date = _params.session.end_at;
+            }
             _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
             cacheItem._extend.total = _total;
             // 用于储存原价
@@ -90,24 +95,24 @@ export var useService = function useService(_ref) {
               state: state
             });
             if (!isDayBookingMode) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
-            _context.next = 18;
+            _context.next = 19;
             return getMultiDay({
               start_date: cacheItem._extend.startDate,
               end_date: cacheItem._extend.endDate,
               state: state,
               cacheItem: cacheItem
             });
-          case 18:
+          case 19:
             cacheItem = _context.sent;
             if (isDayBookingProduct(cacheItem, state)) {
               // 更换商品需要删除当前组下面的所有子预约 --待实现 在这里删除会导致如果直接返回还需要恢复
               // const newList = filterItemByGroupId(cacheItem._id,state.service.value)
               cacheItem = concatBookings(createBookingItemsByGroup(cacheItem));
             }
-          case 20:
+          case 21:
             if (isEventBookingMode) {
               cacheItem.autoClose = false;
             } else {
@@ -119,7 +124,7 @@ export var useService = function useService(_ref) {
               }
             }
             return _context.abrupt("return", cacheItem);
-          case 22:
+          case 23:
           case "end":
             return _context.stop();
         }
@@ -161,10 +166,10 @@ export var useService = function useService(_ref) {
               _extend.endDate = endDate;
             }
             resourceItem = currentResource(changeValues.resource);
-            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id;
-            _extend.relation_type = relation_type || 'form';
-            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || 0;
-            _extend.schedule_id = schedule_id || 0;
+            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id; // 资源item中的数据  > 原数据 >  兜底
+            _extend.relation_type = relation_type || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_type) || 'form';
+            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_id) || 0;
+            _extend.schedule_id = schedule_id || (_extend === null || _extend === void 0 ? void 0 : _extend.schedule_id) || 0;
             if (_extend.bundle_edit !== undefined) {
               _extend.bundle_edit = 1;
             }
@@ -269,7 +274,7 @@ export var useService = function useService(_ref) {
         changeService: false
       }
     });
-    onEdit(booking);
+    onEdit === null || onEdit === void 0 || onEdit(booking);
   };
   return {
     createBookingData: createBookingData,

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

@@ -85,7 +85,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
     // 商品原始价格  
-    var price = ((_extend$multiDayPrice = _extend.multiDayPrices[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
+    var price = ((_extend$multiDayPrice = _extend.multiDayPrices) === null || _extend$multiDayPrice === void 0 || (_extend$multiDayPrice = _extend$multiDayPrice[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
     var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
       // 编辑时组商品需要清空booking_id  否则会重复
       booking_id: isBatchEdit ? 0 : item.booking_id,
@@ -124,7 +124,8 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
   return bookings;
 };
 export var isGroupBooking = function isGroupBooking(_id) {
-  return (_id === null || _id === void 0 ? void 0 : _id.indexOf('bookingGroup_')) === 0;
+  var _id$indexOf;
+  return (_id === null || _id === void 0 || (_id$indexOf = _id.indexOf) === null || _id$indexOf === void 0 ? void 0 : _id$indexOf.call(_id, 'bookingGroup_')) === 0;
 };
 export var getProductByGroupId = function getProductByGroupId(groupId, items) {
   return items.filter(function (item) {

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service2/hooks/useSelectPet.js

@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
-import { formatHolderLists } from "../utils";
+import { formatHolderLists, isDayBooking } from "../utils";
 var useSelectPet = function useSelectPet(state) {
-  var _state$pet2;
+  var _state$pet2, _state$pet4;
+  var isDaysBookingBol = useMemo(function () {
+    return isDayBooking(state);
+  }, [state === null || state === void 0 ? void 0 : state.renderType]);
+
   /**
    * @title: pets数据
    * @description:
@@ -25,9 +29,13 @@ var useSelectPet = function useSelectPet(state) {
    * @Date: 2024-12-03 11:40
    */
   var holderLists = useMemo(function () {
-    var _lists = formatHolderLists(petLists);
-    return _lists;
-  }, [petLists]);
+    var _state$pet3;
+    if (isDaysBookingBol) {
+      var _lists = formatHolderLists(petLists);
+      return _lists;
+    }
+    return (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders) || [];
+  }, [petLists, isDaysBookingBol, state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.holders]);
 
   /**
    * @title: 获取pet名称

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

@@ -9,6 +9,7 @@ import AddService from "../service/addService";
 import EditService from "../service/editService";
 import { Context } from "../model";
 import Lists from "./Lists";
+import useQuotation from "../../hooks/useQuotation";
 export var Service2Context = /*#__PURE__*/createContext({});
 export var Service2Cart = function Service2Cart(_ref) {
   var hideAdd = _ref.hideAdd,
@@ -36,12 +37,14 @@ export var Service2Cart = function Service2Cart(_ref) {
       payload: _objectSpread({}, payload)
     });
   };
-  var handleEdit = function handleEdit(cacheItem) {
+  var handleEdit = function handleEdit(cacheItem, type) {
     setTimeout(function () {
       var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
     }, 100);
   };
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, /*#__PURE__*/React.createElement(Lists, {
@@ -53,5 +56,5 @@ export var Service2Cart = function Service2Cart(_ref) {
     onEdit: handleEdit
   })), !hideEdit && /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }));
+  }), dom);
 };

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

@@ -39,19 +39,25 @@ export declare const isBookingProduct: (extension_type: any, bol?: boolean) => b
  * @Date: 2024-12-06 11:24
  */
 export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
+export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
 /**
  * @title: 更新商品数据
  * @description:
  * @param {any} state
+ * @param currentItem
  * @param {string} type
- * @param {any} _id // 商品id
  * @param {any} other
+ * @param actions
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-01-03 15:00
  */
-export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any) => any;
+export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
 export declare const formItems: (items: any[]) => any[];
+export declare const getIsSubjectRequire: (state: any) => boolean;
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
+export declare const isAllNormalProductByState: (state: any) => boolean;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -60,13 +66,14 @@ export declare const formItems: (items: any[]) => any[];
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean) => {
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
     id: any;
     _id: any;
     name: any;
     price: any;
-    total: any;
-    origin_total: any;
+    total: number;
+    origin_total: number;
     num: any;
     image: any;
     isShowNote: boolean;
@@ -86,8 +93,8 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     isNormalProduct: boolean;
     locale: any;
     symbol: any;
+    relation_products: any;
     items: any[];
-    _origin: any;
 }[];
 /**
  * @title: 禁用日期