@pisell/pisellos 2.2.153 → 2.2.156

package/dist/solution/BookingTicket/utils/orderCustomer.js

@@ -0,0 +1,31 @@
+/** 从 ICustomer 富字段解析展示名（与 SalesSdk getClientName 语义对齐）。 */
+function resolveCustomerDisplayName(customer) {
+  var _customer$name;
+  var c = customer;
+  var displayName = c.display_name;
+  if (typeof displayName === 'string' && displayName) return displayName;
+  var nickname = c.nickname;
+  if (typeof nickname === 'string' && nickname) return nickname;
+  var firstName = c.first_name;
+  var lastName = c.last_name;
+  if (typeof firstName === 'string' && firstName || typeof lastName === 'string' && lastName) {
+    return "".concat(typeof firstName === 'string' ? firstName : '', " ").concat(typeof lastName === 'string' ? lastName : '').trim();
+  }
+  var customerName = c.customer_name;
+  if (typeof customerName === 'string' && customerName) return customerName;
+  return (_customer$name = customer.name) !== null && _customer$name !== void 0 ? _customer$name : '';
+}
+
+/** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
+export function formatOrderCustomerPatch(customer) {
+  var _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
+  var rawId = customer.id;
+  var numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
+  return {
+    customer_id: Number.isFinite(numericId) ? numericId : null,
+    customer_name: resolveCustomerDisplayName(customer),
+    phone: (_customer$phone = customer.phone) !== null && _customer$phone !== void 0 ? _customer$phone : '',
+    email: (_customer$email = customer.email) !== null && _customer$email !== void 0 ? _customer$email : '',
+    country_calling_code: (_country_calling_code = (_country_calling_code2 = customer.country_calling_code) === null || _country_calling_code2 === void 0 ? void 0 : _country_calling_code2.toString()) !== null && _country_calling_code !== void 0 ? _country_calling_code : ''
+  };
+}

package/dist/solution/BookingTicket/utils/scan/cloudSearch.d.ts

@@ -20,3 +20,7 @@ export declare const searchProduct: (request: RequestPlugin, code: string) => Pr
     searchType: string;
     response: any;
 }>;
+export declare const searchOrder: (request: RequestPlugin, code: string) => Promise<{
+    searchType: string;
+    response: any;
+}>;

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -156,4 +156,40 @@ export var searchProduct = /*#__PURE__*/function () {
   return function searchProduct(_x5, _x6) {
     return _ref3.apply(this, arguments);
   };
+}();
+export var searchOrder = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(request, code) {
+    var res;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.prev = 0;
+          _context4.next = 3;
+          return request === null || request === void 0 ? void 0 : request.get("/order/sales/".concat(code));
+        case 3:
+          res = _context4.sent;
+          console.log('searchOrder>>>>>>>', res);
+          if (!((res === null || res === void 0 ? void 0 : res.code) == 200 && !!(res !== null && res !== void 0 && res.data))) {
+            _context4.next = 7;
+            break;
+          }
+          return _context4.abrupt("return", {
+            searchType: 'order',
+            response: res
+          });
+        case 7:
+          throw new Error('没有找到对应的识别码');
+        case 10:
+          _context4.prev = 10;
+          _context4.t0 = _context4["catch"](0);
+          throw _context4.t0;
+        case 13:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4, null, [[0, 10]]);
+  }));
+  return function searchOrder(_x7, _x8) {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/dist/solution/BookingTicket/utils/scan/handleScan.js

@@ -2,7 +2,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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 { searchWalletPass, searchWallet, searchProduct } from "./cloudSearch";
+import { searchWalletPass, searchWallet, searchProduct, searchOrder } from "./cloudSearch";
 import scanCache from "./scanCache";
 
 /**
@@ -159,7 +159,7 @@ export var handleGlobalScan = function handleGlobalScan(request, localSearch) {
     if (value.startsWith('WL')) {
       requestList = [searchWallet(request, value)];
     } else {
-      requestList = [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)];
+      requestList = [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value), searchOrder(request, value)];
     }
     return requestList;
   };

package/dist/solution/Sales/index.d.ts

@@ -82,6 +82,9 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getResourceId;
     private getBookingAppointmentStatus;
     private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
     /**

package/dist/solution/Sales/index.js

@@ -409,6 +409,43 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "countBookingOrders",
+    value: function countBookingOrders(bookings) {
+      var orderIds = new Set();
+      bookings.forEach(function (booking) {
+        var _order_id, _booking$order2;
+        var orderId = (_order_id = booking.order_id) !== null && _order_id !== void 0 ? _order_id : (_booking$order2 = booking.order) === null || _booking$order2 === void 0 ? void 0 : _booking$order2.order_id;
+        if (orderId === undefined || orderId === null) return;
+        orderIds.add(String(orderId));
+      });
+      return orderIds.size;
+    }
+  }, {
+    key: "countCompletedBookings",
+    value: function countCompletedBookings(bookings) {
+      var _this2 = this;
+      return bookings.filter(function (booking) {
+        return _this2.getBookingAppointmentStatus(booking) === 'completed';
+      }).length;
+    }
+  }, {
+    key: "groupBookingsByResource",
+    value: function groupBookingsByResource(bookingList) {
+      var bookingMap = new Map();
+      bookingList.forEach(function (booking) {
+        if (!Array.isArray(booking.resources)) return;
+        booking.resources.forEach(function (resource) {
+          var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
+          if (relationId === undefined || relationId === null) return;
+          var key = String(relationId);
+          var list = bookingMap.get(key) || [];
+          list.push(booking);
+          bookingMap.set(key, list);
+        });
+      });
+      return bookingMap;
+    }
   }, {
     key: "isBookingMatchedResource",
     value: function isBookingMatchedResource(booking, resourceId) {
@@ -422,10 +459,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sortMatchedBookings",
     value: function sortMatchedBookings(bookings) {
-      var _this2 = this;
+      var _this3 = this;
       return _toConsumableArray(bookings).sort(function (left, right) {
-        var leftStartAt = _this2.toBookingDateTime(left.start_date, left.start_time).valueOf();
-        var rightStartAt = _this2.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        var leftStartAt = _this3.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this3.toBookingDateTime(right.start_date, right.start_time).valueOf();
         return leftStartAt - rightStartAt;
       });
     }
@@ -440,17 +477,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this3 = this;
+      var _this4 = this;
       if (bookings.length === 0) return [];
       var currentDayStart = current.startOf('day');
       var currentDayEnd = current.endOf('day');
 
       // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrBefore(startAt, currentDayEnd) && _this3.isSameOrAfter(endAt, currentDayStart);
+        return _this4.isSameOrBefore(startAt, currentDayEnd) && _this4.isSameOrAfter(endAt, currentDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -460,21 +497,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
         }).filter(function (startAt) {
           return startAt.isValid();
         }).map(function (startAt) {
           return startAt.valueOf();
         }));
         var futureCandidates = dayScopedBookings.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           if (!startAt.isValid()) return false;
           return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
         });
         if (futureCandidates.length === 0) return selectedBookings;
-        var nextStartAt = _this3.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -486,10 +523,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrAfter(current, startAt) && _this3.isSameOrBefore(current, endAt);
+        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -501,13 +538,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
       });
       if (upcoming.length > 0) {
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -560,10 +597,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this4 = this;
+      var _this5 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this4.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -693,7 +730,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this5 = this;
+          _this6 = this;
         var bookingList,
           deviceTime,
           current,
@@ -701,6 +738,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           resourceResponse,
           resourceList,
           normalizedBookings,
+          rawBookingMap,
           bookingMap,
           list,
           _args5 = arguments;
@@ -745,26 +783,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList); // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
-              bookingMap = new Map();
-              normalizedBookings.forEach(function (booking) {
-                if (!Array.isArray(booking.resources)) return;
-                booking.resources.forEach(function (resource) {
-                  var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
-                  if (relationId === undefined || relationId === null) return;
-                  var key = String(relationId);
-                  var list = bookingMap.get(key) || [];
-                  list.push(booking);
-                  bookingMap.set(key, list);
-                });
-              });
-
-              // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
+              rawBookingMap = this.groupBookingsByResource(bookingList);
+              bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this5.getResourceId(resource);
+                var resourceId = _this6.getResourceId(resource);
+                var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
-                var bookings = _this5.pickBookingsForCurrentPoint(current, matchedBookings);
+                var orderCount = _this6.countBookingOrders(rawMatchedBookings);
+                var bookingCount = rawMatchedBookings.length;
+                var compeleteBookingCount = _this6.countCompletedBookings(rawMatchedBookings);
+                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount,
                   bookings: bookings
                 });
               });
@@ -796,9 +829,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this6 = this,
+          _this7 = this,
           _params$bookingList;
-        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings;
+        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -836,7 +869,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this6.getResourceId(resource)) === String(params.resourceId);
+                return String(_this7.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context6.next = 15;
@@ -846,19 +879,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this6.isBookingMatchedResource(booking, resourceId);
+                return _this7.isBookingMatchedResource(booking, resourceId);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingAppointmentStatus(booking) === 'completed';
+                return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this6.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
                 includeCompleted: true
               }));
               unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
+              orderCount = this.countBookingOrders(matchedBookingList);
+              bookingCount = matchedBookingList.length;
+              compeleteBookingCount = completedBookingList.length;
               this.logger.addLog({
                 type: 'info',
                 title: 'getResourceBookingItem',
@@ -869,16 +905,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   bookingList: (_params$bookingList = params.bookingList) === null || _params$bookingList === void 0 ? void 0 : _params$bookingList.length,
                   bookings: bookings.length,
                   completedBookings: completedBookings.length,
-                  unpaidBookings: unpaidBookings.length
+                  unpaidBookings: unpaidBookings.length,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount
                 }
               });
               return _context6.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
                 resource_id: resourceId,
+                orderCount: orderCount,
+                bookingCount: bookingCount,
+                compeleteBookingCount: compeleteBookingCount,
                 bookings: bookings,
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 24:
+            case 27:
             case "end":
               return _context6.stop();
           }

package/dist/solution/Sales/types.d.ts

@@ -30,6 +30,9 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
+    orderCount: number;
+    bookingCount: number;
+    compeleteBookingCount: number;
     bookings: SalesResourceMatchedBooking[];
 }
 export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {

package/dist/solution/ScanOrder/types.d.ts

@@ -85,13 +85,13 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**

package/dist/solution/ScanOrder/types.js

@@ -14,13 +14,13 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 
 /**

package/dist/solution/ScanOrder/utils.js

@@ -381,14 +381,14 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var normalizedOpts = optArr.map(function (item) {
     var _item$price;
     return {
-      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
       price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
     };
   }).sort(function (p, q) {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
     if (p.num !== q.num) return p.num - q.num;

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Cart/utils/cartProduct.js

@@ -289,7 +289,7 @@ var formatOptionsToOrigin = (options) => {
   return options.map((d) => {
     return {
       num: d.num,
-      option_group_item_id: d.product_option_item_id,
+      option_group_item_id: d.option_group_item_id,
       option_group_id: d.option_group_id
     };
   });

package/lib/modules/Order/index.d.ts

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
+    private orderHooks?;
     private otherParams?;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
@@ -143,6 +144,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 视为 wallet pass；其它支付项保持不变。
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;
@@ -171,7 +173,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;