@pisell/private-materials 6.11.24 → 6.11.26

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

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

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

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

@@ -363,14 +363,16 @@ export var useWalletPass = function useWalletPass(props) {
   // 监听 selectedWithDetails 变化，自动通知外部 前端策略模型计算早于订单创建
   useDebounceEffect(function () {
     notifySelectChange(selectedWithDetails);
+    // 将计算后的数据同步回 selectedWallet
+    setWalletSelect(selectedWithDetails);
     setLoading(false);
   }, [selectedWithDetails], {
     wait: 200
   });
   var data = useMemo(function () {
     // 使用前端计算后的数据
-    return formatMachineCodeServer2CardList(uniqueByKey(mergeDataWithInitialOrder([].concat(_toConsumableArray(selectedWallet), _toConsumableArray(displayVouchers), _toConsumableArray(displayOtherVouchers))), 'id'), selectedVoucherIds);
-  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWallet]);
+    return formatMachineCodeServer2CardList(uniqueByKey(mergeDataWithInitialOrder([].concat(_toConsumableArray(selectedWithDetails), _toConsumableArray(displayVouchers), _toConsumableArray(displayOtherVouchers))), 'id'), selectedVoucherIds);
+  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWithDetails]);
 
   // 获取用户识别码列表
   var fetchUserIdentificationCodes = useMemoizedFn( /*#__PURE__*/function () {
@@ -719,7 +721,7 @@ export var useWalletPass = function useWalletPass(props) {
   var handleSearchIdentificationCode = useMemoizedFn(function (value) {
     return paymentModule.wallet.searchIdentificationCodeAsync({
       code: value,
-      prepare_payments: paymentModule.wallet.formatWalletPassList2PreparePayments(selectedWalletRef.current)
+      prepare_payments: paymentModule.wallet.formatWalletPassList2PreparePayments(selectedWithDetails)
     });
   });
 

package/es/components/ecocup/components/AddCustomerModal/index.js

@@ -200,10 +200,10 @@ var AddCustomerModal = function AddCustomerModal(props) {
     renderMode: "edit",
     name: "membership",
     label: locales.getText('pisell2.text.ecocup.add-customer-modal.membership'),
-    defaultValue: "normal",
+    defaultValue: "regular",
     options: [{
-      label: 'Normal',
-      value: 'normal'
+      label: 'Regular',
+      value: 'regular'
     }, {
       label: 'Business',
       value: 'business'

package/es/components/ecocup/components/CupInfoCard/index.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import './index.less';
 interface IProps {
-    type: 'rentInfo' | 'markInfo' | 'belongInfo';
+    type: 'rentInfo' | 'markInfo' | 'belongInfo' | 'otherBelongInfo';
     data: Record<string, any>;
+    isMultipleShop?: boolean;
+    isMultipleTime?: boolean;
 }
 declare const CupInfoCard: (props: IProps) => React.JSX.Element;
 export default CupInfoCard;

package/es/components/ecocup/components/CupInfoCard/index.js

@@ -4,9 +4,11 @@ import dayjs from 'dayjs';
 import "./index.less";
 var CupInfoCard = function CupInfoCard(props) {
   var type = props.type,
-    data = props.data;
+    data = props.data,
+    isMultipleShop = props.isMultipleShop,
+    isMultipleTime = props.isMultipleTime;
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell2-ecocup-cup-info-card"
-  }, /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.ecocup.cup-info-card.title.".concat(type))), /*#__PURE__*/React.createElement("div", null, (data === null || data === void 0 ? void 0 : data.shop) || '-'), /*#__PURE__*/React.createElement("div", null, data !== null && data !== void 0 && data.time ? dayjs(data === null || data === void 0 ? void 0 : data.time).format('HH:mm DD/MM/YYYY') : '-'));
+  }, /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.ecocup.cup-info-card.title.".concat(type))), isMultipleShop ? locales.getText('pisell2.text.ecocup.cup-info-card.title.multiple-shop') : /*#__PURE__*/React.createElement("div", null, (data === null || data === void 0 ? void 0 : data.shop) || '-'), isMultipleTime ? locales.getText('pisell2.text.ecocup.cup-info-card.title.multiple-time') : /*#__PURE__*/React.createElement("div", null, data !== null && data !== void 0 && data.time ? dayjs(data === null || data === void 0 ? void 0 : data.time).format('HH:mm DD/MM/YYYY') : '-'));
 };
 export default CupInfoCard;

package/es/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -1,5 +1,36 @@
-import { ECupActionType } from '../../types';
+import { ECupActionType, ICup } from '../../types';
 export declare const useCupAction: () => {
     run: (this: unknown, cupId: string, action: ECupActionType) => Promise<boolean>;
     loading: boolean;
 };
+/**
+ * @description: 批量归还杯子
+ * @return {*}
+ */
+export declare const useBatchCupAction: () => {
+    run: (this: unknown, eco_cup_ids: string[] | number[]) => Promise<boolean>;
+    loading: boolean;
+};
+/**
+ * @description: 统计杯子列表中的客户、店铺、时间数量
+ * @param {ICup[]} cupList - 杯子列表
+ * @return {object} 返回统计信息和是否为多个的标识
+ */
+export declare const useCupListStatistics: (cupList: ICup[]) => {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: import("../../types").ICustomer | undefined;
+    uniqueShop: {
+        id: string;
+        name: string;
+    } | undefined;
+    uniqueTime: string | undefined;
+} | {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: null;
+    uniqueShop: null;
+    uniqueTime: null;
+};

package/es/components/ecocup/components/CupStatusModal/hooks.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 { useState } from 'react';
+import { useState, useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import { useGetGoalShopInfo, useRequest } from "../../hooks";
 export var useCupAction = function useCupAction() {
@@ -65,4 +65,112 @@ export var useCupAction = function useCupAction() {
     run: run,
     loading: loading
   };
+};
+
+/**
+ * @description: 批量归还杯子
+ * @return {*}
+ */
+export var useBatchCupAction = function useBatchCupAction() {
+  var _useRequest2 = useRequest(),
+    post = _useRequest2.post;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var run = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eco_cup_ids) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            setLoading(true);
+            _context2.next = 4;
+            return post('/shop/wallet/eco/cups-return', {
+              eco_cup_ids: eco_cup_ids
+            });
+          case 4:
+            res = _context2.sent;
+            if (!((res === null || res === void 0 ? void 0 : res.code) == 200)) {
+              _context2.next = 7;
+              break;
+            }
+            return _context2.abrupt("return", true);
+          case 7:
+            return _context2.abrupt("return", false);
+          case 10:
+            _context2.prev = 10;
+            _context2.t0 = _context2["catch"](0);
+            console.error(_context2.t0);
+            return _context2.abrupt("return", false);
+          case 14:
+            _context2.prev = 14;
+            setLoading(false);
+            return _context2.finish(14);
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 10, 14, 17]]);
+    }));
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
+  return {
+    run: run,
+    loading: loading
+  };
+};
+
+/**
+ * @description: 统计杯子列表中的客户、店铺、时间数量
+ * @param {ICup[]} cupList - 杯子列表
+ * @return {object} 返回统计信息和是否为多个的标识
+ */
+export var useCupListStatistics = function useCupListStatistics(cupList) {
+  return useMemo(function () {
+    var _cupList$, _cupList$2, _cupList$3;
+    if (cupList.length === 0) {
+      return {
+        hasMultipleCustomers: false,
+        hasMultipleShops: false,
+        hasMultipleTimes: false,
+        uniqueCustomer: null,
+        uniqueShop: null,
+        uniqueTime: null
+      };
+    }
+
+    // 收集所有唯一的客户ID
+    var customerIds = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.customer_id;
+    }).filter(function (id) {
+      return id;
+    }));
+
+    // 收集所有唯一的店铺ID（current_shop）
+    var shopIds = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.current_shop_id;
+    }).filter(function (id) {
+      return id;
+    }));
+
+    // 收集所有唯一的时间（operated_at）
+    var times = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.operated_at;
+    }).filter(function (time) {
+      return time;
+    }));
+    var result = {
+      hasMultipleCustomers: customerIds.size > 1,
+      hasMultipleShops: shopIds.size > 1,
+      hasMultipleTimes: times.size > 1,
+      uniqueCustomer: (_cupList$ = cupList[0]) === null || _cupList$ === void 0 ? void 0 : _cupList$.customer,
+      uniqueShop: (_cupList$2 = cupList[0]) === null || _cupList$2 === void 0 ? void 0 : _cupList$2.current_shop,
+      uniqueTime: (_cupList$3 = cupList[0]) === null || _cupList$3 === void 0 ? void 0 : _cupList$3.operated_at
+    };
+    return result;
+  }, [cupList]);
 };

