@pisell/private-materials 6.6.59 → 6.6.60

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

@@ -519,7 +519,8 @@ var processItemsTax = function processItemsTax(items, state, options) {
   }
   return {
     originTax: expectedOriginTax,
-    tax: expectedTax
+    tax: expectedTax,
+    taxDecimal: preciseTax
   };
 };
 
@@ -651,7 +652,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
 
     // 处理附加商品
@@ -662,7 +663,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {

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

@@ -108,6 +108,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var _d$metadata;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -135,7 +136,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: d._id,
+        custom_product_bundle_map_id: (d === null || d === void 0 || (_d$metadata = d.metadata) === null || _d$metadata === void 0 ? void 0 : _d$metadata.custom_product_bundle_map_id) || d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -477,7 +478,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item, quantity) {
+var formatProducts = function formatProducts(item, quantity, options) {
   var _item$_extend36, _getMainProductSellin, _item$_extend37, _item$_extend38, _item$_extend39, _item$_extend40;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
@@ -492,6 +493,9 @@ var formatProducts = function formatProducts(item, quantity) {
     d.metadata = _objectSpread(_objectSpread({}, d.metadata), {}, {
       unique_identification_number: "".concat(item._extend.unique_identification_number, "_").concat(d.discount.resource_id)
     });
+    if (options !== null && options !== void 0 && options.isServiceEdit && options !== null && options !== void 0 && options.isMultiDay) {
+      delete d.id;
+    }
   });
 
   // 非手动折扣
@@ -714,7 +718,10 @@ var formatBookings = function formatBookings(data, values) {
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
-      product: formatProducts(item),
+      product: formatProducts(item, undefined, {
+        isServiceEdit: data.service.edit,
+        isMultiDay: isMultiDay
+      }),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -128,7 +128,7 @@ var VoucherCard = function VoucherCard(props) {
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
       var _value$_extend, _value$_extend2, _value$_extend3;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,

package/es/components/booking/dashboard/index.d.ts

@@ -5,11 +5,6 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
     valueColor?: string;
     otherParams?: Record<string, any>;
     refreshKey?: string;
-    /**
-     * 组件是否可见。为 false 时会暂停内部的定时刷新 interval，避免后台无意义地拉数据。
-     * 默认 true，保持原有行为向后兼容。
-     */
-    isVisible?: boolean;
     onDataChange?: (data: {
         groupsOnSiteNow: string | number;
         peopleOnSiteNow: string | number;

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

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["otherParams", "backgroundColors", "labelColor", "valueColor", "refreshKey", "isVisible", "onDataChange"];
+var _excluded = ["otherParams", "backgroundColors", "labelColor", "valueColor", "refreshKey", "onDataChange"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -51,8 +51,6 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     labelColor = props.labelColor,
     valueColor = props.valueColor,
     refreshKey = props.refreshKey,
-    _props$isVisible = props.isVisible,
-    isVisible = _props$isVisible === void 0 ? true : _props$isVisible,
     onDataChange = props.onDataChange,
     others = _objectWithoutProperties(props, _excluded);
   var context = useEngineContext();
@@ -171,7 +169,7 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   var calcBookingDataCount = function calcBookingDataCount() {
-    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2, _statisticData$comple, _statisticData$comple2;
+    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2;
     // 当前在场团体
     var groupsOnSiteNow = statisticData.groups_today_num || 0;
     // 当前在场人数
@@ -191,9 +189,9 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     // 超时的游客
     var overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : '-');
     // 已完成的游客
-    var completed = ((_statisticData$comple = statisticData.completed_visitors) === null || _statisticData$comple === void 0 ? void 0 : _statisticData$comple.num) || 0;
+    var completed = statisticData.completed_visitors.num || 0;
     // 已完成的游客二级数据
-    var completedChildren = ((_statisticData$comple2 = statisticData.completed_visitors) === null || _statisticData$comple2 === void 0 ? void 0 : _statisticData$comple2.statistics) || [];
+    var completedChildren = statisticData.completed_visitors.statistics || [];
     // 已离场的游客
     var departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : '-');
     onDataChange === null || onDataChange === void 0 || onDataChange({
@@ -261,8 +259,6 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     }]);
   };
   useEffect(function () {
-    // 不可见时不拉数据、不启动 interval，避免后台浪费内存和请求
-    if (!isVisible) return;
     getData();
 
     // 每分钟更新一次数据
@@ -272,10 +268,11 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     return function () {
       clearInterval(timer);
     };
-  }, [JSON.stringify(otherParams), refreshKey, isVisible]);
+  }, [JSON.stringify(otherParams), refreshKey]);
   useImperativeHandle(ref, function () {
     return {
       refresh: function refresh() {
+        debugger;
         getData();
       }
     };

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

@@ -7,9 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
-import { setProductPrice } from "../../../info2/service/editService/utils";
 import { genServiceKey } from "../../../../ticketBooking/utils";
-import Decimal from "decimal.js";
 
 // 创建group
 
@@ -123,34 +121,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     // 折扣金额 转成负数
     var discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
-      if (groupOriginTotalPrice !== 0) {
-        bookings = distributeDiscountOrIncrease(bookings, discountAmount, groupOriginTotalPrice);
-        bookings = bookings.map(function (booking) {
-          var _booking$_extend, _booking$_extend2;
-          return setProductPrice(booking, {
-            newTotal: booking === null || booking === void 0 || (_booking$_extend = booking._extend) === null || _booking$_extend === void 0 ? void 0 : _booking$_extend.total,
-            origin_total: booking === null || booking === void 0 || (_booking$_extend2 = booking._extend) === null || _booking$_extend2 === void 0 ? void 0 : _booking$_extend2.origin_total
-          });
-        });
-      } else {
-        // 原价为 0 无法按比例分摊（会除零），按 booking 数量均摊手动改价后的 groupTotalPrice
-        // 最后一个 booking 吸收两位小数的精度误差，确保总和等于 groupTotalPrice
-        var count = bookings.length;
-        var avgTotal = new Decimal(groupTotalPrice).div(count).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-        var assignedSum = new Decimal(0);
-        bookings = bookings.map(function (booking, i) {
-          var newTotal = i === count - 1 ? new Decimal(groupTotalPrice).sub(assignedSum).toNumber() : avgTotal.toNumber();
-          if (i !== count - 1) {
-            assignedSum = assignedSum.add(avgTotal);
-          }
-          return _objectSpread(_objectSpread({}, booking), {}, {
-            _extend: _objectSpread(_objectSpread({}, booking._extend), {}, {
-              total: newTotal,
-              price: newTotal
-            })
-          });
-        });
-      }
+      bookings = distributeDiscountOrIncrease(bookings, discountAmount, groupOriginTotalPrice);
     }
   }
   console.log('bookings', bookings);

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

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
-import { formatAmount, getUniqueId, locales } from '@pisell/utils';
+import { formatAmount, getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundles, setProductPrice, mergeBundleWithOriginalPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -51,6 +51,7 @@ import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/ser
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
@@ -71,6 +72,7 @@ var Info = function Info(_, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     discountChangeModalOpen = _useState2[0],
     setDiscountChangeModalOpen = _useState2[1];
+  var context = useEngineContext();
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -663,13 +665,19 @@ var Info = function Info(_, ref) {
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
     var sessionValue = {};
+    var oldSession = {};
     if (isSession) {
-      var _item$_extend7, _item$_extend8, _item$_extend9;
+      var _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend12;
       sessionValue.startEndTime = {
         startDate: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date,
         endDate: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date,
         duration: item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.duration
       };
+      oldSession = {
+        start_date: dayjs(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.start_date).format('YYYY-MM-DD'),
+        end_date: dayjs(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.end_date).format('YYYY-MM-DD'),
+        duration: item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.duration
+      };
     }
 
     // 打开商品详情弹窗
@@ -687,7 +695,9 @@ var Info = function Info(_, ref) {
         },
         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(_objectSpread({}, item._extend.other), sessionValue), {}, {
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), {}, {
+          bundle: mergeBundles(item._extend.other)
+        }, sessionValue), {}, {
           quantity: values.quantity || item._extend.quantity
         })
       },
@@ -700,8 +710,8 @@ var Info = function Info(_, ref) {
 
         // 手动折扣时 合并 bundle price，优先使用编辑前的价格
         if (item.discount_amount) {
-          var _item$_extend10;
-          other = mergeBundleWithOriginalPrice(other, ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.other) || {});
+          var _item$_extend13;
+          other = mergeBundleWithOriginalPrice(other, ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other) || {});
         }
         other.session = e.session;
 
