@pisell/private-materials 6.4.83 → 6.4.84

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

@@ -1,5 +1,10 @@
 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 _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 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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../../../utils";
@@ -10,7 +15,12 @@ export var getAddTimeProducts = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().post("/shop/product/query", params, config);
+          return request.getRequest().post("/shop/product/query", params, _objectSpread(_objectSpread({}, config), {}, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          }));
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;

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

@@ -8,7 +8,12 @@ export var getProductDetail = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request.getRequest().get("/shop/product/query/".concat(id), params));
+          return _context.abrupt("return", request.getRequest().get("/shop/product/query/".concat(id), params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          }));
         case 1:
         case "end":
           return _context.stop();
@@ -35,7 +40,11 @@ export var postMultiDay = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           return _context2.abrupt("return", request.getRequest().post("/shop/product/multi-day/detail/".concat(id), params, {
-            useCache: true
+            useCache: true,
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
           }));
         case 1:
         case "end":
@@ -57,7 +66,12 @@ export var getProductPrice = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params));
+          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          }));
         case 1:
         case "end":
           return _context3.stop();

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

@@ -568,12 +568,17 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
   var parallelResourceOtherParams = {};
   var multiResources;
   if (isParallelResource) {
-    var hasDataItem = getProductExtend({
-      cacheItem: _objectSpread(_objectSpread({}, item), {}, {
-        new: 0
-      }),
-      state: state
-    });
+    var hasDataItem = item;
+
+    // 预约商品 没有_data时 使用getProductExtend生成数据
+    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
+      hasDataItem = getProductExtend({
+        cacheItem: _objectSpread(_objectSpread({}, item), {}, {
+          new: 0
+        }),
+        state: state
+      });
+    }
     var _ref9 = hasDataItem._data || {},
       resourceMaps = _ref9.resourceMaps,
       resources = _ref9.resources;