package/es/components/ecocup/components/CupStatusModal/index.js

@@ -1,22 +1,35 @@
 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 _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 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 _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 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 React, { useMemo } from 'react';
-import { PisellModal, Icon, PisellToast } from '@pisell/materials';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useMemo, useState } from 'react';
+import { PisellModal, Icon, PisellToast, Button } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { ECupActionType, ECupScanStatus, ECupStatus } from "../../types";
 import "./index.less";
 import CupInfoCard from "../CupInfoCard";
 import CustomerCard from "../CustomerCard";
-import { useCupAction } from "./hooks";
+import { useCupAction, useCupListStatistics, useBatchCupAction } from "./hooks";
+import SearchBar from "../SearchBar";
+var SCAN_LISTENER_KEY = 'eco-cup-status-modal-scan-listener';
 var CupStatusModal = function CupStatusModal(props) {
-  var _cupData$current_shop;
+  var _cupStatistics$unique, _cupList$, _cupList$2;
   var visible = props.visible,
     onCancel = props.onCancel,
     onOk = props.onOk,
@@ -25,7 +38,33 @@ var CupStatusModal = function CupStatusModal(props) {
     scanStatus = _ref.scanStatus,
     cupData = _ref.cupData;
   var cupAction = useCupAction();
-  var isRed = scanStatus !== ECupScanStatus.OTHER_IN_STOCK && scanStatus !== ECupScanStatus.OTHER_RENT;
+  // 杯子列表
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    cupList = _useState2[0],
+    setCupList = _useState2[1];
+  var batchCupAction = useBatchCupAction();
+  useEffect(function () {
+    if (!cupData) {
+      setCupList([]);
+      return;
+    }
+    var initialCups = Array.isArray(cupData) ? cupData : [cupData];
+    setCupList(initialCups);
+  }, [cupData]);
+
+  /**
+   * @description: OTHER_RENT 状态
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var otherRentStatus = useMemo(function () {
+    return scanStatus === ECupScanStatus.OTHER_RENT;
+  }, [scanStatus]);
+  var isRed = !otherRentStatus;
+
+  // 使用自定义 hook 统计杯子列表信息
+  var cupStatistics = useCupListStatistics(cupList);
   var lineStyle = useMemo(function () {
     if (isRed) {
       return {
@@ -41,11 +80,15 @@ var CupStatusModal = function CupStatusModal(props) {
 
   // 杯子信息卡片类型
   var cupInfoCardType = useMemo(function () {
-    if (scanStatus === ECupScanStatus.OTHER_IN_STOCK || scanStatus === ECupScanStatus.IN_STOCK) {
+    if (scanStatus === ECupScanStatus.OTHER_IN_STOCK) {
+      // 杯子归属信息
+      return 'otherBelongInfo';
+    }
+    if (scanStatus === ECupScanStatus.IN_STOCK) {
       // 展示归属信息
       return 'belongInfo';
     }
-    if (scanStatus === ECupScanStatus.OTHER_RENT || scanStatus === ECupScanStatus.RENT) {
+    if (otherRentStatus || scanStatus === ECupScanStatus.RENT) {
       // 展示借出信息
       return 'rentInfo';
     }
@@ -61,7 +104,7 @@ var CupStatusModal = function CupStatusModal(props) {
   };
   var _onOk = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var type, result;
+      var type, result, ids;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -71,7 +114,7 @@ var CupStatusModal = function CupStatusModal(props) {
             }
             return _context.abrupt("return");
           case 2:
-            type = scanStatus === ECupScanStatus.OTHER_IN_STOCK ? ECupActionType.TRANSFER : scanStatus === ECupScanStatus.OTHER_RENT ? ECupActionType.RETURN : '';
+            type = otherRentStatus ? ECupActionType.RETURN : '';
             if (type) {
               _context.next = 6;
               break;
@@ -79,17 +122,32 @@ var CupStatusModal = function CupStatusModal(props) {
             onOk === null || onOk === void 0 || onOk();
             return _context.abrupt("return");
           case 6:
-            _context.next = 8;
+            if (!otherRentStatus) {
+              _context.next = 13;
+              break;
+            }
+            ids = cupList.map(function (cup) {
+              return (cup === null || cup === void 0 ? void 0 : cup.eco_cup_id) || (cup === null || cup === void 0 ? void 0 : cup.id);
+            });
+            _context.next = 10;
+            return batchCupAction.run(ids);
+          case 10:
+            result = _context.sent;
+            _context.next = 16;
+            break;
+          case 13:
+            _context.next = 15;
             return cupAction.run((cupData === null || cupData === void 0 ? void 0 : cupData.eco_cup_id) || (cupData === null || cupData === void 0 ? void 0 : cupData.id), type);
-          case 8:
+          case 15:
             result = _context.sent;
+          case 16:
             if (result) {
               PisellToast({
                 content: locales.getText("pisell2.text.ecocup.toast.success-".concat(type))
               });
               onOk === null || onOk === void 0 || onOk();
             }
-          case 10:
+          case 17:
           case "end":
             return _context.stop();
         }
@@ -99,49 +157,125 @@ var CupStatusModal = function CupStatusModal(props) {
       return _ref2.apply(this, arguments);
     };
   }();
+
+  /**
+   * @description: 搜索结果回调，将新杯子添加到列表
+   */
+  var onSearchResult = function onSearchResult(result) {
+    var _result$data2;
+    // 判断杯子是否已经在列表中
+    if (cupList.find(function (c) {
+      var _result$data;
+      return (c === null || c === void 0 ? void 0 : c.id) === (result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.id);
+    })) {
+      return;
+    }
+
+    // 判断杯子是否已经租出
+    if ((result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.status) !== ECupStatus.RENT) {
+      return;
+    }
+
+    // 将新杯子添加到列表
+    setCupList([].concat(_toConsumableArray(cupList), [result === null || result === void 0 ? void 0 : result.data]));
+  };
+
+  /**
+   * @description: 从列表中移除杯子
+   */
+  var removeCupFromList = function removeCupFromList(cupId) {
+    setCupList(cupList.filter(function (cup) {
+      return (cup === null || cup === void 0 ? void 0 : cup.id) !== cupId;
+    }));
+  };
+  var renderSearchBar = function renderSearchBar() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell2-ecocup-customer-first-modal-search-bar"
+    }, /*#__PURE__*/React.createElement(SearchBar, {
+      scanListenerKey: SCAN_LISTENER_KEY,
+      searchType: "cup",
+      placeholder: locales.getText('pisell2.text.ecocup.customer-first-modal.search-bar.placeholder'),
+      onSearchResult: onSearchResult,
+      onCupStatusValidate: onSearchResult
+    }));
+  };
+  var showRemove = useMemo(function () {
+    return (cupList === null || cupList === void 0 ? void 0 : cupList.length) > 1 && otherRentStatus;
+  }, [cupList.length, otherRentStatus]);
   return /*#__PURE__*/React.createElement(PisellModal, {
     headerDivider: false,
     open: visible,
     onCancel: _onCancel,
     onOk: _onOk,
-    title: locales.getText("pisell2.text.ecocup.cup-status-modal.title-".concat(scanStatus)),
-    cancelText: locales.getText('pisell2.text.ecocup.button.dismiss'),
-    okText: isRed ? locales.getText('pisell2.text.ecocup.button.confirm') : scanStatus === ECupScanStatus.OTHER_IN_STOCK ? locales.getText('pisell2.text.ecocup.button.transfer') : locales.getText('pisell2.text.ecocup.button.mark-as-return'),
+    title: otherRentStatus ? locales.getText("pisell2.text.ecocup.cup-status-modal.title-".concat(scanStatus))(cupList.length) : locales.getText("pisell2.text.ecocup.cup-status-modal.title-".concat(scanStatus)),
+    cancelText: otherRentStatus ? locales.getText('pisell2.text.ecocup.button.cancel') : locales.getText('pisell2.text.ecocup.button.dismiss'),
+    okText: isRed ? locales.getText('pisell2.text.ecocup.button.confirm') : locales.getText('pisell2.text.ecocup.button.return'),
     okButtonProps: {
       loading: cupAction === null || cupAction === void 0 ? void 0 : cupAction.loading
     },
     cancelVisible: !isRed,
     width: 580
   }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell2-ecocup-cup-status-modal-content"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell2-ecocup-cup-status-modal-content-cup",
-    style: _objectSpread({}, lineStyle)
-  }, /*#__PURE__*/React.createElement(Icon, {
-    type: "RestOutlined",
-    size: 24
-  }), /*#__PURE__*/React.createElement("span", {
+    className: "pisell2-ecocup-cup-status-modal-content",
     style: {
-      color: !isRed ? '#667085' : '#F04438'
+      gap: otherRentStatus ? '20px' : '32px'
     }
-  }, locales.getText('pisell2.text.ecocup.cup-id')), /*#__PURE__*/React.createElement("span", null, (cupData === null || cupData === void 0 ? void 0 : cupData.eco_cup_code) || (cupData === null || cupData === void 0 ? void 0 : cupData.code) || '')), /*#__PURE__*/React.createElement("div", {
+  }, otherRentStatus ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell2-ecocup-cup-status-modal-content-search"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "tip-text"
+  }, locales.getText('pisell2.text.ecocup.cup-status-modal.search-bar.title')), renderSearchBar()) : null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell2-ecocup-cup-status-modal-content-cup-lists"
+  }, cupList.map(function (cup, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: (cup === null || cup === void 0 ? void 0 : cup.id) || index,
+      className: "pisell2-ecocup-cup-status-modal-content-cup",
+      style: _objectSpread(_objectSpread({}, lineStyle), {}, {
+        justifyContent: showRemove ? 'space-between' : 'center'
+      })
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "pisell2-ecocup-cup-status-modal-content-cup-info"
+    }, /*#__PURE__*/React.createElement(Icon, {
+      type: "RestOutlined",
+      size: 24
+    }), /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: !isRed ? '#667085' : '#F04438'
+      }
+    }, locales.getText('pisell2.text.ecocup.cup-id')), /*#__PURE__*/React.createElement("span", null, (cup === null || cup === void 0 ? void 0 : cup.eco_cup_code) || (cup === null || cup === void 0 ? void 0 : cup.code) || '')), showRemove && /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      icon: /*#__PURE__*/React.createElement(Icon, {
+        type: "pisell2-trash-01",
+        size: 24,
+        color: "#7F56DA"
+      }),
+      onClick: function onClick() {
+        return removeCupFromList(cup === null || cup === void 0 ? void 0 : cup.id);
+      },
+      className: "info-remove"
+    }, locales.getText('pisell2.text.ecocup.button.remove')));
+  })), /*#__PURE__*/React.createElement("div", {
     className: "pisell2-ecocup-cup-status-modal-content-info"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
-  }, cupData !== null && cupData !== void 0 && cupData.current_shop && cupInfoCardType ? /*#__PURE__*/React.createElement(CupInfoCard, {
+  }, (cupStatistics !== null && cupStatistics !== void 0 && cupStatistics.uniqueShop || cupStatistics !== null && cupStatistics !== void 0 && cupStatistics.hasMultipleShops) && cupInfoCardType ? /*#__PURE__*/React.createElement(CupInfoCard, {
     type: cupInfoCardType,
     data: {
-      shop: cupData === null || cupData === void 0 || (_cupData$current_shop = cupData.current_shop) === null || _cupData$current_shop === void 0 ? void 0 : _cupData$current_shop.name,
-      time: cupData === null || cupData === void 0 ? void 0 : cupData.operated_at
+      shop: cupStatistics === null || cupStatistics === void 0 || (_cupStatistics$unique = cupStatistics.uniqueShop) === null || _cupStatistics$unique === void 0 ? void 0 : _cupStatistics$unique.name,
+      time: cupStatistics === null || cupStatistics === void 0 ? void 0 : cupStatistics.uniqueTime,
+      isMultipleTime: cupStatistics === null || cupStatistics === void 0 ? void 0 : cupStatistics.hasMultipleTimes,
+      isMultipleShop: cupStatistics === null || cupStatistics === void 0 ? void 0 : cupStatistics.hasMultipleShops
     }
   }) : null), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
-  }, (cupData === null || cupData === void 0 ? void 0 : cupData.status) === ECupStatus.RENT ? cupData !== null && cupData !== void 0 && cupData.customer ? /*#__PURE__*/React.createElement(CustomerCard, (cupData === null || cupData === void 0 ? void 0 : cupData.customer) || {}) : null : (cupData === null || cupData === void 0 ? void 0 : cupData.status) === ECupStatus.IN_STOCK ? null : /*#__PURE__*/React.createElement("div", {
+  }, (cupList === null || cupList === void 0 || (_cupList$ = cupList[0]) === null || _cupList$ === void 0 ? void 0 : _cupList$.status) === ECupStatus.RENT ? cupStatistics !== null && cupStatistics !== void 0 && cupStatistics.uniqueCustomer || cupStatistics !== null && cupStatistics !== void 0 && cupStatistics.hasMultipleCustomers ? /*#__PURE__*/React.createElement(CustomerCard, _extends({}, (cupStatistics === null || cupStatistics === void 0 ? void 0 : cupStatistics.uniqueCustomer) || {}, {
+    isMultiple: cupStatistics === null || cupStatistics === void 0 ? void 0 : cupStatistics.hasMultipleCustomers
+  })) : null : /*#__PURE__*/React.createElement("div", {
     className: "pisell2-ecocup-cup-status-modal-content-info-tip"
-  }, locales.getText('pisell2.text.ecocup.cup-status-modal.tip'))))));
+  }, (cupList === null || cupList === void 0 || (_cupList$2 = cupList[0]) === null || _cupList$2 === void 0 ? void 0 : _cupList$2.status) === ECupStatus.IN_STOCK ? locales.getText('pisell2.text.ecocup.cup-status-modal.tip-in-stock') : locales.getText('pisell2.text.ecocup.cup-status-modal.tip'))))));
 };
 export default CupStatusModal;

