@pisell/private-materials 3.3.22 → 3.3.24

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

@@ -42,7 +42,7 @@ import useSelectPet from "../../service2/hooks/useSelectPet";
 import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj } from "../addService/utils";
 import Like from "../like";
-import { getMultiDayPrices } from "../../utils";
+import { editSessionProduct, getMultiDayPrices } from "../../utils";
 import { useService } from "../serviceManager";
 import EditTabs from "./EditTabs";
 var submitLock = false;
@@ -649,7 +649,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = useMemoizedFn(function (e) {
-    var _item$_extend3, _state$client;
+    var _item$_extend6, _state$client;
     // 当前商品
     var item = state.service.cacheItem;
 
@@ -668,6 +668,15 @@ var Info = function Info(_, ref) {
       dayValue.product_option = option || [];
     }
     var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend3, _item$_extend4, _item$_extend5;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
+        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+      };
+    }
 
     // 打开商品详情弹窗
     state.action({
@@ -681,25 +690,29 @@ var Info = function Info(_, ref) {
           variant: isDayBookingMode ? true : false,
           package: true
         },
-        value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
+        value: _objectSpread(_objectSpread(_objectSpread({}, ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other) || {}), dayValue), sessionValue),
         isOS: isSession,
         customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
           var _cacheItem$_extend;
-          var _detail, cacheItem, _total, _cacheItem$_extend2;
+          var _detail, other, cacheItem, _total, _cacheItem$_extend2, sessionDetail;
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _detail = detail || item; // 重新生成商品
+                _detail = detail || item;
+                other = JSON.parse(JSON.stringify(e));
+                other.session = e.session;
+
+                // 重新生成商品
                 cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
                   product_id: item.id,
                   _id: item === null || item === void 0 ? void 0 : item._id,
                   _key: e.key,
                   _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
                     // 覆盖选择的规格和套餐
-                    other: JSON.parse(JSON.stringify(e))
+                    other: other
                   }),
                   new: 0
                 }); // 获取商品总价
@@ -707,8 +720,7 @@ var Info = function Info(_, ref) {
                 if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
                   cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
                 }
-
-                // 用于折扣 可修改
+                sessionDetail = editSessionProduct(cacheItem, e.session); // 用于折扣 可修改
                 cacheItem._extend.total = _total;
 
                 // 用于储存原价
@@ -721,13 +733,25 @@ var Info = function Info(_, ref) {
                     cacheItem: cacheItem
                   }
                 });
-                setTimeout(function () {
-                  updateMultiDay({
-                    start_date: values.start_date,
-                    end_date: values.end_date
-                  });
-                }, 100);
-              case 8:
+                if (isDayBookingMode) {
+                  setTimeout(function () {
+                    updateMultiDay({
+                      start_date: values.start_date,
+                      end_date: values.end_date
+                    });
+                  }, 100);
+                } else {
+                  // 商家反馈更新商品后没有展示最新价格，此处编辑商品后恢复折扣信息
+                  // https://go.feishu.cn/approval/s/iaxPKxFW/
+                  // 更新表单内的商品价格
+                  form.setFieldsValue(_objectSpread({
+                    total: _total
+                  }, isSessionProduct(cacheItem) && sessionDetail ? {
+                    start_time: sessionDetail.start_time,
+                    duration: sessionDetail.duration
+                  } : {}));
+                }
+              case 11:
               case "end":
                 return _context4.stop();
             }

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

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

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

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

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

@@ -43,4 +43,8 @@ export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
 export declare const isDayBooking: (shopId: number) => boolean;
 export declare const isOpenAddTime: (state: any) => boolean;
 export declare const isShowAddTime: (state: any, currentService: any) => boolean;
+export declare const editSessionProduct: (cacheItem: any, session: any) => {
+    duration: any;
+    start_time: any;
+} | undefined;
 export {};

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

@@ -5,7 +5,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
-import { getIsEdit } from "../utils";
+import { getDays, getIsEdit, isSessionProduct } from "../utils";
 import { isUsableProduct } from "../info2/service/addTimeModal/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
@@ -171,4 +171,21 @@ export var isShowAddTime = function isShowAddTime(state, currentService) {
     return false;
   }
   return true;
+};
+export var editSessionProduct = function editSessionProduct(cacheItem, session) {
+  if (isSessionProduct(cacheItem) && session) {
+    cacheItem._extend.start_date = session.start_at;
+    cacheItem._extend.startDate = session.start_at;
+    cacheItem._extend.start_time = session.start_time;
+    cacheItem._extend.end_time = session.end_time;
+    cacheItem._extend.end_date = session.end_at;
+    cacheItem._extend.endDate = session.end_at;
+    cacheItem._extend.duration = getDays({
+      _extend: cacheItem._extend
+    }, 'minutes');
+    return {
+      duration: cacheItem._extend.duration,
+      start_time: session.start_time
+    };
+  }
 };

package/es/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/es/components/booking/info2/service/addService/index.js

@@ -293,12 +293,26 @@ var Info = function Info(props) {
         }
         if (cacheItem.autoClose) {
           cacheItem.autoClose = false;
-          var _list = [].concat(_toConsumableArray(state.service.value), [cacheItem]);
+          var newValue = _toConsumableArray(state.service.value);
+          if (!newValue.some(function (item) {
+            return item._id === cacheItem._id;
+          })) {
+            newValue.push(cacheItem);
+          } else {
+            newValue = newValue.map(function (item) {
+              if (item._id === cacheItem._id) {
+                return _objectSpread(_objectSpread({}, cacheItem), {}, {
+                  new: 0
+                });
+              }
+              return item;
+            });
+          }
           dispatch({
             type: 'setService',
             payload: {
               addModal: false,
-              value: _list,
+              value: newValue,
               edit: true,
               changeService: false
             }

package/es/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

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

@@ -33,6 +33,7 @@ import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProd
 import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
+import { editSessionProduct } from "../../../info/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service3, _state$service5, _window$BaseMaterials, _state$service$cacheI6, _state$service6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
@@ -391,6 +392,16 @@ var Info = function Info(_, ref) {
     // 表单数据
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend, _item$_extend2, _item$_extend3;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.end_date,
+        duration: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration
+      };
+    }
+
     // 打开商品详情弹窗
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -404,11 +415,14 @@ var Info = function Info(_, ref) {
           package: true
         },
         isOS: isSession,
-        value: item._extend.other
+        value: _objectSpread(_objectSpread({}, item._extend.other), sessionValue)
       },
       callback: function callback(e, extension_type, detail) {
         var _cacheItem$_extend;
         var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
+
         // 重新生成商品
         var cacheItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
           product_id: item.id,
@@ -416,7 +430,7 @@ var Info = function Info(_, ref) {
           _key: e.key,
           _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
             // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e))
+            other: other
           }),
           new: 0
         });
@@ -432,6 +446,15 @@ var Info = function Info(_, ref) {
             cacheItem: cacheItem
           });
         } catch (err) {}
+        var sessionDetail = editSessionProduct(cacheItem, e.session);
+        if (sessionDetail) {
+          setTimeout(function () {
+            form.setFieldsValue({
+              start_time: sessionDetail.start_time,
+              duration: sessionDetail.duration
+            });
+          }, 200);
+        }
 
         // 用于储存原价
         cacheItem._extend.origin_total = _total;

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

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

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

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number) => {
+    list: any[];
+    listMap: any;
+};