@@ -736,6 +746,37 @@ var Info = function Info(_, ref) {
           });
         } catch (err) {}
         var sessionDetail = editSessionProduct(cacheItem, e.session);
+        try {
+          var _e$session, _e$session2, _e$session3, _e$session4, _e$session5, _context$appHelper, _context$appHelper$ge;
+          sendWarningLog({
+            title: '修改商品数据',
+            content: [{
+              key: 'productId',
+              value: item.id
+            }, {
+              key: "isSession",
+              value: isSession
+            }, {
+              key: 'oldSession',
+              value: JSON.stringify(oldSession)
+            }, {
+              key: 'sessionValue',
+              value: JSON.stringify({
+                startTime: (_e$session = e.session) === null || _e$session === void 0 ? void 0 : _e$session.start_time,
+                endTime: (_e$session2 = e.session) === null || _e$session2 === void 0 ? void 0 : _e$session2.end_time,
+                startDate: dayjs((_e$session3 = e.session) === null || _e$session3 === void 0 ? void 0 : _e$session3.start_at).format('YYYY-MM-DD'),
+                endDate: dayjs((_e$session4 = e.session) === null || _e$session4 === void 0 ? void 0 : _e$session4.end_at).format('YYYY-MM-DD'),
+                duration: (_e$session5 = e.session) === null || _e$session5 === void 0 ? void 0 : _e$session5.duration
+              })
+            }, {
+              key: '日期',
+              value: dayjs().format('YYYY-MM-DD HH:mm')
+            }, {
+              key: '店铺id',
+              value: (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.store) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getState) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.call(_context$appHelper)) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.global) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.globalConfig) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.id
+            }]
+          });
+        } catch (err) {}
         if (sessionDetail) {
           setTimeout(function () {
             form.setFieldsValue({
@@ -1223,6 +1264,8 @@ var Info = function Info(_, ref) {
     var _cacheItem$_extend$ot, _cacheItem$_extend$ot2;
     delete cacheItem.discount_list;
     (_cacheItem$_extend$ot = cacheItem._extend.other) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot = _cacheItem$_extend$ot.bundle) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot2 = _cacheItem$_extend$ot.forEach) === null || _cacheItem$_extend$ot2 === void 0 || _cacheItem$_extend$ot2.call(_cacheItem$_extend$ot, function (bundle) {
+      var _bundle$metadata;
+      bundle === null || bundle === void 0 || (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 || delete _bundle$metadata.custom_product_bundle_map_id;
       bundle === null || bundle === void 0 || delete bundle.discount_list;
       bundle === null || bundle === void 0 || delete bundle.booking_id;
       bundle === null || bundle === void 0 || delete bundle.bundle_selling_price;

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

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -149,6 +149,22 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
 };
+export var mergeBundles = function mergeBundles(other) {
+  var bundle = (other === null || other === void 0 ? void 0 : other.bundle) || [];
+  var newBundle = [];
+  bundle.forEach(function (item) {
+    var newItem = newBundle.find(function (newItem) {
+      return newItem.id === item.id;
+    });
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push(_objectSpread({}, item));
+    }
+  });
+  return newBundle;
+};
 
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值

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

@@ -189,7 +189,7 @@ var Payments = Provider(function (props) {
         className: "payment-list-item-surcharge"
       }, "(", locales.getText("pisell2.text.surcharge"), " ", formatAmount(item.service_fee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), ")") : null, /*#__PURE__*/React.createElement("div", {
         className: "payment-list-item-date"
-      }, dayjs(item.payment_time).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
+      }, dayjs(item.payment_time || item.created_at).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
         className: "payment-list-item-platform-type"
       }, item.platform && locales.getText("pisell2.text.platform.type")(item.platform))))))));
     }