@@ -666,14 +671,21 @@ export var formatProducts = function formatProducts(lists, state) {
     var bundle = formatBundle(item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.bundle);
     // 是否是普通商品
     var isNormalProduct = !appointmentTypes.includes(item === null || item === void 0 ? void 0 : item.extension_type) || (state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking';
+    var isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     var resourceItem = {};
     var errorMessage = '';
-    if (_isDayBookingProduct || isGeneral) {
+    // 普通商品没有
+    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
       var _item$_extend13;
       resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+
+    // 普通商品没有
+    var generalParams = {};
+    if (isGeneral && !isNormalProductByDurationScheduleVal) {
+      generalParams = getGeneralParams(item, state, !!isParallelResource);
+    }
     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/info2/serve.js

@@ -15,7 +15,12 @@ export var getResourceList = /*#__PURE__*/function () {
         case 0:
           bookingId = _args.length > 1 && _args[1] !== undefined ? _args[1] : [];
           _context.next = 3;
-          return request.getRequest().get("/shop/schedule/resource/list", params);
+          return request.getRequest().get("/shop/schedule/resource/list", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          });
         case 3:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;

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

@@ -133,6 +133,8 @@ export var getTimeObj = function getTimeObj(_ref4) {
     durationProps: durationProps
   });
   var obj = sliceDayIntoFiveMinutes((_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 ? void 0 : _state$bookingConfig2.service_time, locales.locale);
+  // 80ms -> 0ms
+
   var timeSlices = _toConsumableArray(obj.timeSlices);
   var durationSlicesBasedOnTime = _toConsumableArray(obj.durationSlicesBasedOnTime);
 
@@ -532,6 +534,7 @@ export var getProductExtend = function getProductExtend(_ref11) {
   var cacheItem = _ref11.cacheItem,
     state = _ref11.state,
     isDisabledTime = _ref11.isDisabledTime;
+  console.time('console.time getProductExtend');
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -586,10 +589,6 @@ export var getProductExtend = function getProductExtend(_ref11) {
       resources: _cacheItem._data.resources
     });
 
-    // let currentResource = _cacheItem._resources.find(
-    //   (d: any) => d.form_record_id == cacheItem._extend.resource
-    // );
-
     // 再次计算, 灵活时长
     if (getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration)) {
       _cacheItem._data.timeObj = getTimeObj({
@@ -675,7 +674,8 @@ export var getProductExtend = function getProductExtend(_ref11) {
     });
     // }
   }
-  console.log('_cacheItem_cacheItem', _cacheItem);
+  console.timeEnd('console.time getProductExtend');
+  // 100ms -> 45ms
   return _cacheItem;
 };
 

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

@@ -2,6 +2,7 @@ import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'reac
 import { useMemoizedFn } from 'ahooks';
 import SkuDetailModal from "../../../../../pro/skuDetailModal";
 import { Context } from "../../../info/model";
+import { setProductPrice } from "../editService/utils";
 var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -33,6 +34,11 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
     var _ref2, _state$service2;
     var newProducts = (_ref2 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
       if (item._id == data._id) {
+        var _data$_extend, _data$_extend2;
+        data = setProductPrice(data, {
+          newTotal: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.total,
+          origin_total: (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.origin_total
+        });
         return data;
       }
       return item;

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

@@ -37,6 +37,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import { setProductPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 var submitLock = false;
@@ -240,7 +241,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _item2, _item$_extend2, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -277,7 +278,11 @@ var Info = function Info(_, ref) {
     _item._extend = _extend;
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
-    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
+    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
+    _item = setProductPrice(_item, {
+      newTotal: values.total,
+      origin_total: (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.origin_total
+    });
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
@@ -288,7 +293,12 @@ var Info = function Info(_, ref) {
     } else {
       // 手动改价时移除优惠券使用
       if (isChangeTotal.current) {
+        var _item$_extend3;
         delete _item.discount_list;
+        _item = setProductPrice(_item, {
+          newTotal: values.total,
+          origin_total: (_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.origin_total
+        });
       }
       _list = _list.map(function (d) {
         return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
@@ -483,11 +493,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend2, _item$_extend3, _item$_extend4;
+      var _item$_extend4, _item$_extend5, _item$_extend6;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
-        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
+        startDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.end_date,
+        duration: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.duration
       };
     }
 

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

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;

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

@@ -14,7 +14,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
+import { isArr } from "@pisell/utils";
 import { isBoolean } from "@pisell/utils";
+import Decimal from "decimal.js";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -52,4 +54,68 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
   } else {
     localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
   }
+};
+
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ * 
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ * 
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref2.newTotal,
+    origin_total = _ref2.origin_total;
+  // 计算折扣比例
+  var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
+
+  // 用于累加子商品总价c
+  var subTotal = new Decimal(0);
+
+  // 处理 bundle 子商品
+  if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
+    var _cacheItem$_extend$ot3;
+    (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
+      var _ref3, _bundle$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      bundle.price = newPrice;
+    });
+  }
+
+  // 处理 option 子商品
+  if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
+    var _cacheItem$_extend$ot6;
+    (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
+      var _ref4, _option$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      option.price = newPrice;
+    });
+  }
+
+  // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
+  cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
 };

package/es/components/booking/info2/utilsByBooking.js

@@ -10,6 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
+import { isNormalProductByDurationSchedule } from "../info/service2/utils";
 import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
 
 // 获取当前剩余量
@@ -331,7 +332,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
 
   // 获取上一个服务商品（过滤掉自定义商品）
   var lastServer = getLastServer((_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
-    return !item.isCustomItem;
+    return !item.isCustomItem && !isNormalProductByDurationSchedule(item);
   }));
 
   // 下一个商品的扩展参数
@@ -399,11 +400,14 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   _extend.endDate = endDate;
   var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
   if (isSessionProduct(cacheItem) && session) {
-    _extend.start_date = session.start_at;
-    _extend.startDate = session.start_at;
+    var startAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.start_at.format('HH:mm:ss')));
+    var endAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.end_at.format('HH:mm:ss')));
+    _extend.start_date = startAt;
+    _extend.startDate = startAt;
     _extend.start_time = session.start_time;
-    _extend.end_date = session.end_at;
-    _extend.endDate = session.end_at;
+    _extend.end_date = endAt;
+    _extend.endDate = endAt;
+    _extend.end_time = session.end_time;
     _extend.duration = getDays({
       _extend: _extend
     }, 'minutes');

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

@@ -1,4 +1,8 @@
 import dayjs from 'dayjs';
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -23,13 +27,8 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 时间切片
- * @description:
- * @param {any} config
- * @param {string} locale
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 13:59
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {

package/es/components/booking/utils.js

@@ -19,6 +19,31 @@ import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 import Decimal from "decimal.js";
+
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export function memoize(fn) {
+  // 使用 Map 存储缓存，支持任意类型的 key
+  var cache = new Map();
+  return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    // 将参数序列化为字符串作为缓存的 key
+    var key = JSON.stringify(args);
+
+    // 如果缓存中存在该 key，直接返回缓存的结果
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+
+    // 否则执行函数并缓存结果
+    var result = fn.apply(this, args);
+    cache.set(key, result);
+    return result;
+  };
+}
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -79,7 +104,7 @@ export var getDiscountTime = function getDiscountTime(service_times, isDay) {
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale, isDay) {
+var _sliceDayIntoFiveMinutes = function _sliceDayIntoFiveMinutes(config, locale, isDay) {
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
@@ -142,6 +167,12 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
   };
 };
 
