@pisell/pisellos 2.3.40 → 2.3.41

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

@@ -1,6 +1,5 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
-import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -97,7 +96,6 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
-    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;
@@ -146,7 +144,6 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/lib/solution/VenueBooking/utils/resource.js

@@ -69,7 +69,6 @@ function buildResourceProductMap(products) {
         const mapping = {
           productId: product.id,
           productTitle: product.title,
-          formName: resource.title,
           resourceName: resource.title,
           formId: resource.id,
           price: product.price || "0.00",

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,6 +12,10 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;
@@ -25,10 +29,6 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -109,12 +109,10 @@ function buildPriceBreakdown(params) {
 }
 function buildVenueResourceMetadata(params) {
   const { mapping, rawResource } = params;
-  const combined = rawResource == null ? void 0 : rawResource.combined_resource;
-  const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
   return {
-    form_name: mapping.formName ?? mapping.resourceName,
-    resource_name: (rawResource == null ? void 0 : rawResource.main_field) ?? mapping.resourceName,
-    combined_resource: isCombined ? combined : null
+    form_name: (rawResource == null ? void 0 : rawResource.form_name) ?? "",
+    resource_name: (rawResource == null ? void 0 : rawResource.main_field) ?? mapping.resourceName ?? "",
+    combined_resource: (rawResource == null ? void 0 : rawResource.combined_resource) ?? null
   };
 }
 function buildVenueBookingEntry(params) {
@@ -130,7 +128,7 @@ function buildVenueBookingEntry(params) {
     form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: buildVenueResourceMetadata({ mapping, rawResource })
+    metadata: {}
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map((child) => ({

package/lib/solution/index.d.ts

@@ -8,4 +8,3 @@ export * from './Sales';
 export * from './ScanOrder';
 export * from './BaseSales';
 export * from './VenueBooking';
-export * from './UnifiedBookingSales';

package/lib/solution/index.js

@@ -26,7 +26,6 @@ __reExport(solution_exports, require("./Sales"), module.exports);
 __reExport(solution_exports, require("./ScanOrder"), module.exports);
 __reExport(solution_exports, require("./BaseSales"), module.exports);
 __reExport(solution_exports, require("./VenueBooking"), module.exports);
-__reExport(solution_exports, require("./UnifiedBookingSales"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
@@ -38,6 +37,5 @@ __reExport(solution_exports, require("./UnifiedBookingSales"), module.exports);
   ...require("./Sales"),
   ...require("./ScanOrder"),
   ...require("./BaseSales"),
-  ...require("./VenueBooking"),
-  ...require("./UnifiedBookingSales")
+  ...require("./VenueBooking")
 });

package/lib/types/index.d.ts

@@ -6,7 +6,6 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
-    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];
@@ -48,6 +47,7 @@ export interface PisellCore {
     getModule: <T extends Module>(name: string) => T | null;
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
+    getModuleNames: () => string[];
     effects: {
         on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void) => () => void;

package/lib/utils/payment-number.d.ts

@@ -0,0 +1,9 @@
+export type PaymentNumberAppDataGetter = (key: string) => unknown;
+/**
+ * Resolve the synchronous fallback without caching runtime device data.
+ */
+export declare function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData: PaymentNumberAppDataGetter): string;
+/**
+ * Resolve the latest device segment when a new payment number is generated.
+ */
+export declare function resolvePaymentNumberDevicePrefix(getAppData: PaymentNumberAppDataGetter): Promise<string>;

package/lib/utils/payment-number.js

@@ -0,0 +1,64 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/payment-number.ts
+var payment_number_exports = {};
+__export(payment_number_exports, {
+  resolvePaymentNumberDevicePrefix: () => resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId: () => resolvePaymentNumberDevicePrefixFromDeviceId
+});
+module.exports = __toCommonJS(payment_number_exports);
+function normalizeNonEmptyString(value) {
+  if (value === void 0 || value === null)
+    return null;
+  if (typeof value !== "string" && typeof value !== "number")
+    return null;
+  if (typeof value === "number" && !Number.isFinite(value))
+    return null;
+  const normalized = String(value).trim();
+  return normalized || null;
+}
+function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData) {
+  try {
+    const deviceId = normalizeNonEmptyString(getAppData("device_id"));
+    if (deviceId && deviceId !== "0")
+      return deviceId.slice(-2);
+  } catch {
+  }
+  return "LOCAL";
+}
+async function resolvePaymentNumberDevicePrefix(getAppData) {
+  try {
+    const getAsyncIotDeviceInfo = getAppData("async_iot_device_info");
+    if (typeof getAsyncIotDeviceInfo === "function") {
+      const info = await getAsyncIotDeviceInfo();
+      const shortNumber = normalizeNonEmptyString(
+        info == null ? void 0 : info.short_number
+      );
+      if (shortNumber && shortNumber !== "0")
+        return shortNumber;
+    }
+  } catch {
+  }
+  return resolvePaymentNumberDevicePrefixFromDeviceId(getAppData);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId
+});

package/package.json

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

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

@@ -1,48 +0,0 @@
-import { Module, PisellCore, ModuleOptions } from '../../types';
-import { BaseModule } from '../BaseModule';
-import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
-export * from './types';
-export * from './utils';
-export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
-    protected defaultName: string;
-    protected defaultVersion: string;
-    private store;
-    private request;
-    private cacheId;
-    private openCache;
-    private fatherModule;
-    private isLoading;
-    private error;
-    /** 已加载过表单数据的 form_id 缓存标记 */
-    private loadedFormIds;
-    private window;
-    constructor(name?: string, version?: string);
-    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    /** 统一提交 formMap，仅此处触发 store changed */
-    private commitFormMap;
-    /** 通知 UI 刷新（数据未变但需要 re-read 的场景） */
-    private notifyFormMapChanged;
-    getHolderFormMap(): HolderFormMap;
-    getHolderFormData(formId: number | string): IFormItemData | undefined;
-    setFormData(formId: number | string, data: Partial<IFormItemData>): void;
-    private ensureFormItem;
-    private hasFormData;
-    private patchFormMap;
-    fetchFormInfo(params: IFetchFormInfoParams): Promise<IFormInfo | IFormInfo[]>;
-    fetchRecords(params: IFetchFormRecordsParams): Promise<any>;
-    ensureFormData(params: IEnsureFormDataParams): Promise<IFormItemData>;
-    ensureFormByProduct(params: IEnsureFormByProductParams): Promise<IFormItemData | null>;
-    addFormRecord(params: IAddFormRecordParams): Promise<any>;
-    /**
-     * UI 层自行请求添加接口后，将返回记录合并到 holderMap 对应 form_id 的 records 中
-     */
-    appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
-    removeFormRecord(formId: number | string, formRecordId: number): void;
-    clearFormData(formId?: number | string): void;
-    /**
-     * 登录后按当前 holderMap 批量刷新所有表单的 records。
-     * 遍历 holderMap，从 form.form 中读取 form_id、shop_id，结合 customer_id 重新拉取记录。
-     */
-    refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
-    storeChange(path?: string): void;
-}