@pisell/private-materials 6.9.2 → 6.9.3

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

@@ -1,16 +1,7 @@
 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", "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 _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 _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 _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); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -23,11 +14,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { PisellStatisticList } from '@pisell/materials';
-import { isArr, locales } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import useEngineContext from "../../../hooks/useEngineContext";
 import { request } from "../utils";
-import { getBookingList } from "./serve";
+import { getStatistic } from "./serve";
 import localeTexts from "../locales";
 import { getLocale } from "../../../utils/locales";
 var translationOriginal = function translationOriginal(text) {
@@ -36,14 +27,14 @@ var translationOriginal = function translationOriginal(text) {
 var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
   var map = {};
   data.forEach(function (item) {
-    var name = translationOriginal(item.name) || 'default';
+    var name = translationOriginal(item.label) || 'default';
     if (!map[name]) {
       map[name] = {
-        label: !item.id ? locales.getText('pisell2.booking.dashboard.default') : translationOriginal(item.name) || '',
+        label: !item.label ? locales.getText('pisell2.booking.dashboard.default') : item.label,
         value: 0
       };
     }
-    map[name].value = (map[name].value || 0) + (item.value || 0);
+    map[name].value = (map[name].value || 0) + (item.num || 0);
   });
   return Object.values(map).filter(function (item) {
     return !!item.value;
@@ -53,6 +44,7 @@ var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
 };
 locales.init(localeTexts, getLocale());
 var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _context$appHelper, _businessUtils$getApp;
   var _props$otherParams = props.otherParams,
     otherParams = _props$otherParams === void 0 ? {} : _props$otherParams,
     backgroundColors = props.backgroundColors,
@@ -64,6 +56,10 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   translationOriginal = context.appHelper.utils.translationOriginal;
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    businessUtils = _ref.businessUtils;
+  // 是否安装闸机应用
+  var hasTurnstileApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'turnstile'));
   var _useState = useState([
     // 当前在场团体
     {
@@ -116,96 +112,88 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
-  var _useState3 = useState([]),
+
+  // const [bookingData, setBookingData] = useState([]);
+  var _useState3 = useState({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    bookingData = _useState4[0],
-    setBookingData = _useState4[1];
+    statisticData = _useState4[0],
+    setStatisticData = _useState4[1];
   var getData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _otherParams$booking_;
+      var statisticsTime, statisticsDay, now, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return getBookingList(_objectSpread(_objectSpread({}, otherParams), {}, {
-              item_type: 'appointment_booking',
-              parent_id: 0,
-              with: ['children'],
-              child_booking: 0,
-              skip: 1,
-              num: 1000
-            }));
-          case 2:
-            data = _context.sent;
-            setBookingData(data.list);
-          case 4:
+            console.log('otherParams', otherParams);
+            statisticsTime = (otherParams === null || otherParams === void 0 || (_otherParams$booking_ = otherParams.booking_time_start_between) === null || _otherParams$booking_ === void 0 ? void 0 : _otherParams$booking_[1]) || dayjs().format('YYYY-MM-DD HH:mm:ss');
+            /**
+             * statisticsTime 规则：
+             * - 昨天及昨天之前：固定为该日 23:59:59
+             * - 今天：取当前时间
+             * - 明天及明天之后：固定为该日 00:00:00
+             */
+            statisticsDay = dayjs(statisticsTime);
+            now = dayjs();
+            if (statisticsDay.isValid()) {
+              if (statisticsDay.isSame(now, 'day')) statisticsTime = now.format('YYYY-MM-DD HH:mm:ss');
+              if (statisticsDay.isBefore(now, 'day')) statisticsTime = statisticsDay.endOf('day').format('YYYY-MM-DD HH:mm:ss');
+              if (statisticsDay.isAfter(now, 'day')) statisticsTime = statisticsDay.startOf('day').format('YYYY-MM-DD HH:mm:ss');
+            }
+            _context.next = 7;
+            return getStatistic({
+              statistics_time: statisticsTime
+            });
+          case 7:
+            res = _context.sent;
+            setStatisticData(res);
+            calcBookingDataCount();
+            // const data = await getBookingList({
+            //   ...otherParams,
+            //   item_type: 'appointment_booking',
+            //   parent_id: 0,
+            //   with: ['children'],
+            //   child_booking: 0,
+            //   skip: 1,
+            //   num: 1000,
+            // });
+            // setBookingData(data.list);
+          case 10:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function getData() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
-  var calcBookingDataCount = function calcBookingDataCount(data) {
+  var calcBookingDataCount = function calcBookingDataCount() {
+    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2, _statisticData$comple, _statisticData$comple2;
     // 当前在场团体
-    var groupsOnSiteNow = '-';
-
+    var groupsOnSiteNow = statisticData.groups_today_num || 0;
     // 当前在场人数
-    var peopleOnSiteNow = '-';
+    var peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : '-');
     // 今日游客总数
-    var totalVisitorsToday = 0;
+    var totalVisitorsToday = ((_statisticData$total_ = statisticData.total_visitors_today) === null || _statisticData$total_ === void 0 ? void 0 : _statisticData$total_.num) || 0;
     // 今日游客二级数据
-    var totalVisitorsTodayChildren = [];
+    var totalVisitorsTodayChildren = ((_statisticData$total_2 = statisticData.total_visitors_today) === null || _statisticData$total_2 === void 0 ? void 0 : _statisticData$total_2.statistics) || [];
     // 正在进行中的游客
-    var ongoing = 0;
+    var ongoing = ((_statisticData$ongoin = statisticData.ongoing_visitors) === null || _statisticData$ongoin === void 0 ? void 0 : _statisticData$ongoin.num) || 0;
     // 正在进行中的游客二级数据
-    var ongoingChildren = [];
+    var ongoingChildren = ((_statisticData$ongoin2 = statisticData.ongoing_visitors) === null || _statisticData$ongoin2 === void 0 ? void 0 : _statisticData$ongoin2.statistics) || [];
     // 即将到达的游客
-    var upcoming = 0;
+    var upcoming = ((_statisticData$upcomi = statisticData.upcoming_visitors) === null || _statisticData$upcomi === void 0 ? void 0 : _statisticData$upcomi.num) || 0;
     // 即将到达的游客二级数据
-    var upcomingChildren = [];
+    var upcomingChildren = ((_statisticData$upcomi2 = statisticData.upcoming_visitors) === null || _statisticData$upcomi2 === void 0 ? void 0 : _statisticData$upcomi2.statistics) || [];
     // 超时的游客
-    var overdue = '-';
+    var overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : '-');
     // 已完成的游客
-    var completed = 0;
+    var completed = ((_statisticData$comple = statisticData.completed_visitors) === null || _statisticData$comple === void 0 ? void 0 : _statisticData$comple.num) || 0;
     // 已完成的游客二级数据
-    var completedChildren = [];
+    var completedChildren = ((_statisticData$comple2 = statisticData.completed_visitors) === null || _statisticData$comple2 === void 0 ? void 0 : _statisticData$comple2.statistics) || [];
     // 已离场的游客
-    var departed = '-';
-    data.forEach(function (item) {
-      if (isArr(item.children)) {
-        item.children.forEach(function (child) {
-          var _child$metadata;
-          var start = dayjs("".concat(child.start_date, " ").concat(child.start_time));
-          var end = dayjs("".concat(child.end_date, " ").concat(child.end_time));
-
-          // 今日游客总数
-          totalVisitorsToday += child.number;
-          totalVisitorsTodayChildren.push.apply(totalVisitorsTodayChildren, _toConsumableArray(((_child$metadata = child.metadata) === null || _child$metadata === void 0 ? void 0 : _child$metadata.capacity) || []));
-
-          // 正在进行中的游客
-          if (start < dayjs() && end > dayjs()) {
-            var _child$metadata2;
-            ongoing += child.number || 1;
-            ongoingChildren.push.apply(ongoingChildren, _toConsumableArray(((_child$metadata2 = child.metadata) === null || _child$metadata2 === void 0 ? void 0 : _child$metadata2.capacity) || []));
-          }
-          // 即将到达的游客
-          if (dayjs() < start) {
-            var _child$metadata3;
-            upcoming += child.number || 1;
-            upcomingChildren.push.apply(upcomingChildren, _toConsumableArray(((_child$metadata3 = child.metadata) === null || _child$metadata3 === void 0 ? void 0 : _child$metadata3.capacity) || []));
-          }
-          // 已完成的游客
-          if (dayjs() > end) {
-            var _child$metadata4;
-            completed += child.number || 1;
-            completedChildren.push.apply(completedChildren, _toConsumableArray(((_child$metadata4 = child.metadata) === null || _child$metadata4 === void 0 ? void 0 : _child$metadata4.capacity) || []));
-          }
-        });
-      }
-    });
+    var departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : '-');
     onDataChange === null || onDataChange === void 0 || onDataChange({
       groupsOnSiteNow: groupsOnSiteNow,
       peopleOnSiteNow: peopleOnSiteNow,
@@ -215,7 +203,7 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
       overdue: overdue,
       completed: completed,
       departed: departed
-    }, data);
+    }, []);
     setData([
     // 当前在场团体
     {
@@ -271,26 +259,24 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     }]);
   };
   useEffect(function () {
-    calcBookingDataCount(bookingData);
-
-    // 每分钟重新计算预约数据
+    // 每分钟更新一次数据
     var timer = setInterval(function () {
-      calcBookingDataCount(bookingData);
+      getData();
     }, 60 * 1000);
     return function () {
       clearInterval(timer);
     };
-  }, [bookingData]);
+  }, []);
   useEffect(function () {
     getData();
+    // // 每分钟更新一次数据
+    // const timer = setInterval(() => {
+    //   getData();
+    // }, 60 * 1000);
 
-    // 10分钟更新一次数据
-    var timer = setInterval(function () {
-      getData();
-    }, 10 * 60 * 1000);
-    return function () {
-      clearInterval(timer);
-    };
+    // return () => {
+    //   clearInterval(timer);
+    // };
   }, [JSON.stringify(otherParams), refreshKey]);
   useImperativeHandle(ref, function () {
     return {

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

@@ -1 +1,2 @@
 export declare const getBookingList: (params: any) => Promise<any>;
+export declare const getStatistic: (params: any) => Promise<any>;

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

@@ -29,4 +29,26 @@ export var getBookingList = /*#__PURE__*/function () {
   return function getBookingList(_x) {
     return _ref.apply(this, arguments);
   };
+}();
+export var getStatistic = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    var _yield$request$getReq2, data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return request.getRequest().get("/shop/schedule/ticket/statistics", params);
+        case 2:
+          _yield$request$getReq2 = _context2.sent;
+          data = _yield$request$getReq2.data;
+          return _context2.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getStatistic(_x2) {
+    return _ref2.apply(this, arguments);
+  };
 }();

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

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

package/es/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/hooks/useQuotation.js

@@ -16,8 +16,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React, { useMemo, useRef, useState } from 'react';
 import { getProductTotalPrice } from "../utils";
 import useEngineContext from "../../../hooks/useEngineContext";
-import { locales } from "@pisell/utils";
-import { PisellModal } from "@pisell/materials";
+import { locales } from '@pisell/utils';
+import { PisellModal } from '@pisell/materials';
 import { getNormalAndMultiDayProductPrice } from "../info/service/serve";
 import Decimal from 'decimal.js';
 import dayjs from 'dayjs';
@@ -31,6 +31,12 @@ var formatBundleItemMap = function formatBundleItemMap(product) {
     return _objectSpread(_objectSpread({}, pre), curObj);
   }, {});
 };
