@pisell/pisellos 2.2.315 → 2.2.317

package/lib/solution/BookingTicket/index.js

@@ -39,6 +39,9 @@ var _orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDis
 var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
+var _contactInfo = require("../../modules/OpenData/contactInfo");
+var _platform = require("../../utils/platform");
+var _lodashEs = require("lodash-es");
 var _types2 = require("../../server/modules/form/types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
@@ -163,6 +166,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   orderCustomerDiscountRefreshCustomerId = null;
   orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
+  orderCustomerContactRequest = null;
   customerResolveRequests = new Map();
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
@@ -300,6 +304,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async loadContactInfoOpenData() {
+    return this.store.openData ? this.getOpenData() : super.loadContactInfoOpenData();
+  }
   async loadFulfillmentItemRuleOpenData() {
     return this.store.openData ? this.getOpenData() : super.loadFulfillmentItemRuleOpenData();
   }
@@ -1035,7 +1042,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    */
   setOrderCustomer(customer, options) {
     if (!customer) {
-      this.clearOrderCustomer();
+      this.clearOrderCustomer({
+        preserveContactInfo: options?.source === 'detailHydrate'
+      });
       return;
     }
     const previousCustomerId = this.store.order.getOrderCustomer()?.customer_id;
@@ -1046,7 +1055,16 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
     }
+    if (!customerUnchanged && options?.source !== 'detailHydrate') {
+      this.resetOrderCustomerContactInfo();
+      this.store.order.updateTempOrderContactsInfo((0, _lodashEs.cloneDeep)((0, _contactInfo.extractCustomerContactInfo)(customer)));
+    }
     this.store.order.setOrderCustomer(patch, customer);
+    if (options?.source === 'detailHydrate') {
+      this.orderCustomerContactRequest = null;
+    } else {
+      this.prefillOrderCustomerContactInfo(customer, !customerUnchanged);
+    }
     const snapshotAfterOrderSet = this.store.order.getOrderCustomerSnapshot();
     if (customerUnchanged) {
       // hydrate 后 customer_id 已存在但 _extend.customerSnapshot 仍为空时，
@@ -1079,6 +1097,105 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       this.orderCustomerPromotionRefreshInFlight = null;
     });
   }
+  resetOrderCustomerContactInfo() {
+    this.orderCustomerContactRequest = null;
+    const order = this.getTempOrder();
+    if (order?._extend) delete order._extend.contactInfoEdited;
+  }
+
+  /** Explicit edits, including clearing the contact, must win over a pending default. */
+  updateTempOrderContactsInfo(contact) {
+    const order = this.store.order.ensureTempOrder();
+    order._extend || (order._extend = {});
+    order._extend.contactInfoEdited = true;
+    this.orderCustomerContactRequest = null;
+    return super.updateTempOrderContactsInfo(contact);
+  }
+  getCustomerContactScope() {
+    return JSON.stringify([this.getPickupTimingScope(), this.otherParams?.channel, this.otherParams?.shop_id, this.otherParams?.tenantId]);
+  }
+  getCustomerContactOrderKey() {
+    const order = this.getTempOrder();
+    // Cart mutations can replace the object without changing the order.
+    const identity = order?.external_sale_number || order?.request_unique_idempotency_token || order?._extend?.localId || order?.order_id;
+    return identity ? JSON.stringify([identity, order?.order_id]) : order;
+  }
+  async replaceTempOrder(...args) {
+    this.orderCustomerContactRequest = null;
+    return super.replaceTempOrder(...args);
+  }
+  async applyDefaultOrderCustomerContactInfo(contact) {
+    this.store.order.updateTempOrderContactsInfo((0, _lodashEs.cloneDeep)(contact));
+    // Metadata may finish after promotion/discount refresh; publish the updated cart explicitly.
+    await this.effectsEmit('onTempOrderReplaced', {
+      tempOrder: this.getTempOrder()
+    });
+  }
+  prefillOrderCustomerContactInfo(customer, customerChanged) {
+    const order = this.getTempOrder();
+    const customerId = Number(order?.customer_id);
+    if (!order || !Number.isInteger(customerId) || customerId <= 1 || order.contacts_info != null || order._extend?.contactInfoEdited) return;
+    // A restored new cart may already have its customer ID. Existing sales keep their snapshot,
+    // even when it is empty; only an explicit customer switch replaces it.
+    if (!customerChanged && order.order_id && !String(order.order_id).startsWith('local_order')) return;
+    const contact = (0, _contactInfo.extractCustomerContactInfo)(customer);
+    if (contact) {
+      this.orderCustomerContactRequest = null;
+      void this.applyDefaultOrderCustomerContactInfo(contact);
+      return;
+    }
+    // A relation explicitly returned as null is authoritative. Only a missing relation needs fetching.
+    if (customer.contacts_info !== undefined) return;
+    const userPlatform = (0, _platform.isCustomerUserPlatform)(this.otherParams?.platform);
+    const getAuthenticatedCustomerId = () => Number(this.core?.getPlugin?.('user')?.get?.()?.id);
+    if (userPlatform && getAuthenticatedCustomerId() !== customerId) return;
+    const scope = this.getCustomerContactScope();
+    const orderKey = this.getCustomerContactOrderKey();
+    const previous = this.orderCustomerContactRequest;
+    if (previous?.orderKey === orderKey && previous.customerId === customerId && previous.scope === scope) return;
+    const pending = {
+      orderKey,
+      customerId,
+      scope,
+      promise: Promise.resolve()
+    };
+    this.orderCustomerContactRequest = pending;
+    const loadContact = async () => {
+      if (userPlatform) {
+        // Same endpoint as BookingByStep.getContactInfo; the PC/H5 host adds /h5 and login headers.
+        const result = await this.request.get('/customer/metadata', {
+          key: 'contacts_info'
+        });
+        if (result?.code !== 200 || result?.status === false) throw new Error('Customer contact lookup failed');
+        return (0, _contactInfo.isContactRecord)(result.data) ? result.data : null;
+      }
+      // POS and physical Kiosk share the /shop request plugin and current-shop customer resolver.
+      const resolved = await this.resolveCustomerById(customerId);
+      return Number(resolved?.id) === customerId ? (0, _contactInfo.extractCustomerContactInfo)(resolved) : null;
+    };
+    pending.promise = loadContact().then(async value => {
+      const current = this.getTempOrder();
+      if (this.orderCustomerContactRequest !== pending || this.getCustomerContactOrderKey() !== orderKey || Number(current?.customer_id) !== customerId || scope !== this.getCustomerContactScope() || current?._extend?.contactInfoEdited || current?.contacts_info != null || userPlatform && getAuthenticatedCustomerId() !== customerId) return;
+      if (value) await this.applyDefaultOrderCustomerContactInfo(value);
+    }).catch(() => {
+      // A failed default does not prevent manual entry; a subsequent sync can retry.
+      if (this.orderCustomerContactRequest === pending) this.orderCustomerContactRequest = null;
+      console.warn('[BookingTicket] Failed to load saved customer contact information');
+    });
+  }
+  waitForOrderCustomerContactInfo() {
+    return this.orderCustomerContactRequest?.promise ?? Promise.resolve();
+  }
+  async validateContactInfo() {
+    const orderKey = this.getCustomerContactOrderKey();
+    const customerId = this.getTempOrder()?.customer_id;
+    const scope = this.getCustomerContactScope();
+    await this.waitForOrderCustomerContactInfo();
+    if (this.getCustomerContactOrderKey() !== orderKey || this.getTempOrder()?.customer_id !== customerId || this.getCustomerContactScope() !== scope) {
+      throw new Error('The order changed. Please try again.');
+    }
+    await super.validateContactInfo();
+  }
 
   /**
    * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
@@ -1097,7 +1214,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   /**
    * 清空下单客户（协议字段 + snapshot）。
    */
