@pisell/pisellos 2.1.154 → 2.1.156

package/dist/modules/Holder/types.d.ts

@@ -0,0 +1,123 @@
+import { ProductData } from '../Product/types';
+/**
+ * 商品 holder 配置
+ */
+export interface IHolderConfig {
+    required?: number;
+    resource_id: number;
+    status?: string;
+    [key: string]: any;
+}
+/**
+ * 表单记录
+ */
+export interface IFormRecord {
+    form_id: number;
+    form_record_id: number;
+    main_field: string;
+    customer_cover?: string;
+    created_at?: string;
+    customer_id?: number;
+    [key: string]: any;
+}
+/**
+ * 表单配置/定义
+ */
+export interface IFormInfo {
+    form_id: number;
+    name: string;
+    fields?: Record<string, any>[];
+    [key: string]: any;
+}
+/**
+ * 单个 form_id 下的数据结构
+ */
+export interface IFormItemData {
+    records: IFormRecord[];
+    form: IFormInfo | Record<string, any>;
+}
+/**
+ * form_id 为 key 的 map 结构，如 948: { records: [], form: {} }
+ */
+export type HolderFormMap = Record<string, IFormItemData>;
+/**
+ * Holder 模块 reactive store，仅 holderMap 会触发 changed 事件
+ */
+export interface HolderState {
+    holderMap: HolderFormMap;
+}
+export interface IFetchFormInfoParams {
+    url?: string;
+    query: {
+        form_id: string | number;
+    };
+    useCache?: boolean;
+}
+export interface IFetchFormRecordsParams {
+    url?: string;
+    query: {
+        customer_id?: number;
+        form_id: string | number;
+        shop_id: string | number;
+        num?: number;
+        skip?: number;
+        [key: string]: any;
+    };
+    useCache?: boolean;
+}
+export interface IAddFormRecordParams {
+    url?: string;
+    body: {
+        form_id: number;
+        shop_id: number | string;
+        customer_id?: number;
+        [key: string]: any;
+    };
+}
+/**
+ * UI 层自行调用添加接口后，将返回记录写入 holderMap
+ */
+export interface IAppendFormRecordParams {
+    /** 接口返回的 data，或完整响应 { data: {...} } */
+    record: IFormRecord | Record<string, any>;
+    /** 可选，未传则从 record.form_id 读取 */
+    form_id?: number | string;
+}
+export interface IEnsureFormDataParams {
+    form_id: number | string;
+    shop_id: number | string;
+    customer_id?: number;
+    useCache?: boolean;
+    forceRefresh?: boolean;
+    formInfoUrl?: string;
+    recordsUrl?: string;
+    skip?: number;
+    num?: number;
+}
+export interface IEnsureFormByProductParams {
+    product: ProductData | Record<string, any>;
+    customer_id?: number;
+    shop_id?: number | string;
+    useCache?: boolean;
+}
+export interface IRefreshAllFormRecordsParams {
+    customer_id?: number;
+    useCache?: boolean;
+    recordsUrl?: string;
+    num?: number;
+    skip?: number;
+}
+export interface HolderModuleAPI {
+    getHolderFormMap: () => HolderFormMap;
+    getHolderFormData: (formId: number | string) => IFormItemData | undefined;
+    setFormData: (formId: number | string, data: Partial<IFormItemData>) => void;
+    fetchFormInfo: (params: IFetchFormInfoParams) => Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords: (params: IFetchFormRecordsParams) => Promise<IFormRecord[]>;
+    ensureFormData: (params: IEnsureFormDataParams) => Promise<IFormItemData>;
+    ensureFormByProduct: (params: IEnsureFormByProductParams) => Promise<IFormItemData | null>;
+    addFormRecord: (params: IAddFormRecordParams) => Promise<IFormRecord>;
+    appendFormRecord: (params: IAppendFormRecordParams) => IFormRecord;
+    removeFormRecord: (formId: number | string, formRecordId: number) => void;
+    clearFormData: (formId?: number | string) => void;
+    refreshAllFormRecords: (params?: IRefreshAllFormRecordsParams) => Promise<HolderFormMap>;
+}