+var formatVariantItemMap = function formatVariantItemMap(product) {
+  return ((product === null || product === void 0 ? void 0 : product.variants) || []).reduce(function (pre, cur) {
+    pre[cur.id] = cur;
+    return pre;
+  }, {});
+};
 export var calculateTotalPrice = function calculateTotalPrice(data) {
   var _price = data.reduce(function (total, item) {
     var _price = (item === null || item === void 0 ? void 0 : item.price) || (item === null || item === void 0 ? void 0 : item.add_price);
@@ -59,7 +65,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
   // 缓存跨日商品的 multiDayPrices，避免同一 groupId 重复计算
   var multiDayPricesCache = new Map();
   var value = cartValue.map(function (item) {
-    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
+    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item$_extend5, _item$_extend7;
     // 格式化商品日期用于匹配
     var itemScheduleDate = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : '';
 
@@ -73,6 +79,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     // 是否报价单变更价格更新
     var isChangePrice = newProduct.price != item.price;
     var bundleItemMap = formatBundleItemMap(newProduct);
+    var variantItemMap = formatVariantItemMap(newProduct);
     var newBundle = (((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || []).map(function (bundle) {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
@@ -103,9 +110,18 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         // product_price: bundleItemMap[item.id].product_price,
       });
     });
+    var newVariant = (((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.variant) || []).map(function (variant) {
+      if (!variantItemMap[variant.id]) {
+        return variant;
+      }
+      return _objectSpread(_objectSpread({}, variant), {}, {
+        price: variantItemMap[variant.id].price,
+        base_price: variantItemMap[variant.id].base_price
+      });
+    });
 
     // 处理跨日商品的 multiDayPrices
-    if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.groupId) {
+    if ((_item$_extend4 = item._extend) !== null && _item$_extend4 !== void 0 && _item$_extend4.groupId) {
       // 检查缓存中是否已经计算过该 groupId
       if (!multiDayPricesCache.has(item._extend.groupId)) {
         // 找到该商品所有日期的价格记录
@@ -140,17 +156,23 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     } else {
       isChange = true;
     }
+    var price = newProduct.price;
+    if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && (_item$_extend5 = _item$_extend5.other) !== null && _item$_extend5 !== void 0 && _item$_extend5.product_variant_id) {
+      var _variantItemMap$item$, _variantItemMap$item$2, _item$_extend6;
+      price = (_variantItemMap$item$ = (_variantItemMap$item$2 = variantItemMap[(_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 || (_item$_extend6 = _item$_extend6.other) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.product_variant_id]) === null || _variantItemMap$item$2 === void 0 ? void 0 : _variantItemMap$item$2.price) !== null && _variantItemMap$item$ !== void 0 ? _variantItemMap$item$ : newProduct.price;
+    }
     var newItem = _objectSpread(_objectSpread({}, item), {}, {
       original_price: newProduct.original_price,
-      price: newProduct.price,
+      price: price,
       base_price: newProduct.base_price,
       _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
         price: newProduct.price,
         // total: newProduct.total,
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: _objectSpread(_objectSpread({}, item._extend.other), {}, {
-          option: (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option,
-          bundle: newBundle
+          option: (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 || (_item$_extend7 = _item$_extend7.other) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.option,
+          bundle: newBundle,
+          variant: newVariant || []
         })
       })
     });
@@ -202,10 +224,10 @@ var useQuotation = function useQuotation(state, dispatch) {
               return !item.isCustomItem;
             }) // 过滤掉自定义商品
             .map(function (item) {
-              var _item$_extend5;
+              var _item$_extend8;
               return {
                 product_id: item.product_id,
-                schedule_date: (_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
+                schedule_date: (_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
               };
             });
             if (queryData.length) {
@@ -267,7 +289,7 @@ var useQuotation = function useQuotation(state, dispatch) {
             return _context2.abrupt("return");
           case 12:
             dispatch({
-              type: "setService",
+              type: 'setService',
               payload: {
                 value: newCartValue,
                 edit: true

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/booking/info/client/index.js

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$bookingConfig2, _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -54,6 +54,10 @@ var Client = function Client() {
     franchiseeLoading = _useState6[0],
     setFranchiseeLoading = _useState6[1];
   var getHolders = useGetHolderList(state, dispatch);
+  var boardConfig = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.basic]);
   var _useState7 = useState({
       skip: 1,
       num: 10,
@@ -106,15 +110,21 @@ var Client = function Client() {
             if (!withKey.includes('contactsInfo')) {
               withKey.push('contactsInfo');
             }
-            _context.next = 8;
-            return api(_objectSpread(_objectSpread({}, resetParams), {}, {
+            // 返回用户的表单记录
+            if (!(withKey !== null && withKey !== void 0 && withKey.includes('formRecord'))) {
+              withKey.push('formRecord');
+            }
+            _context.next = 9;
+            return api(_objectSpread(_objectSpread(_objectSpread({}, resetParams), {}, {
               with: withKey
             }, !state.isFranchisee ? {
               _config: {
                 abort: true
               }
-            } : {}));
-          case 8:
+            } : {}), {}, {
+              relation_form_id: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id) || undefined
+            }));
+          case 9:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -151,7 +161,7 @@ var Client = function Client() {
             setLoadLoading(false);
             isLoadClient = true;
             return _context.abrupt("return", {});
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/es/components/booking/info/notes/index.d.ts

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

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

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

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

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

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

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

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

@@ -81,7 +81,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
 
   // 根据时长 进行创建多个商品
   for (var i = 0; i < item._extend.duration; i++) {
-    var _extend$multiDayPrice;
+    var _extend$multiDayPrice, _cacheItem$_extend$or, _cacheItem$_extend;
     var _extend = _objectSpread({}, item._extend);
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
@@ -106,7 +106,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     });
     var totalPrice = getProductTotalPrice(cacheItem);
     cacheItem._extend.total = totalPrice;
-    cacheItem._extend.origin_total = totalPrice;
+    cacheItem._extend.origin_total = (_cacheItem$_extend$or = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.origin_total) !== null && _cacheItem$_extend$or !== void 0 ? _cacheItem$_extend$or : totalPrice;
     cacheItem._extend.items = undefined;
     cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);

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

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