-  clearOrderCustomer() {
+  clearOrderCustomer(options) {
+    this.orderCustomerContactRequest = null;
+    if (!options?.preserveContactInfo) this.resetOrderCustomerContactInfo();
+    if (!options?.preserveContactInfo) this.store.order.updateTempOrderContactsInfo(null);
     this.store.order.clearOrderCustomer();
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;
@@ -1667,7 +1787,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
    */
   buildNormalProductCacheItemFromOrderLine(input) {
-    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)(input);
+    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)({
+      ...input,
+      holder_relations: input.holder_relations ?? this.store.order?.getTempOrder()?.holder_relations
+    });
   }
 
   /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
@@ -1900,6 +2023,11 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async setOtherParams(params, {
     cover = false
   } = {}) {
+    const nextParams = cover ? params : {
+      ...this.otherParams,
+      ...params
+    };
+    if (['businessCode', 'business_code', 'channel', 'platform', 'shop_id', 'tenantId', 'cacheId'].some(key => nextParams?.[key] !== this.otherParams?.[key])) this.orderCustomerContactRequest = null;
     await super.setOtherParams(params, {
       cover
     });
@@ -2015,6 +2143,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
    */
   async destroy() {
+    this.orderCustomerContactRequest = null;
     await super.destroy();
     try {
       this.scan?.removeAllListeners();

package/lib/solution/ScanOrder/index.js

@@ -797,6 +797,7 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
   }
 
   // ScanOrder 提交 payload enhancer：
+  // - 新单有桌台上下文但无 booking 时，补建基础预约（通用 Order 已不再自动生成）
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
   // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -818,7 +819,8 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
     };
     return (payload, {
       bookingUuid,
-      tempOrder
+      tempOrder,
+      now
     }) => {
       const resourceId = String(resourceState?.relationId ?? '').trim();
       const hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
@@ -855,7 +857,31 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       } : undefined;
       const ruleProductUid = ruleProduct ? (0, _utils2.createUuidV4)() : undefined;
       const bookingCapacityDimensionId = (0, _utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => {
+      let bookings = payload.bookings || [];
+      if (!tempOrder.order_id && bookings.length === 0) {
+        const bookingStart = (0, _dayjs.default)(now);
+        const bookingDuration = (0, _utils2.resolveTableOccupancyDuration)(tempOrder);
+        const bookingEnd = bookingStart.add(bookingDuration, 'minute');
+        bookings = [(0, _utils2.normalizeSubmitBooking)({
+          relation_id: 0,
+          form_id: 0,
+          start_time: bookingStart.format('HH:mm'),
+          start_date: bookingStart.format('YYYY-MM-DD'),
+          end_time: bookingEnd.format('HH:mm'),
+          end_date: bookingEnd.format('YYYY-MM-DD'),
+          duration: bookingDuration,
+          metadata: {
+            unique_identification_number: bookingUuid
+          },
+          select_date: bookingStart.format('YYYY-MM-DD'),
+          is_all: false,
+          like_status: 'common',
+          schedule_id: 0,
+          relation_type: '',
+          number: 1
+        })];
+      }
+      const nextBookings = bookings.map((booking, idx) => {
         const metadata = {
           ...(booking.metadata || {})
         };
@@ -1273,29 +1299,40 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       if (!Number.isFinite(productId) || targetQuantity <= 0) continue;
       if (Number.isNaN(productVariantId)) continue;
       const sourceItem = productSourceMap.get((0, _utils.buildProductKey)(productId, productVariantId)) || productSourceMap.get((0, _utils.buildProductKey)(productId, 0)) || null;
+      const sourceTitle = sourceItem?.product_title || sourceItem?.title || sourceItem?.name;
+      const productTitle = typeof sourceTitle === 'string' ? {
+        auto: sourceTitle
+      } : sourceTitle;
+      // 标准标题在归一化后补入，供购物车展示，并由 Order 在折扣重算时保留。
+      const displayFields = productTitle ? {
+        product_title: productTitle
+      } : {};
       const productIndex = (0, _utils.getProductIdentityIndex)(tempOrder.products, {
         product_id: productId,
         product_variant_id: productVariantId
       });
       if (productIndex === -1) {
         const sellingPrice = (0, _utils.toPriceString)(sourceItem?.price ?? sourceItem?.selling_price, '0.00');
-        tempOrder.products.push((0, _utils.normalizeOrderProduct)({
-          ...sourceItem,
-          product_id: productId,
-          product_variant_id: productVariantId,
-          num: targetQuantity,
-          selling_price: sellingPrice,
-          original_price: sellingPrice,
-          metadata: {
-            item_rule_prefill: true,
-            item_rule_id: prefillItem.ruleId
-          },
-          _origin: {
-            ...(sourceItem || {}),
-            item_rule_prefill: true,
-            item_rule_id: prefillItem.ruleId
-          }
-        }));
+        tempOrder.products.push({
+          ...(0, _utils.normalizeOrderProduct)({
+            ...sourceItem,
+            product_id: productId,
+            product_variant_id: productVariantId,
+            num: targetQuantity,
+            selling_price: sellingPrice,
+            original_price: sellingPrice,
+            metadata: {
+              item_rule_prefill: true,
+              item_rule_id: prefillItem.ruleId
+            },
+            _origin: {
+              ...(sourceItem || {}),
+              item_rule_prefill: true,
+              item_rule_id: prefillItem.ruleId
+            }
+          }),
+          ...displayFields
+        });
         hasChanges = true;
         continue;
       }
@@ -1304,6 +1341,7 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       const delta = targetQuantity - existedQuantity;
       const nextProduct = {
         ...targetProduct,
+        ...displayFields,
         ...(delta > 0 ? {
           num: (0, _utils.getSafeProductNum)(existedQuantity + delta)
         } : {}),
@@ -1318,8 +1356,9 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
         } : targetProduct._origin
       };
       const hasQuantityChanged = delta > 0;
+      const hasTitleChanged = Boolean(productTitle && JSON.stringify(targetProduct.product_title) !== JSON.stringify(productTitle));
       const hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || targetProduct._origin?.name !== sourceItem?.name || targetProduct._origin?.title !== sourceItem?.title || targetProduct._origin?.price !== sourceItem?.price));
-      if (hasQuantityChanged || hasOriginChanged) {
+      if (hasQuantityChanged || hasTitleChanged || hasOriginChanged) {
         tempOrder.products[productIndex] = nextProduct;
         hasChanges = true;
       }

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

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { OrderLocalizedText } from '../../modules/Order/types';
 /**
  * 扫码下单流程 hook
  */
@@ -43,6 +44,8 @@ export interface ScanOrderProductSku {
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
+    /** 与 Order 一致的商品展示名称。 */
+    product_title?: OrderLocalizedText;
     num: number;
     /** Product 或当前 Variant 的生产编码 */
     production_code?: string;

package/lib/solution/UnifiedBookingSales/index.js

@@ -1877,7 +1877,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     }
     this.store.customer?.setSelectedCustomer?.(authenticatedCustomer);
     this.setOrderCustomer(authenticatedCustomer);
-    await Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh()]);
+    await Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh(), this.waitForOrderCustomerContactInfo()]);
     return true;
   }
   isAuthenticatedCustomerUserPlatform() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.315",
+  "version": "2.2.317",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",