package/es/components/checkout/hooks/useWalletPass.js

@@ -29,8 +29,6 @@ import usePaymentLogger from "./usePaymentLogger";
 import { isWalkIn } from "../../booking/utils";
 import { useActiveExecute } from "../../ticketBooking/hooks/pisellos";
 import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useShopDiscountModule";
-import { useOsKey } from "../../ticketBooking/context";
-import { getShopDiscountKey } from "../../ticketBooking/utils";
 
 /**
  * 自定义Hook：使用WalletPass功能
@@ -42,10 +40,6 @@ export var useWalletPass = function useWalletPass(props) {
   var logger = usePaymentLogger();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
-  var osKey = useOsKey();
-
-  // 根据 osKey 生成模块名称
-  var moduleKey = getShopDiscountKey(osKey || 'ticket');
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -679,7 +673,7 @@ export var useWalletPass = function useWalletPass(props) {
       // 保持初始顺序设置折扣列表
       var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
       setDiscountList(sortedDiscountList);
-      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.emit("".concat(moduleKey, ":onSelectedDiscountListChange"), detail);
+      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.emit('shopDiscount:onSelectedDiscountListChange', detail);
       return;
     }
     setWalletSelect([]);
@@ -779,25 +773,23 @@ export var useWalletPass = function useWalletPass(props) {
     }
   });
   var handleSelectDiscount = useMemoizedFn(function (value, option) {
+    var _detail$discountList, _pisellos$effects2;
     setLoading(true);
-    try {
-      var _pisellos$effects2;
-      var isSelected = value.includes(option.id);
-      var detail = shopDiscount.setDiscountSelected({
-        discountId: option.id,
-        isSelected: isSelected
-      });
-
-      // 保持初始顺序设置折扣列表
-      var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
-      setDiscountList(sortedDiscountList);
-      pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.emit("".concat(moduleKey, ":onSelectedDiscountListChange"), detail);
-    } catch (err) {
-      console.log(err, '1234err');
-    } finally {
-      // 商品券选择流程结束后统一回收loading，避免出现转圈不停止
+    var isSelected = value.includes(option.id);
+    var detail = shopDiscount.setDiscountSelected({
+      discountId: option.id,
+      isSelected: isSelected
+    });
+    if (!(detail !== null && detail !== void 0 && (_detail$discountList = detail.discountList) !== null && _detail$discountList !== void 0 && (_detail$discountList = _detail$discountList.find(function (item) {
+      return item.id === option.id;
+    })) !== null && _detail$discountList !== void 0 && _detail$discountList.isSelected)) {
       setLoading(false);
     }
+
+    // 保持初始顺序设置折扣列表
+    var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
+    setDiscountList(sortedDiscountList);
+    pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.emit('shopDiscount:onSelectedDiscountListChange', detail);
   });
 
   // 清空不可用钱包数据

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

@@ -122,6 +122,7 @@ var AddSerivce = function AddSerivce(props) {
     var handler = function handler(event) {
       var _event$detail;
       var cacheItem = event === null || event === void 0 || (_event$detail = event.detail) === null || _event$detail === void 0 ? void 0 : _event$detail.cacheItem;
+      console.log('Modal closed with result:', event.detail.cacheItem);
       if (!(cacheItem !== null && cacheItem !== void 0 && cacheItem.id)) return;
       addServiceScroll(String(cacheItem.id), cacheItem);
     };

package/es/components/ticketBooking/components/bookingDataPanel/bookingDashboard/index.d.ts

@@ -2,8 +2,6 @@ import React from 'react';
 import './index.less';
 interface BookingDashboardProps {
     bookingTimeStartBetween: string[];
-    /** 组件是否可见，不可见时内部会暂停 interval，默认 true */
-    isVisible?: boolean;
 }
 declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
 export default BookingDashboard;