package/dist/modules/Holder/types.js

@@ -0,0 +1 @@
+export {};

package/dist/modules/Holder/utils.d.ts

@@ -0,0 +1,13 @@
+import { ProductData } from '../Product/types';
+import { IFormItemData, IHolderConfig } from './types';
+export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
+export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
+export declare function normalizeFormId(formId: number | string): number;
+export declare function createEmptyFormItemData(): {
+    records: any[];
+    form: Record<string, any>;
+};
+export declare function resolveFormMetaFromHolderItem(mapKey: string, item: IFormItemData): {
+    form_id: string | number;
+    shop_id: number | string;
+} | null;

package/dist/modules/Holder/utils.js

@@ -0,0 +1,34 @@
+export function getProductHolderConfig(product) {
+  var _product$holder_confi, _product$origin;
+  if (!product) return null;
+  var config = (_product$holder_confi = product === null || product === void 0 ? void 0 : product.holder_config) !== null && _product$holder_confi !== void 0 ? _product$holder_confi : product === null || product === void 0 || (_product$origin = product.origin) === null || _product$origin === void 0 ? void 0 : _product$origin.holder_config;
+  if (config !== null && config !== void 0 && config.status && (config === null || config === void 0 ? void 0 : config.status) !== 'enable') return null;
+  if (!(config !== null && config !== void 0 && config.resource_id)) return null;
+  return config;
+}
+export function getFormIdFromHolderConfig(config) {
+  return Number(config === null || config === void 0 ? void 0 : config.resource_id);
+}
+export function normalizeFormId(formId) {
+  return Number(formId);
+}
+export function createEmptyFormItemData() {
+  return {
+    records: [],
+    form: {}
+  };
+}
+export function resolveFormMetaFromHolderItem(mapKey, item) {
+  var _ref, _ref2, _nestedForm$id, _nestedForm$shop_id;
+  var formInfo = item.form || {};
+  var nestedForm = formInfo.form || {};
+  var form_id = normalizeFormId((_ref = (_ref2 = (_nestedForm$id = nestedForm.id) !== null && _nestedForm$id !== void 0 ? _nestedForm$id : formInfo.form_id) !== null && _ref2 !== void 0 ? _ref2 : formInfo.id) !== null && _ref !== void 0 ? _ref : mapKey);
+  var shop_id = (_nestedForm$shop_id = nestedForm.shop_id) !== null && _nestedForm$shop_id !== void 0 ? _nestedForm$shop_id : formInfo.shop_id;
+  if (shop_id === undefined || shop_id === null || shop_id === '') {
+    return null;
+  }
+  return {
+    form_id: form_id,
+    shop_id: shop_id
+  };
+}

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

@@ -57,6 +57,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private getTempOrderStorageKey;
     private restoreTempOrderFromStorage;
     persistTempOrder(): void;
+    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     ensureTempOrder(): ScanOrderTempOrder;
     restoreOrder(): ScanOrderTempOrder;
@@ -83,7 +84,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -25,7 +25,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, filterProductsForScanOrderMore, isTempOrder } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, filterProductsForScanOrderMore, isTempOrder } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
@@ -439,6 +439,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!this.window) return;
       this.window.localStorage.setItem(key, JSON.stringify(this.store.tempOrder));
     }