package/es/components/ecocup/components/CupStatusModal/index.less

@@ -4,32 +4,70 @@
   flex-direction: column;
   gap: 32px;
 
+  &-cup-lists {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    gap: 4px;
+  }
+
   &-cup {
     height: 60px;
     padding: 0 16px;
     display: flex;
     flex-direction: row;
     align-items: center;
-    justify-content: center;
+    justify-content: space-between;
     border-radius: 8px;
     gap: 8px;
+    width: 100%;
+
+    .info-remove {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      border-radius: 8px;
+      border: 1px solid #7f56da;
+      background: #f6f2ff;
+      color: #7F56DA;
+    }
+  }
+
+  &-cup-info {
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-    & > span {
+    &>span {
       font-size: 20px;
       font-weight: 300;
     }
   }
 
+  &-search {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    .tip-text {
+      font-size: 14px;
+      font-weight: 500;
+      color: rgb(127, 86, 218);
+      text-align: center;
+    }
+  }
+
   &-info {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-
-    &-tip {
-      flex: 1;
-      color: #d92d20;
-      font-size: 16px;
-      font-weight: 400;
+    gap: 8px;
+    &>div:nth-child(2) {
+      display: flex;
+      justify-content: flex-end;
     }
   }
-}
+
+  .comprehensive-search__search-section .comprehensive-search__search-button {
+    min-width: 60px !important;
+  }
+}