package/es/components/ticketBooking/components/bookingDataPanel/bookingDashboard/index.js

@@ -4,9 +4,7 @@ import { useImperativeHandle } from 'react';
 import BookingDashboardComponent from "../../../../booking/dashboard";
 import "./index.less";
 var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
-  var bookingTimeStartBetween = props.bookingTimeStartBetween,
-    _props$isVisible = props.isVisible,
-    isVisible = _props$isVisible === void 0 ? true : _props$isVisible;
+  var bookingTimeStartBetween = props.bookingTimeStartBetween;
   var bookingDashboardRef = useRef(null);
   var cptProps = useMemo(function () {
     return {
@@ -16,10 +14,9 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
       otherParams: {
         booking_time_start_between: bookingTimeStartBetween
       },
-      isVisible: isVisible,
       backgroundColors: ['rgba(224, 79, 22, 0.20)', 'rgba(217, 45, 32, 0.14)', 'rgba(127, 86, 217, 0.22)', 'rgba(7, 148, 85, 0.20)', 'rgba(21, 112, 239, 0.23)', 'rgba(202, 133, 4, 0.20)', 'var(--Gray-800, #1D2939)', 'var(--Gray-true-800, #292929)']
     };
-  }, [bookingTimeStartBetween, isVisible]);
+  }, [bookingTimeStartBetween]);
   useImperativeHandle(ref, function () {
     return {
       refresh: function refresh() {

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

@@ -4,8 +4,6 @@ interface BookingDataPanelProps {
     currentDate: string;
     onBookingClick: (booking: any) => void;
     bookingId?: number;
-    /** 面板是否可见，透传给内部 Dashboard 控制 interval 是否启动 */
-    isVisible?: boolean;
 }
 declare const BookingDataPanel: React.ForwardRefExoticComponent<BookingDataPanelProps & React.RefAttributes<unknown>>;
 export default BookingDataPanel;

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

@@ -9,9 +9,7 @@ import "./index.less";
 var BookingDataPanel = /*#__PURE__*/forwardRef(function (props, ref) {
   var currentDate = props.currentDate,
     onBookingClick = props.onBookingClick,
-    bookingId = props.bookingId,
-    _props$isVisible = props.isVisible,
-    isVisible = _props$isVisible === void 0 ? true : _props$isVisible;
+    bookingId = props.bookingId;
   var Toast = useToast();
   var bookingListRef = useRef(null);
   var bookingDashboardRef = useRef(null);
@@ -24,7 +22,6 @@ var BookingDataPanel = /*#__PURE__*/forwardRef(function (props, ref) {
       key: 'data-board',
       children: /*#__PURE__*/React.createElement(BookingDashboard, {
         bookingTimeStartBetween: bookingTimeStartBetween,
-        isVisible: isVisible,
         ref: bookingDashboardRef
       })
     }, {
@@ -37,7 +34,7 @@ var BookingDataPanel = /*#__PURE__*/forwardRef(function (props, ref) {
         ref: bookingListRef
       })
     }];
-  }, [currentDate, bookingId, isVisible]);
+  }, [currentDate, bookingId]);
   useImperativeHandle(ref, function () {
     return {
       refresh: function refresh() {

package/es/components/ticketBooking/components/bookingDataPanel/pisellFloatingPanel/index.js

@@ -61,11 +61,10 @@ var PisellFloatingPanel = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   return /*#__PURE__*/React.createElement(PisellFloatingPanelComponent, _extends({}, floationgPanelProps, {
     open: isOpen
-  }), isOpen && /*#__PURE__*/React.createElement(BookingDataPanel, {
+  }), /*#__PURE__*/React.createElement(BookingDataPanel, {
     currentDate: currentDate,
     bookingId: bookingId,
     onBookingClick: onBookingClick,
-    isVisible: isOpen,
     ref: bookingDataPanelRef
   }));
 });