+/**
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
+ */
+export var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
+
 //  获取当前时间
 export var getNowTime = function getNowTime() {
   return dayjs().format('HH:mm');
@@ -204,12 +235,15 @@ export var findNextSlice = function findNextSlice(_ref) {
   return timeSlices[index].value;
 };
 export var findNextDuration = function findNextDuration(current, array, defaultValue) {
+  if (defaultValue) {
+    return defaultValue;
+  }
   for (var i = 0; i < array.length; i++) {
     if (array[i].value == (current === null || current === void 0 ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return defaultValue || array[0].value;
+  return array[0].value;
 };
 export var formatProductListByCategory = function formatProductListByCategory(list, filterItem) {
   var _list = list || [];
@@ -600,7 +634,7 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
 // 获取最后一个服务商品
 export var getLastServer = function getLastServer(list) {
-  return list[list.length - 1];
+  return list === null || list === void 0 ? void 0 : list[0];
 };
 export var getCacheParams = function getCacheParams() {
   // 从缓存里读默认参数,  如果有 则需要默认选中某些参数,  添加完商品后则删除

package/es/components/checkout/PaymentModal.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useEffect, useCallback, useMemo, useImperativeHandle, forwardRef } from 'react';
 import Decimal from 'decimal.js';
-import { locales, webPrint } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
@@ -44,6 +44,7 @@ import { cloneDeep } from 'lodash';
 import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
+import usePrinter from "../../hooks/printer";
 import { DiscountKeyboard, PaymentKeyboard } from "../../pro/priceKeyboard";
 import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
@@ -163,6 +164,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     walletPassData = _useState20[0],
     setWalletPassData = _useState20[1];
+  var _usePrinter = usePrinter(),
+    nativePrint = _usePrinter.nativePrint;
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
     syncingLock = _useState22[0],
@@ -824,11 +827,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 data: {
                   order_id: responseData.order_id,
                   machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data
+                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
+                  machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
                 }
               };
               console.log('print_order_onOrderSynced_params>>>>', params);
-              webPrint(params, function (res) {
+              nativePrint(params, function (res) {
                 console.log('print_order_onOrderSynced_res>>>>', res);
               });
             } catch (error) {
@@ -1054,7 +1058,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               };
               try {
-                webPrint(params, function (res) {
+                nativePrint(params, function (res) {
                   console.log('handleButtonClick_print-receipt_res>>>>', res);
                   if (!(res !== null && res !== void 0 && res.result)) {
                     Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -1435,6 +1439,8 @@ var PaymentModal = function PaymentModal(_ref18) {
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
+  var _usePrinter2 = usePrinter(),
+    nativePrint = _usePrinter2.nativePrint;
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
@@ -2147,7 +2153,8 @@ var PaymentModal = function PaymentModal(_ref18) {
                             data: {
                               order_id: responseData.order_id,
                               machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
+                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
+                              machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
                             }
                           };
                           console.log('print_order_onOrderSynced_params>>>>', params);
@@ -2158,7 +2165,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                               params: params
                             }
                           });
-                          webPrint(params, function (res) {
+                          nativePrint(params, function (res) {
                             console.log('print_order_onOrderSynced_res>>>>', res);
                             logger === null || logger === void 0 || logger.addLog({
                               type: 'info',
@@ -2447,7 +2454,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   }
                 };
                 try {
-                  webPrint(params, function (res) {
+                  nativePrint(params, function (res) {
                     console.log('handleButtonClick_print-receipt_res>>>>', res);
                     if (!(res !== null && res !== void 0 && res.result)) {
                       Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');

package/es/components/checkout/components/AdditionalModule/index.js

@@ -108,6 +108,8 @@ function AdditionalModule(_ref) {
           } else {
             Toast.fail(locales.getText('pisell2.text.order-no-payment-cannot-send-link'));
           }
+        } else if (key === 'print-receipt') {
+          handleButtonClick('print-receipt');
         } else if (key === 'split-payment') {
           handleButtonClick('split-payment');
         } else if (key === 'print-receipt') {

package/es/components/checkout/components/AmountSummary/index.less

@@ -248,7 +248,6 @@
 
   .balance-due-label {
     font-size: 16px;
-    color: #7f56da;
     font-weight: 400;
     line-height: 1.5;
     margin-bottom: 4px;
@@ -256,7 +255,7 @@
 
   .balance-due-amount {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     color: #7f56da;
     line-height: 0.75;
     text-decoration: underline;
@@ -272,13 +271,13 @@
   .pay-text {
     font-size: 16px;
     font-weight: 500;
-    color: #7f56da;
     letter-spacing: 0.09375em;
+    margin-top: 12px;
   }
 
   .pay-amount {
-    font-size: 32px;
-    font-weight: 400;
+    font-size: 36px;
+    font-weight: 600;
     color: #1e1830;
     line-height: 0.75;
   }