@pisell/private-materials 6.4.74 → 6.4.76

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -50,6 +50,12 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: string;
+    };
 };
 declare type Shop = {
     id: number;

package/es/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -11,7 +11,7 @@ var voucherTime = function voucherTime(data) {
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return (data || []).map(function (item) {
-    var _item$shop, _item$unified_message, _item$product;
+    var _item$shop, _item$unified_message, _item$product, _item$custom_schedule, _item$metadata;
     return {
       id: item.id,
       name: item.product_name,
@@ -30,7 +30,9 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
-      originData: item
+      originData: item,
+      scheduleList: ((_item$custom_schedule = item.custom_schedule_snapshot) === null || _item$custom_schedule === void 0 ? void 0 : _item$custom_schedule.data) || [],
+      validDateBySchedule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.validity_type) === 'custom_schedule_validity'
     };
   });
 };

package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/es/components/pay/toC/index.js

@@ -31,6 +31,7 @@ import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
+import { saleChannelMap } from "./status";
 import "./index.less";
 /**
  * @title: C端支付
@@ -142,11 +143,12 @@ var ToCPay = function ToCPay(props, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             sale_channel = (initProps === null || initProps === void 0 || (_initProps$order = initProps.order) === null || _initProps$order === void 0 ? void 0 : _initProps$order.sale_channel) || 'online-store';
-            _context.next = 3;
+            sale_channel = saleChannelMap[sale_channel] || sale_channel;
+            _context.next = 4;
             return getWalletNameAndPopupStatus({
               setting_type: "".concat(sale_channel, "-wallet-setting")
             });
-          case 3:
+          case 4:
             _yield$getWalletNameA = _context.sent;
             wallet = _yield$getWalletNameA.wallet;
             wallet_setting = _yield$getWalletNameA.wallet_setting;
@@ -164,7 +166,7 @@ var ToCPay = function ToCPay(props, ref) {
               type: 'setWalletSetting',
               payload: setting
             });
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/pay/toC/status.d.ts

@@ -10,3 +10,4 @@ export declare const paymentKeys: string[];
  * @Date: 2024-08-30 10:16:26
  */
 export declare const isTripartitePayment: (service: string) => boolean;
+export declare const saleChannelMap: Record<string, string>;

package/es/components/pay/toC/status.js

@@ -113,4 +113,7 @@ export var paymentKeys = Object.keys(paymentServices);
  */
 export var isTripartitePayment = function isTripartitePayment(service) {
   return tripartitePaymentKeys.includes(service);
+};
+export var saleChannelMap = {
+  'mobile_order': 'mobile-order'
 };

package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;

package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface CustomerListProps {
     value: any;

package/es/components/productExtension/fields/Actor/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Actor: ({ name }: {
     name: string;
 }) => JSX.Element;

package/es/components/productExtension/fields/Forms/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/es/components/productExtension/fields/SelectProducts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface valueType {
 }

package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => JSX.Element;
 export default SelectResourcesTable;

package/es/components/ruleSetting/ruleBorder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/es/components/schedules/calendar/calendarItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;

package/es/components/schedules/calendar/index.d.ts

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

package/es/components/schedules/components/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/es/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/es/components/schedules/components/ScheduleList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

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

package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts

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

package/es/components/schedules/products/ProductDetailDrawer/index.d.ts

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

package/es/components/schedules/products/index.d.ts

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

package/es/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/es/components/schedules/products/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/es/components/schedules/resources/index.d.ts

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

package/es/components/schedules/resources/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/es/components/schedules/resources/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

package/es/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

package/es/components/schedules/schedules/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SchedulesConnect: () => JSX.Element;
 export default SchedulesConnect;

package/es/components/shoppingCart/components/Empty/index.d.ts

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

package/es/components/shoppingCart/components/Render/index.d.ts

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

package/es/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/es/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element | null;
 export default useClearCart;

package/es/components/shoppingCart/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -21,7 +21,7 @@ import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, getMainPrice } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
@@ -288,12 +288,12 @@ var AddSerivce = function AddSerivce(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
               });
+              cacheItem._extend.price = getMainPrice(_detail, _detail.price);
               _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
               cacheItem._extend.total = _total;
               // 用于储存原价
@@ -384,7 +384,7 @@ var AddSerivce = function AddSerivce(props) {
                 });
                 onEdit === null || onEdit === void 0 || onEdit(cacheItem);
               }
-            case 24:
+            case 25:
             case "end":
               return _context.stop();
           }

package/es/components/ticketBooking/utils/index.d.ts

@@ -73,6 +73,9 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
+        startDate: any;
+        bundle: any;
+        options: any;
     };
     setProduct(product: Record<string, any>, values: {
         total: number;

package/es/components/ticketBooking/utils/index.js

@@ -2,10 +2,14 @@ var _excluded = ["detail"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-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; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+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; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -146,21 +150,30 @@ export var addService = function addService(list, addItem, state) {
     // 是否设置过 只追加到第一个中
     var isSetCount = false;
     value = list.map(function (item) {
+      var _item$_extend;
       // 是否商品券折扣的商品
       var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
         return item.type === 'good_pass';
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
-        var _item$_extend, _addItem$_extend, _item$_extend2;
+      // 子商品是否有商品券折扣的商品
+      var bundleDiscountList = [];
+      ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
+        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+      });
+      var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
+        return item.type === 'good_pass';
+      });
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
+        var _item$_extend2, _addItem$_extend, _item$_extend3;
         isNotSame = false;
-        var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
+        var quantity = ((item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
         count = quantity;
         isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             quantity: quantity,
-            other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
+            other: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), {}, {
               quantity: quantity
             })
           })
