@pisell/private-materials 3.3.46 → 3.3.48

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

@@ -35,20 +35,21 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatProductBundle } from "../components/footer/utils";
-import { formatProductListByCategory, getProductTotalPrice, isSessionProduct, request } from "../utils";
+import { formatProductBundle, formatProductOption, formatProductPrice } from "../components/footer/utils";
+import { formatProductListByCategory, getIsEject, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
 export var formatProducts = function formatProducts(values) {
   var arr = [];
   arr = values.map(function (item) {
-    var _item$_extend, _item$_extend2;
+    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
-      price: item._extend.price,
+      price: formatProductPrice(item),
       product_id: item.id,
+      discount_list: (item === null || item === void 0 ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: '',
       is_charge_tax: item.is_charge_tax,
@@ -56,7 +57,9 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle)
+      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle),
+      "product_option_item": formatProductOption((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.option),
+      "product_variant_id": ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.product_variant_id) || 0
     };
   });
   return arr;
@@ -83,7 +86,7 @@ var restoreProductOtherData = function restoreProductOtherData(data) {
         })
       });
     }),
-    product_variant_id: 0,
+    product_variant_id: detail.product_variant_id || 0,
     quantity: Number(detail.product_quantity)
   };
 };
@@ -284,23 +287,23 @@ var Addons = Provider(function (props) {
     var isSession = isSessionProduct(item);
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
+    var isEject = getIsEject(item, type);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession
       },
       callback: function callback(e, extension_type, detail) {
-        console.log('e', e);
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread({}, _detail), {}, {
           _id: getUniqueId(),
@@ -308,19 +311,19 @@ var Addons = Provider(function (props) {
           _extend: {
             price: _detail.price,
             other: e,
-            quantity: 1
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           },
-          quantity: 1
+          quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
         });
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
         var _item = _list.find(function (d) {
-          return d._extend.other.key === e.key;
+          return d._extend.other.rowKey === e.rowKey;
         });
 
         // 如果已添加, 则数量+1
         if (_item) {
-          _item._extend.quantity = _item.quantity + 1;
+          _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
           // 否则 push
           _list.push(product);
@@ -353,22 +356,20 @@ var Addons = Provider(function (props) {
     // 0 则移除
     if (quantity == 0) {
       _list = _list.filter(function (d) {
-        return d.id !== item.id;
+        return d._id !== item._id;
       });
     } else {
-      var _item$_extend3;
+      var _item$_extend5;
       var _item = _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           quantity: Number(e.target.value)
         })
       });
-      var _total = getProductTotalPrice(_item);
-      _item._extend.total = _total;
-      if (((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle_edit) !== undefined) {
+      if (((_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.bundle_edit) !== undefined) {
         _item._extend.bundle_edit = 1;
       }
       _list = _list.map(function (d) {
-        return d.id === item.id ? _item : d;
+        return d._id === item._id ? _item : d;
       });
     }
     dispatch({
@@ -497,10 +498,11 @@ var Addons = Provider(function (props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         value: item._extend.other,
         isOS: isSession
@@ -508,9 +510,12 @@ var Addons = Provider(function (props) {
       callback: function callback(e, extension_type, detail) {
         var _product$_extend;
         var _detail = detail || item;
-        var product = _objectSpread(_objectSpread({}, _detail), {}, {
+        var product = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
+          // 编辑商品时清除折扣信息
+          discount_list: [],
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            other: e
+            other: e,
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           })
         });
         if (((_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle_edit) !== undefined) {

package/es/components/booking/components/footer/amount.js

@@ -9,7 +9,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
-import { isDayBooking, isDayBookingProduct } from "../../info/service2/utils";
+import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = 0;
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -47,7 +47,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _item = _step2.value;
           // 跨日预约
-          if (isDay) {
+          if (isDay || isNormalProductByDurationSchedule(_item)) {
             var quantity = _item._extend.quantity || 1;
             price += Number(_item._extend.total) * Number(quantity);
 

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

@@ -27,5 +27,14 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+/**
+ * @title: 格式化商品单价
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-23 12:05
+ */
+export declare const formatProductPrice: (item: any) => number;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -10,7 +10,7 @@ import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
-import { isDaysBooking, formatDayTime, isEventBooking } from "../../info/service2/utils";
+import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
@@ -47,7 +47,7 @@ export var formatProductOption = function formatProductOption(option) {
   return option.map(function (d) {
     return {
       "num": d.num,
-      "option_group_item_id": d.product_option_item_id,
+      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
       "option_group_id": d.option_group_id
       // "add_price": Number(d?.add_price),
     };
@@ -221,7 +221,7 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Author: WangHan
  * @Date: 2024-12-23 12:05
  */
-var formatProductPrice = function formatProductPrice(item) {
+export var formatProductPrice = function formatProductPrice(item) {
   var _item$_extend3, _item$_extend4;
   var other = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other;
   var price = Number((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.price);
@@ -406,6 +406,11 @@ var formatBookings = function formatBookings(data, values) {
       return (_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.holder_id;
     });
   }
+  if (!isDay && !isEvent) {
+    list = list.filter(function (item) {
+      return !isNormalProductByDurationSchedule(item);
+    });
+  }
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
@@ -496,6 +501,21 @@ var formatRelationProducts = function formatRelationProducts(data) {
   return relationProducts || [];
 };
 
+// 非预约商品格式化
+var formatNormalProducts = function formatNormalProducts(data) {
+  var _data$service2;
+  var list = ((_data$service2 = data.service) === null || _data$service2 === void 0 ? void 0 : _data$service2.value) || [];
+  // 非预约的商品
+  list = list.filter(function (item) {
+    return isNormalProductByDurationSchedule(item);
+  });
+  var relationProducts = [];
+  relationProducts = list.map(function (item) {
+    return formatProducts(item);
+  });
+  return relationProducts || [];
+};
+
 /**
  * @title: 预约主体信息
  * @description: 
@@ -531,7 +551,7 @@ var formatHolder = function formatHolder(state, values) {
 
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
-  var _values;
+  var _values, _values3;
   var values = {
     type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -564,13 +584,11 @@ export var formatValues = function formatValues(state) {
 
   // 主体
   values.holder = formatHolder(state, values);
-  if (isDay) {
+  if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state);
+  } else {
+    values.relation_products = formatNormalProducts(state);
   }
-  if (isEvent) {
-    values.relation_products = formatRelationProducts(state);
-  }
-
   // 服务
   values.bookings = formatBookings(state, values);
 
@@ -589,6 +607,9 @@ export var formatValues = function formatValues(state) {
     // is_bundle_price_calculated 用于区分商品的price是总价，还是商品的单价
     // values.is_bundle_price_calculated = 1
   }
+  if (!((_values3 = values) !== null && _values3 !== void 0 && (_values3 = _values3.bookings) !== null && _values3 !== void 0 && _values3.length)) {
+    values.type = 'virtual';
+  }
   return values;
 };
 
@@ -596,7 +617,8 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
-    return !item._extend.holder_id;
+    // 普通商品不需要检测holder
+    return !item._extend.holder_id && !isNormalProductByDurationSchedule(item);
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {

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

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import TabProduct from "../../../components/TabProduct";
 import AddButton from "../../../components/addButton";
 import Drawer from "../../../components/drawer";
-import { formatProductListByCategory, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, isSessionProduct, request } from "../../../utils";
 import DateRange from "../../dateRange";
 import { Context } from "../../model";
 import { appointmentTypes, inputDateCol } from "../../service2/status";
@@ -310,7 +310,7 @@ var Info = function Info(props) {
   var handleSelectProduct = useMemoizedFn(function (item, type) {
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
+    var isEject = getIsEject(item, type);
 
     // 跨日预约开启单规格 组合规格 套餐
     if (isDay) {

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

@@ -55,6 +55,9 @@ export declare const handleChangeHolder: (products: any[], currentItem: any, oth
 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:
@@ -241,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -523,6 +523,22 @@ export var getIsSubjectRequire = function getIsSubjectRequire(state) {
   var _state$bookingConfig2, _state$bookingConfig3;
   return (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.type) === 'form' && (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.subject_require) === 'require';
 };
+
+// 非预约商品 通过时长和日程判断是否是普通商品
+export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
+  var _item$schedules, _item$scheduleIds;
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !((_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+};
+
+// 是否全部是普通商品
+export var isAllNormalProduct = function isAllNormalProduct(items) {
+  return items.every(function (item) {
+    return isNormalProductByDurationSchedule(item);
+  });
+};
+export var isAllNormalProductByState = function isAllNormalProductByState(state) {
+  return isAllNormalProduct(state.service.value);
+};
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
   var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8;
   var pet = state.pet,
@@ -582,12 +598,14 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
       lists: mapListItems(resource)
     }];
   }
+  var isNormalProduct = isNormalProductByDurationSchedule(item);
   return _objectSpread({
     format: ['HH:mm', 'HH:mm'],
     show_time: true,
     duration_type: 'minutes',
     // 当前可选择holder列表
     holders: formatHolders(holders),
+    isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
@@ -595,8 +613,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
-    start_date: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate,
-    end_date: (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date)
+    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : ""
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -634,6 +652,7 @@ export var formatProducts = function formatProducts(lists, state) {
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    console.log(isNormalProduct, 'isNormalProduct');
     return _objectSpread(_objectSpread({
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

@@ -30,9 +30,10 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
   var _state$client2, _state$service2, _state$service4, _state$service5;
@@ -241,7 +242,7 @@ var Info = function Info(props) {
     var _state$client3;
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
+    var isEject = getIsEject(item, type);
     var lock = false;
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -249,10 +250,11 @@ var Info = function Info(props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: isNormalProductByDurationSchedule(item)
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession,
@@ -278,13 +280,14 @@ var Info = function Info(props) {
           _key: e.key,
           _extend: {
             start_date: state.date.value,
-            quantity: 1,
+            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);
         var _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;

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

@@ -34,9 +34,10 @@ import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
+import { isNormalProductByDurationSchedule } from "../../../info/service2/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;
+  var _state$service3, _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _state$service8, _window$BaseMaterials, _state$service$cacheI6, _state$service9, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -49,6 +50,10 @@ var Info = function Info(_, ref) {
     dispatch = _useContext.dispatch;
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
+  var isNormalProduct = useMemo(function () {
+    var _state$service, _state$service2;
+    return (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.cacheItem) && isNormalProductByDurationSchedule(state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.cacheItem);
+  }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.cacheItem]);
 
   // 当前商品信息+ 表单信息
   var getCurrentCacheItem = function getCurrentCacheItem(_cacheItem) {
@@ -205,7 +210,7 @@ var Info = function Info(_, ref) {
   var onFinish = function onFinish(values) {
     var _resourcesRef$current;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
-    if (!isSuccess) {
+    if (isShowTimeAndResource && !isSuccess) {
       return;
     }
     // 防止多次提交, 增加锁
@@ -371,16 +376,16 @@ var Info = function Info(_, ref) {
     getDiscount();
   }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
   var isDiscount = useMemo(function () {
-    var _state$service, _state$service2;
-    if (!((_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
+    var _state$service4, _state$service5;
+    if (!((_state$service4 = state.service) !== null && _state$service4 !== void 0 && _state$service4.cacheItem)) {
       return false;
     }
-    return useTotal != ((_state$service2 = state.service) === null || _state$service2 === void 0 || (_state$service2 = _state$service2.cacheItem) === null || _state$service2 === void 0 ? void 0 : _state$service2._extend.origin_total);
-  }, [useTotal, (_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.cacheItem) === null || _state$service3 === void 0 ? void 0 : _state$service3._extend.origin_total]);
+    return useTotal != ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 ? void 0 : _state$service5._extend.origin_total);
+  }, [useTotal, (_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6._extend.origin_total]);
   var bundles = useMemo(function () {
-    var _state$service4;
-    return ((_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.cacheItem) === null || _state$service4 === void 0 || (_state$service4 = _state$service4._extend) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.other) === null || _state$service4 === void 0 ? void 0 : _state$service4.bundle) || [];
-  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle]);
+    var _state$service7;
+    return ((_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 || (_state$service7 = _state$service7.other) === null || _state$service7 === void 0 ? void 0 : _state$service7.bundle) || [];
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.other) === null || _state$service8 === void 0 ? void 0 : _state$service8.bundle]);
 
   /**
    * @title: 编辑商品
@@ -415,14 +420,17 @@ var Info = function Info(_, ref) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: isNormalProductByDurationSchedule(item)
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
-        value: _objectSpread(_objectSpread({}, item._extend.other), sessionValue)
+        value: _objectSpread(_objectSpread({
+          quantity: item._extend.quantity
+        }, item._extend.other), sessionValue)
       },
       callback: function callback(e, extension_type, detail) {
         var _cacheItem$_extend;
@@ -436,6 +444,7 @@ var Info = function Info(_, ref) {
           _id: item === null || item === void 0 ? void 0 : item._id,
           _key: e.key,
           _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1,
             // 覆盖选择的规格和套餐
             other: other
           }),
@@ -477,7 +486,8 @@ var Info = function Info(_, ref) {
         // 更新表单内的商品价格
         form.setFieldsValue({
           total: _total,
-          capacity: (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.capacity
+          capacity: (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.capacity,
+          quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1
         });
       }
     });
@@ -515,7 +525,13 @@ var Info = function Info(_, ref) {
   var handleTotalChange = function handleTotalChange(number) {
     isChangeTotal.current = true;
   };
-  console.log('state.service.value', state.service.value);
+  var isShowTimeAndResource = useMemo(function () {
+    // 非活动预约 非普通商品时展示
+    if (state.renderType !== 'eventBooking' && !isNormalProduct) {
+      return true;
+    }
+    return false;
+  }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
@@ -556,7 +572,7 @@ var Info = function Info(_, ref) {
     className: "current-service-info-name-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     className: "current-service-info-name"
-  }, ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 || (_state$service6 = _state$service6._extend) === null || _state$service6 === void 0 ? void 0 : _state$service6.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+  }, ((_state$service9 = state.service) === null || _state$service9 === void 0 || (_state$service9 = _state$service9.cacheItem) === null || _state$service9 === void 0 || (_state$service9 = _state$service9._extend) === null || _state$service9 === void 0 ? void 0 : _state$service9.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
     onClick: handleEdit
   }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
     onClick: handleChange
@@ -595,7 +611,7 @@ var Info = function Info(_, ref) {
     name: "discount_reason"
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     size: "large"
-  }))) : null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, {
+  }))) : null, isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText('pisell2.text.start_time'),
@@ -644,7 +660,29 @@ var Info = function Info(_, ref) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     hidden: true,
     name: "quantity"
-  }, /*#__PURE__*/React.createElement(InputNumber, null))))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(InputNumber, null))), isNormalProduct && /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.quantity'),
+    name: "quantity",
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    size: "large",
+    style: {
+      width: '100%'
+    },
+    min: 1,
+    max: 999999,
+    formatter: function formatter(value) {
+      if (value !== undefined) {
+        // 向下取整
+        return Math.floor(value);
+      }
+      return value;
+    }
+  }))))), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-body-edit-footer"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-delete-wrap",

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

@@ -141,6 +141,7 @@ export declare const deleteCacheParams: () => void;
  */
 export declare const getDays: (cacheItem: any, type: 'minutes' | 'days') => any;
 export declare const isSessionProduct: (cacheItem: any) => boolean;
+export declare const getIsEject: (item: any, type: 'select' | 'detail') => boolean;
 /**
  * @title: 创建一个服务商品
  * @description:

package/es/components/booking/utils.js

@@ -635,6 +635,11 @@ export var getDays = function getDays(cacheItem, type) {
 export var isSessionProduct = function isSessionProduct(cacheItem) {
   return ['session_product', 'session_ticket'].includes(cacheItem.extension_type);
 };
+export var getIsEject = function getIsEject(item, type) {
+  var isSession = isSessionProduct(item);
+  // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+  return type === 'detail' || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0 || isSession;
+};
 
 /**
  * @title: 创建一个服务商品