@pisell/pisellos 2.2.278 → 2.2.280

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

@@ -1,5 +1,6 @@
 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",
@@ -96,6 +97,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;
@@ -144,6 +146,7 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

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

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

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

@@ -12,10 +12,6 @@ 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;
@@ -29,6 +25,10 @@ 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/dist/solution/VenueBooking/utils/slotMerge.js

@@ -90,13 +90,15 @@ export function buildPriceBreakdown(params) {
   return entries;
 }
 export function buildVenueResourceMetadata(params) {
-  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
+  var _mapping$formName, _rawResource$main_fie;
   var mapping = params.mapping,
     rawResource = params.rawResource;
+  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
+  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
   return {
-    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
-    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
-    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
+    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
+    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
+    combined_resource: isCombined ? combined : null
   };
 }
 export function buildVenueBookingEntry(params) {
@@ -119,7 +121,10 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({
+      mapping: mapping,
+      rawResource: rawResource
+    })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

package/dist/solution/index.d.ts

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

package/dist/solution/index.js

@@ -7,4 +7,5 @@ export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
 export * from "./BaseSales";
-export * from "./VenueBooking";
+export * from "./VenueBooking";
+export * from "./UnifiedBookingSales";

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
+    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

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

@@ -1,51 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/BaseModule.d.ts

@@ -8,6 +8,7 @@ export declare class BaseModule {
     protected core: PisellCore;
     constructor(name?: string, version?: string);
     destroy(): void;
+    private isRecord;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey, }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/lib/modules/BaseModule.js

@@ -34,6 +34,9 @@ var BaseModule = class {
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }
+  isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+  }
   // 提供统一的缓存 module 里的数据的方法
   checkSaveCache({
     cacheId,
@@ -41,45 +44,29 @@ var BaseModule = class {
     store,
     cacheKey
   }) {
-    const window = this.core.getPlugin("window");
-    if (cacheId) {
+    if (!cacheId)
+      return;
+    try {
+      const window = this.core.getPlugin("window");
+      const sessionStorage = window == null ? void 0 : window.sessionStorage;
+      if (!sessionStorage)
+        return;
+      const storageKey = fatherModule || cacheId;
+      const rawCacheData = sessionStorage.getItem(storageKey);
+      const parsedCacheData = rawCacheData ? JSON.parse(rawCacheData) : {};
+      if (!this.isRecord(parsedCacheData))
+        return;
+      const cacheBucket = fatherModule ? this.isRecord(parsedCacheData[cacheId]) ? parsedCacheData[cacheId] : {} : parsedCacheData;
+      const moduleBucket = this.isRecord(cacheBucket[this.name]) ? cacheBucket[this.name] : {};
+      cacheKey.forEach((key) => {
+        moduleBucket[key] = store == null ? void 0 : store[key];
+      });
+      cacheBucket[this.name] = moduleBucket;
       if (fatherModule) {
-        const currentCacheData = window.sessionStorage.getItem(fatherModule);
-        let currentCacheDataObj = JSON.parse(currentCacheData || "{}");
-        if (!currentCacheData || !currentCacheDataObj[cacheId]) {
-          currentCacheDataObj = {
-            [cacheId]: {
-              [this.name]: {}
-            }
-          };
-        }
-        if (!currentCacheDataObj[cacheId][this.name]) {
-          currentCacheDataObj[cacheId][this.name] = {};
-        }
-        cacheKey.forEach((key) => {
-          currentCacheDataObj[cacheId][this.name][key] = store == null ? void 0 : store[key];
-        });
-        window.sessionStorage.setItem(
-          fatherModule,
-          JSON.stringify(currentCacheDataObj)
-        );
-      } else {
-        let currentCacheData = window.sessionStorage.getItem(cacheId);
-        let currentCacheDataObj = JSON.parse(currentCacheData || "{}");
-        if (!currentCacheDataObj) {
-          currentCacheDataObj = {};
-        }
-        if (!currentCacheDataObj[this.name]) {
-          currentCacheDataObj[this.name] = {};
-        }
-        cacheKey.forEach((key) => {
-          currentCacheDataObj[this.name][key] = store[key];
-        });
-        window.sessionStorage.setItem(
-          cacheId,
-          JSON.stringify(currentCacheDataObj)
-        );
+        parsedCacheData[cacheId] = cacheBucket;
       }
+      sessionStorage.setItem(storageKey, JSON.stringify(parsedCacheData));
+    } catch {
     }
   }
   effectsOn(eventType, callback) {

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -202,6 +202,8 @@ function buildCacheItemFromOrderLine(input) {
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
   const productCover = resolveProductCover(product, booking, sourceProduct);
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const hasBundle = Array.isArray(product.product_bundle) && product.product_bundle.length > 0;
+  const bundleEdit = product.bundle_edit ?? (hasBundle ? 0 : void 0);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
@@ -234,6 +236,7 @@ function buildCacheItemFromOrderLine(input) {
       product.discount_list,
       (_c = product.metadata) == null ? void 0 : _c.product_discount_reason
     ) || void 0,
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {}
   };
   const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");

package/lib/modules/BookingContext/utils/productExtend.js

@@ -83,12 +83,13 @@ function getTimeObj(params) {
   const { cacheItem, useStartTime, useDuration, ctx } = params;
   const isMultiDay = (0, import_serviceTimes.isMultiDayProduct)(cacheItem);
   const flexibleOption = getFlexibleOption({ cacheItem, useStartTime, ctx });
-  const baseSlices = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
+  const {
+    timeSlices,
+    durationSlicesBasedOnTime
+  } = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = ctx == null ? void 0 : ctx.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
     isMultiDay
   );
-  const timeSlices = [...baseSlices.timeSlices];
-  const durationSlicesBasedOnTime = [...baseSlices.durationSlicesBasedOnTime];
   if (flexibleOption) {
     durationSlicesBasedOnTime.unshift(flexibleOption);
   }

package/lib/modules/BookingContext/utils/timeSlices.js

@@ -38,10 +38,21 @@ __export(timeSlices_exports, {
 module.exports = __toCommonJS(timeSlices_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_flexible = require("./flexible");
+var timeSlicesCache = /* @__PURE__ */ new Map();
+function copyTimeSlices(result) {
+  return {
+    timeSlices: [...result.timeSlices],
+    durationSlicesBasedOnTime: [...result.durationSlicesBasedOnTime]
+  };
+}
 function sliceDayIntoFiveMinutes(config, isDay) {
+  const timeSlice = config && config.value || 5;
+  const cacheKey = isDay ? "days" : `minutes:${timeSlice}`;
+  const cached = timeSlicesCache.get(cacheKey);
+  if (cached)
+    return copyTimeSlices(cached);
   const startTime = (0, import_dayjs.default)().startOf("day");
   const endTime = (0, import_dayjs.default)().endOf("day");
-  const timeSlice = config && config.value || 5;
   const timeSlices = [];
   const durationSlicesBasedOnTime = [];
   let currentTime = startTime;
@@ -58,7 +69,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
       });
       currentDay += 1;
     }
-    return { timeSlices, durationSlicesBasedOnTime };
+    const result2 = { timeSlices, durationSlicesBasedOnTime };
+    timeSlicesCache.set(cacheKey, result2);
+    return copyTimeSlices(result2);
   }
   while (currentTime.isBefore(endTime)) {
     timeSlices.push({
@@ -73,7 +86,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
     });
     currentTime = nextTime;
   }
-  return { timeSlices, durationSlicesBasedOnTime };
+  const result = { timeSlices, durationSlicesBasedOnTime };
+  timeSlicesCache.set(cacheKey, result);
+  return copyTimeSlices(result);
 }
 function findNextDuration(current, array, defaultValue) {
   if (defaultValue !== void 0 && defaultValue !== null)

package/lib/modules/Customer/index.d.ts

@@ -44,6 +44,10 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
      */
     queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    queryCustomerDetail(id: string | number): Promise<ShopCustomer | null>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -201,6 +201,17 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       pageSize
     };
   }
+  /**
+   * 查询单个客户详情，不写入 customerList / pagination 状态。
+   */
+  async queryCustomerDetail(id) {
+    var _a;
+    const result = await this.request.get(`/customer/info/${id}`, {
+      with_trashed: 1
+    });
+    const customer = ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.customer) || (result == null ? void 0 : result.data) || (result == null ? void 0 : result.customer) || null;
+    return customer && typeof customer === "object" ? customer : null;
+  }
   /**
    * 获取客户列表
    * @param params 查询参数

package/lib/modules/Customer/types.d.ts

@@ -112,6 +112,8 @@ export interface CustomerModuleAPI {
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 查询客户列表但不更新列表分页状态 */
     queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询单个客户详情但不修改客户列表状态 */
+    queryCustomerDetail: (id: string | number) => Promise<ShopCustomer | null>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Discount/index.d.ts

@@ -32,6 +32,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         customerId?: number;
         orderId?: number;
     }): Promise<DiscountWithReason>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;

package/lib/modules/Discount/index.js

@@ -147,6 +147,15 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountWithReason;
   }
+  async batchSearchByProductIds(productIds) {
+    const result = await this.request.get(`/machinecode/batch-search`, {
+      ids: productIds,
+      translate_flag: 1,
+      tags: ["good_pass", "product_discount_card"],
+      relation_product: 1
+    });
+    return (result == null ? void 0 : result.data) || [];
+  }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
       (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)

package/lib/modules/Discount/types.d.ts

@@ -157,6 +157,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
     unified_available_status?: number | undefined | null;
 }

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

@@ -0,0 +1,48 @@
+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;
+}