+  }, {
+    key: "notifyTempOrderChanged",
+    value: function notifyTempOrderChanged() {
+      if (!this.store.tempOrder) return;
+      this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
+        products: _toConsumableArray(this.store.tempOrder.products),
+        bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
+      });
+      this.persistTempOrder();
+    }
 
     // ─── TempOrder: 创建 & 获取 ───
   }, {
@@ -860,6 +870,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
+      var _this2 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -877,6 +888,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
+          var _params$extraData;
           if (!item._origin.duration) {
             var _generateDuration = generateDuration(item),
               duration = _generateDuration.duration,
@@ -887,6 +899,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var discountList = getAllDiscountList(item);
           item._origin.product.discount_list = discountList;
 
+          // 为预约补齐 holder 信息
+          if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
+            ensureCartItemOriginHolder(item, _this2.window);
+          }
+
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;

package/dist/modules/Order/types.d.ts

@@ -235,6 +235,8 @@ export interface OrderModuleAPI {
     updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     persistTempOrder: () => void;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

package/dist/modules/Order/utils.d.ts

@@ -2,6 +2,7 @@ import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
 import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { RulesParamsHooks } from '../Rules/types';
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -86,6 +87,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export declare function createUuidV4(): string;
 export declare function isTempOrder(data: any): data is ScanOrderTempOrder;

package/dist/modules/Order/utils.js

@@ -18,6 +18,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; }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
+import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
@@ -259,10 +260,41 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
     return item.form_record_ids.length > 0;
   }); // 过滤掉没有有效记录的表单
 };
+function getCustomerIdFromStorage(window) {
+  try {
+    var _window$getLocalStora;
+    var customer = JSON.parse((window === null || window === void 0 || (_window$getLocalStora = window.getLocalStorage) === null || _window$getLocalStora === void 0 ? void 0 : _window$getLocalStora.call(window, 'customer')) || '{}');
+    var customerId = Number(customer === null || customer === void 0 ? void 0 : customer.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+}
+
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export function ensureCartItemOriginHolder(cartItem, window) {
+  var _cartItem$_origin, _cartItem$_productIni;
+  if (cartItem !== null && cartItem !== void 0 && (_cartItem$_origin = cartItem._origin) !== null && _cartItem$_origin !== void 0 && _cartItem$_origin.holder) {
+    return;
+  }
+  var holderConfig = getProductHolderConfig((_cartItem$_productIni = cartItem === null || cartItem === void 0 ? void 0 : cartItem._productInit) !== null && _cartItem$_productIni !== void 0 ? _cartItem$_productIni : cartItem === null || cartItem === void 0 ? void 0 : cartItem._productOrigin);
+  var formRecordId = cartItem === null || cartItem === void 0 ? void 0 : cartItem.holder_id;
+  if (!(holderConfig !== null && holderConfig !== void 0 && holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: getCustomerIdFromStorage(window),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
+;
 export var getAllDiscountList = function getAllDiscountList(cartItem) {
-  var _cartItem$_origin, _cartItem$_origin2;
-  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
-  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
+  var _cartItem$_origin2, _cartItem$_origin3;
+  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.discount_list) || [];
+  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin3 = cartItem._origin) === null || _cartItem$_origin3 === void 0 || (_cartItem$_origin3 = _cartItem$_origin3.product) === null || _cartItem$_origin3 === void 0 ? void 0 : _cartItem$_origin3.product_bundle) || []).forEach(function (item) {
     discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     item.discount_list = undefined;
   });

package/dist/modules/Product/types.d.ts

@@ -189,6 +189,13 @@ export interface ProductData {
     };
     /** 购物车行键，用于唯一标识购物车中的商品，用于相同 SKU商品合并 */
     rowKey?: string;
+    /** holder 表单配置 */
+    holder_config?: {
+        required?: number;
+        resource_id?: number;
+        status?: string;
+        [key: string]: any;
+    };
 }
 /**
  * 商品媒体信息接口

package/dist/modules/index.d.ts

@@ -16,3 +16,4 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './Holder';

package/dist/modules/index.js

@@ -15,4 +15,5 @@ export * from "./SalesSummary";
 export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
-export * from "./OpenData";
+export * from "./OpenData";
+export * from "./Holder";

package/dist/plugins/window.d.ts

@@ -14,6 +14,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -10,6 +10,7 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
+import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -126,6 +127,20 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules").HolderFormMap;
+    /**
+     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
+     */
+    refreshAllHolderFormRecords(params?: {
+        customer_id?: number;
+    }): Promise<import("../../modules").HolderFormMap>;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
@@ -310,7 +325,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;