@@ -237,11 +250,11 @@ export var getIsShowNumber = function getIsShowNumber(item, state) {
 
 // 生成服务key
 export var genServiceKey = function genServiceKey(item) {
-  var _item$_extend3, _item$_extend4, _item$_extend5;
+  var _item$_extend4, _item$_extend5, _item$_extend6;
   var product_id = item.product_id;
-  var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
-  var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
-  var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
+  var durationKey = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration;
+  var start_time = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.start_time;
+  var total = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.total;
   var resourceKey = '';
   Object.values(item._extend.resource || []).forEach(function (resources) {
     resources.forEach(function (resource) {
@@ -346,17 +359,21 @@ export var getShopDiscountKey = function getShopDiscountKey(osKey) {
 export var rulesHooks = {
   // 获取商品关键信息
   getProduct: function getProduct(product) {
+    var _product$_extend, _product$_extend2, _product$_extend3;
     var detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product.price,
+      price: product._extend.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable
+      vouchersApplicable: product.vouchersApplicable,
+      startDate: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.startDate,
+      bundle: ((_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 || (_product$_extend2 = _product$_extend2.other) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.bundle) || [],
+      options: ((_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 || (_product$_extend3 = _product$_extend3.other) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.option) || []
     };
     return detail;
   },
@@ -364,8 +381,14 @@ export var rulesHooks = {
     var detail = _objectSpread(_objectSpread({}, product), {}, {
       _id: values._id || product._id,
       discount_list: values.discount_list,
-      _extend: _objectSpread(_objectSpread(_objectSpread({}, product._extend), 'total' in values ? {
+      _extend: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, product._extend), {}, {
+        other: _objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
+          bundle: values.bundle
+        } : {})
+      }, 'total' in values ? {
         total: values.total
+      } : {}), 'main_product_selling_price' in values ? {
+        main_product_selling_price: values.main_product_selling_price
       } : {}), 'quantity' in values ? {
         quantity: values.quantity
       } : {})

package/es/components/wallet/Detail/index.js

@@ -22,6 +22,7 @@ import localeTexts from "./locales";
 import { getAssetList, getDetailApi } from "./serve";
 import { request } from "./../../../utils";
 import { WalletBar, FooterButtons, UsageRules } from "../components";
+import { formatScheduleText } from "../utils";
 import "./index.less";
 var Text = Typography.Text;
 
@@ -54,7 +55,9 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     _detail$expire_date = detail.expire_date,
     expire_date = _detail$expire_date === void 0 ? '' : _detail$expire_date,
     _detail$product = detail.product,
-    product = _detail$product === void 0 ? {} : _detail$product;
+    product = _detail$product === void 0 ? {} : _detail$product,
+    custom_schedule_snapshot = detail.custom_schedule_snapshot;
+  console.log(detail, 'detail22');
   var _ref = product || {},
     _ref$description = _ref.description,
     description = _ref$description === void 0 ? '' : _ref$description,
@@ -298,7 +301,36 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       onGoogleClick();
     }
   };
+  var scheduleList = useMemo(function () {
+    return (custom_schedule_snapshot === null || custom_schedule_snapshot === void 0 ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   useEffect(function () {
+    var detail = formatScheduleText(scheduleList, 'zh-CN');
+    var expireText = expire_date ? expire_date : locales.getText('page.wallet.expireDate');
+    if (scheduleList.length > 0) {
+      // 换行展示
+      var validityTexts = "";
+      var excludedText = "";
+      var includedText = "";
+      detail.forEach(function (item) {
+        if (item.validityTexts.length > 0) {
+          validityTexts = "".concat(validityTexts).concat(item.validityTexts.join('\n'), "\n");
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = "".concat(excludedText).concat(item.excluded_date.join('\n'), "\n");
+        }
+        if (item.included_date.length > 0) {
+          includedText = "".concat(includedText).concat(item.included_date.join('\n'), "\n");
+        }
+      });
+      expireText = /*#__PURE__*/React.createElement("span", {
+        className: "wallet-detail-expire-text"
+      }, validityTexts, excludedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.notValidDate')), excludedText, includedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.includedDate')), includedText);
+    }
     var data = [{
       label: locales.getText('page.wallet.cardName'),
       value: product_title
@@ -308,7 +340,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       isLink: false
     }, {
       label: locales.getText('page.wallet.validDate'),
-      value: expire_date ? expire_date : locales.getText('page.wallet.expireDate')
+      value: expireText
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {

package/es/components/wallet/Detail/index.less

@@ -373,3 +373,14 @@
   font-weight: 500;
   line-height: 24px;
 }
+
+.wallet-detail-expire-text {
+  white-space: pre-wrap;
+}
+
+.wallet-detail-expire-text-title {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  color: #667085;
+}

package/es/components/wallet/Detail/locales.d.ts

@@ -21,6 +21,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -69,6 +71,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -117,6 +121,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;