@pisell/pisellos 0.10.40 → 0.10.41

package/dist/solution/BookingTicket/index.js

@@ -184,6 +184,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlightTarget", null);
     _defineProperty(_assertThisInitialized(_this), "openDataTarget", null);
+    _defineProperty(_assertThisInitialized(_this), "customerResolveRequests", new Map());
     return _this;
   }
   _createClass(BookingTicketImpl, [{
@@ -755,31 +756,43 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
               isUserPlatform = USER_PLATFORM.includes(this.otherParams.platform); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
               if (!(!hasOrderCustomer && extractedCustomerId && !isUserPlatform)) {
-                _context10.next = 12;
+                _context10.next = 18;
                 break;
               }
-              _context10.next = 12;
+              _context10.prev = 10;
+              _context10.next = 13;
               return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
-            case 12:
+            case 13:
+              _context10.next = 18;
+              break;
+            case 15:
+              _context10.prev = 15;
+              _context10.t0 = _context10["catch"](10);
+              // 客户映射失败不能阻断原有 Pass 的可用性、展示或优惠处理。
+              console.warn('[BookingTicket] scan discount customer resolve failed', {
+                customerId: extractedCustomerId,
+                error: _context10.t0
+              });
+            case 18:
               if (!raw.isAvailable) {
-                _context10.next = 19;
+                _context10.next = 25;
                 break;
               }
-              _context10.next = 15;
+              _context10.next = 21;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 15:
+            case 21:
               this.store.order.persistTempOrder();
               tempOrder = this.store.order.ensureTempOrder();
-              _context10.next = 19;
+              _context10.next = 25;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: this.store.order.getDiscountList(),
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 19:
+            case 25:
               return _context10.abrupt("return", _objectSpread(_objectSpread({
                 isAvailable: raw.isAvailable
               }, raw.isAccepted !== undefined ? {
@@ -789,11 +802,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
               }));
-            case 20:
+            case 26:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this);
+        }, _callee10, this, [[10, 15]]);
       }));
       function scanPromotionCode(_x4, _x5) {
         return _scanPromotionCode.apply(this, arguments);
@@ -875,54 +888,51 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "resolveCustomerById",
     value: function () {
       var _resolveCustomerById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(customerId) {
-        var _result$list;
-        var localCustomers, localCustomer, normalizedLocalCustomer, result, remoteCustomer, detailCustomer;
+        var _this2 = this;
+        var rawCustomerId, numericCustomerId, normalizedCustomerId, existingRequest, request;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              localCustomers = this.store.customer.getCustomers();
-              localCustomer = this.findCustomerById(localCustomers, customerId);
-              normalizedLocalCustomer = localCustomer ? this.normalizeCustomer(localCustomer) : null;
-              if (!(normalizedLocalCustomer && this.hasUsableCustomerDetails(normalizedLocalCustomer))) {
-                _context12.next = 5;
+              rawCustomerId = String(customerId !== null && customerId !== void 0 ? customerId : '').trim();
+              numericCustomerId = Number(rawCustomerId);
+              if (!(!rawCustomerId || !Number.isInteger(numericCustomerId) || numericCustomerId <= 1)) {
+                _context12.next = 4;
                 break;
               }
-              return _context12.abrupt("return", normalizedLocalCustomer);
-            case 5:
-              _context12.next = 7;
-              return this.store.customer.queryCustomerList({
-                ids: [customerId],
-                skip: 1,
-                num: 1
-              });
-            case 7:
-              result = _context12.sent;
-              remoteCustomer = this.findCustomerById((result === null || result === void 0 ? void 0 : result.list) || [], customerId) || (result === null || result === void 0 || (_result$list = result.list) === null || _result$list === void 0 ? void 0 : _result$list[0]) || null;
-              if (!remoteCustomer) {
-                _context12.next = 11;
+              return _context12.abrupt("return", null);
+            case 4:
+              normalizedCustomerId = String(numericCustomerId);
+              existingRequest = this.customerResolveRequests.get(normalizedCustomerId);
+              if (!existingRequest) {
+                _context12.next = 8;
                 break;
               }
-              return _context12.abrupt("return", this.normalizeCustomer(remoteCustomer));
-            case 11:
-              _context12.prev = 11;
-              _context12.next = 14;
-              return this.store.customer.queryCustomerDetail(customerId);
-            case 14:
-              detailCustomer = _context12.sent;
-              return _context12.abrupt("return", detailCustomer ? this.normalizeCustomer(detailCustomer) : null);
-            case 18:
-              _context12.prev = 18;
-              _context12.t0 = _context12["catch"](11);
-              console.warn('[BookingTicket] resolveCustomerById detail request failed', {
-                customerId: customerId,
-                error: _context12.t0
+              return _context12.abrupt("return", existingRequest);
+            case 8:
+              request = this.request.post("/customer/resolve/".concat(encodeURIComponent(normalizedCustomerId)), {
+                with_franchisor_data: 1,
+                with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord']
+              }).then(function (result) {
+                var customer = result === null || result === void 0 ? void 0 : result.data;
+                var resolvedCustomerId = Number(customer && _typeof(customer) === 'object' && !Array.isArray(customer) ? _this2.getRawCustomerId(customer) : NaN);
+                if ((result === null || result === void 0 ? void 0 : result.status) !== true || (result === null || result === void 0 ? void 0 : result.code) !== 200 || !customer || _typeof(customer) !== 'object' || Array.isArray(customer) || !Number.isInteger(resolvedCustomerId) || resolvedCustomerId <= 1) {
+                  var error = new Error((result === null || result === void 0 ? void 0 : result.message) || 'Customer resolve failed');
+                  error.code = result === null || result === void 0 ? void 0 : result.code;
+                  throw error;
+                }
+                return _this2.normalizeCustomer(customer);
+              }).finally(function () {
+                if (_this2.customerResolveRequests.get(normalizedCustomerId) === request) {
+                  _this2.customerResolveRequests.delete(normalizedCustomerId);
+                }
               });
-              return _context12.abrupt("return", null);
-            case 22:
+              this.customerResolveRequests.set(normalizedCustomerId, request);
+              return _context12.abrupt("return", request);
+            case 11:
             case "end":
               return _context12.stop();
           }
-        }, _callee12, this, [[11, 18]]);
+        }, _callee12, this);
       }));
       function resolveCustomerById(_x7) {
         return _resolveCustomerById.apply(this, arguments);
@@ -934,17 +944,6 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function resolveCustomerByDiscountCustomerId(customerId) {
       return this.resolveCustomerById(customerId);
     }
-  }, {
-    key: "findCustomerById",
-    value: function findCustomerById() {
-      var _this2 = this;
-      var customers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      var customerId = arguments.length > 1 ? arguments[1] : undefined;
-      return customers.find(function (customer) {
-        var rawId = _this2.getRawCustomerId(customer);
-        return rawId !== null && String(rawId) === String(customerId);
-      }) || null;
-    }
   }, {
     key: "normalizeCustomer",
     value: function normalizeCustomer(customer) {
@@ -967,11 +966,6 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var raw = customer;
       return (_ref9 = (_ref10 = (_customer$id = customer.id) !== null && _customer$id !== void 0 ? _customer$id : raw.customer_id) !== null && _ref10 !== void 0 ? _ref10 : raw.customerId) !== null && _ref9 !== void 0 ? _ref9 : null;
     }
-  }, {
-    key: "hasUsableCustomerDetails",
-    value: function hasUsableCustomerDetails(customer) {
-      return !!(customer.name || customer.phone || customer.email || customer.display_name || customer.customer_name);
-    }
 
     /**
      * 更新当前预约的 appointment_status。
@@ -2695,6 +2689,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 getOrderCustomerSnapshot: function getOrderCustomerSnapshot() {
                   return _this7.getOrderCustomerSnapshot();
                 },
+                resolveCustomerById: function resolveCustomerById(customerId) {
+                  return _this7.resolveCustomerById(customerId);
+                },
                 getBusinessCode: function getBusinessCode() {
                   var _this7$otherParams;
                   return (_this7$otherParams = _this7.otherParams) === null || _this7$otherParams === void 0 ? void 0 : _this7$otherParams.businessCode;

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

@@ -5,6 +5,7 @@ import { GlobalScanFormattedResult } from './formatGlobalScan';
 export interface GlobalScanApplyHost {
     setOrderCustomer(customer: ICustomer | null): void;
     getOrderCustomerSnapshot(): ICustomer | null;
+    resolveCustomerById?(customerId: string | number): Promise<ICustomer | null>;
     getBusinessCode(): string | undefined;
     buildAddProductCtx(extra?: Record<string, any>): Record<string, any>;
     decideAddProduct(item: any, options?: Record<string, any>): AddProductDecision;
@@ -26,6 +27,7 @@ export interface GlobalScanApplyHost {
     addProductToOrder(product: any, booking?: any): Promise<any>;
     refreshWalletAssets?(params?: {
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<any>;
     scanWalletAsset?(code: string): Promise<{
         type: 'walletCode' | 'normalCode';