@pisell/pisellos 0.10.66 → 0.10.67

package/dist/solution/UnifiedBookingSales/index.js

@@ -2152,7 +2152,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               (_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 || (_this$store$customer$ = _this$store$customer.setSelectedCustomer) === null || _this$store$customer$ === void 0 || _this$store$customer$.call(_this$store$customer, authenticatedCustomer);
               this.setOrderCustomer(authenticatedCustomer);
               _context8.next = 15;
-              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh()]);
+              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh(), this.waitForOrderCustomerContactInfo()]);
             case 15:
               return _context8.abrupt("return", true);
             case 16:

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 6 | 5 | 1 | 2 | 3 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -32,6 +32,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private orderCustomerDiscountRefreshCustomerId;
     private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
+    private orderCustomerContactRequest;
     private readonly customerResolveRequests;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
@@ -276,6 +277,16 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOrderCustomer(customer: ICustomer | null, options?: {
         source?: OrderCustomerChangePayload['source'];
     }): void;
+    private resetOrderCustomerContactInfo;
+    /** Explicit edits, including clearing the contact, must win over a pending default. */
+    updateTempOrderContactsInfo(contact: Record<string, any> | null): Record<string, any> | null;
+    private getCustomerContactScope;
+    private getCustomerContactOrderKey;
+    replaceTempOrder(...args: Parameters<BaseSalesImpl['replaceTempOrder']>): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    private applyDefaultOrderCustomerContactInfo;
+    private prefillOrderCustomerContactInfo;
+    protected waitForOrderCustomerContactInfo(): Promise<void>;
+    validateContactInfo(): Promise<void>;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -349,7 +360,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -468,7 +479,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -40,6 +40,7 @@ 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");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
@@ -164,6 +165,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   orderCustomerDiscountRefreshCustomerId = null;
   orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
+  orderCustomerContactRequest = null;
   customerResolveRequests = new Map();
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
@@ -1028,9 +1030,15 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       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 仍为空时，
@@ -1063,6 +1071,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。
@@ -1082,6 +1189,8 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 清空下单客户（协议字段 + snapshot）。
    */
   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;
@@ -1902,6 +2011,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
     });
@@ -2017,6 +2131,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
    */
   async destroy() {
+    this.orderCustomerContactRequest = null;
     await super.destroy();
     try {
       this.scan?.removeAllListeners();

package/lib/solution/UnifiedBookingSales/index.js

@@ -1718,7 +1718,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": "0.10.66",
+  "version": "0.10.67",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",