@pisell/pisellos 0.0.568 → 0.0.569

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

@@ -0,0 +1,161 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applySessionTimesToExtend = applySessionTimesToExtend;
+exports.formatDayDate = formatDayDate;
+exports.getDays = getDays;
+Object.defineProperty(exports, "getDurationValue", {
+  enumerable: true,
+  get: function () {
+    return _flexible.getDurationValue;
+  }
+});
+exports.getServeStartTime = getServeStartTime;
+exports.getServiceTimes = getServiceTimes;
+exports.getSessionFromItem = getSessionFromItem;
+exports.isBookingProduct = isBookingProduct;
+exports.isMultiDayProduct = isMultiDayProduct;
+exports.isSessionProduct = isSessionProduct;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _flexible = require("./flexible");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 判断商品是否为跨日预约（duration.type === 'days'）。与 info2 isMultiDayProduct 等价。
+ */
+function isMultiDayProduct(product) {
+  return product?.duration?.type === 'days';
+}
+
+/**
+ * 判断 cacheItem 是否为 session 商品（extension_type ∈ session_product / session_ticket）。
+ */
+function isSessionProduct(cacheItem) {
+  return ['session_product', 'session_ticket'].includes(cacheItem?.extension_type);
+}
+
+/** 从 catalog `cartDetailValue` 或 `_extend.other` 取 session 快照。 */
+function getSessionFromItem(item) {
+  const session = item?.cartDetailValue?.session ?? item?._extend?.other?.session;
+  return session && typeof session === 'object' ? session : null;
+}
+
+/**
+ * 将 cartDetailValue.session 写入 _extend 的起止时间（与 info2 getServiceStartTimeAndEndTime 的 session 分支一致）。
+ * 日历日优先用 ctx.date，时分取自 session.start_at / end_at 或 session.start_time / end_time。
+ */
+function applySessionTimesToExtend(item, extend, ctx) {
+  const session = extend?.other?.session ?? getSessionFromItem(item);
+  if (!session || !isSessionProduct(item)) {
+    return extend;
+  }
+  const baseDate = ctx?.date ? (0, _dayjs.default)(ctx.date) : (0, _dayjs.default)();
+  const startAt = (0, _dayjs.default)(`${baseDate.format('YYYY-MM-DD')} ${(0, _dayjs.default)(session.start_at).format('HH:mm:ss')}`);
+  const endAt = (0, _dayjs.default)(`${baseDate.format('YYYY-MM-DD')} ${(0, _dayjs.default)(session.end_at).format('HH:mm:ss')}`);
+  const nextExtend = {
+    ...extend,
+    other: {
+      ...(extend.other || {}),
+      session
+    },
+    start_date: startAt,
+    startDate: startAt,
+    start_time: session.start_time ?? (0, _dayjs.default)(session.start_at).format('HH:mm'),
+    end_date: endAt,
+    endDate: endAt,
+    end_time: session.end_time ?? (0, _dayjs.default)(session.end_at).format('HH:mm')
+  };
+  return {
+    ...nextExtend,
+    duration: getDays({
+      _extend: nextExtend
+    }, 'minutes')
+  };
+}
+
+/**
+ * 是否应写入 booking（与 Product.utils isNormalProduct 对齐，并覆盖 session_ticket / cartDetailValue.session）。
+ */
+function isBookingProduct(item) {
+  if (!item) return false;
+  if (item.duration) return true;
+  if (item?.schedules?.length) return true;
+  if (item?.['schedule.ids']?.length) return true;
+  if (isSessionProduct(item)) return true;
+  if (getSessionFromItem(item)) return true;
+  return false;
+}
+
+/**
+ * 处理 'now' 时间占位：'now' → 当前 HH:mm；其他原样返回。
+ * 与 info2 `getServeStartTime` 等价。
+ */
+function getServeStartTime(startTime) {
+  if (startTime === 'now') return (0, _dayjs.default)().format('HH:mm');
+  return startTime || '';
+}
+
+/**
+ * 计算商品的开始结束时间（统一为 dayjs 实例）。
+ * 与 info2 `getServiceTimes` 行为等价：
+ *   - 跨日商品：startDate = start_date + start_time，endDate = _extend.end_date 原样
+ *   - session 商品：从 _extend.other.session 取 start_at / end_at
+ *   - 普通商品：startDate + duration（含 flexible 处理）
+ */
+function getServiceTimes(service) {
+  const startDate = (0, _dayjs.default)(`${(0, _dayjs.default)(service?._extend?.start_date).format('YYYY-MM-DD')} ${getServeStartTime(service?._extend?.start_time)}`);
+  if (isMultiDayProduct(service)) {
+    const startTime = getServeStartTime(service?._extend?.start_time);
+    const endDateRaw = service?._extend?.end_date ?? service?._extend?.endDate;
+    const endBase = (0, _dayjs.default)(endDateRaw);
+    // 跨日结束日保留与开始相同的时刻（如 11:24），避免 end_date 仅日期时被解析为 00:00
+    const endDate = endBase.isValid() ? (0, _dayjs.default)(`${endBase.format('YYYY-MM-DD')} ${startTime}`) : endBase;
+    return {
+      startDate,
+      endDate
+    };
+  }
+  const session = service?._extend?.other?.session;
+  if (isSessionProduct(service) && session) {
+    return {
+      startDate: (0, _dayjs.default)(session.start_at),
+      endDate: (0, _dayjs.default)(session.end_at)
+    };
+  }
+  const endDate = startDate.add(_flexible.flexibleObj.getValue(service?._extend?.duration), 'minute');
+  return {
+    startDate,
+    endDate
+  };
+}
+
+/**
+ * 跨日预约相关：把 _extend.start_date / end_date 都对齐到 dayjs startOf('day')。
+ * 与 info2 `formatDayDate` 等价。
+ */
+function formatDayDate(_extend) {
+  return {
+    start_date: (0, _dayjs.default)(_extend?.start_date).startOf('day'),
+    end_date: (0, _dayjs.default)(_extend?.end_date).startOf('day')
+  };
+}
+
+/**
+ * 计算跨日预约时长：
+ *   - type='days' → end - start 的天数
+ *   - type='minutes' → end - start 的分钟数
+ * 与 info2 `getDays` 等价。
+ */
+function getDays(cacheItem, type) {
+  if (type === 'days') {
+    const {
+      start_date,
+      end_date
+    } = formatDayDate(cacheItem._extend);
+    return end_date.diff(start_date, 'day');
+  }
+  const startDate = (0, _dayjs.default)(cacheItem?._extend?.start_date);
+  const endDate = (0, _dayjs.default)(cacheItem?._extend?.end_date);
+  return endDate.diff(startDate, type);
+}

package/lib/modules/BookingContext/utils/timeSlices.d.ts

@@ -0,0 +1,42 @@
+import dayjs from 'dayjs';
+import { getDurationValue } from './flexible';
+export interface TimeSlice {
+    label: string;
+    value: string;
+}
+export interface DurationSlice {
+    label: string;
+    value: number;
+}
+export interface TimeSlicesResult {
+    timeSlices: TimeSlice[];
+    durationSlicesBasedOnTime: DurationSlice[];
+}
+/**
+ * 把一天切成等长时间槽，输出 timeSlices（开始时间标签）与 durationSlicesBasedOnTime（基于切片的时长选项）。
+ *
+ * 与 info2 `sliceDayIntoFiveMinutes` 行为等价；为了不依赖 `locales`，label 输出原始时间字符串（'08:00 AM' / '90'），
+ * UI 侧需要本地化展示时可基于 value 自行包装。
+ *
+ * @param config booking config `basic.service_time`，{ value: minutes }
+ * @param isDay 是否跨日预约（true 时按 1~30 天切片）
+ */
+export declare function sliceDayIntoFiveMinutes(config: {
+    value?: number;
+} | undefined | null, isDay?: boolean): TimeSlicesResult;
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
+export declare function findNextDuration(current: {
+    value?: number;
+} | undefined, array: DurationSlice[], defaultValue?: number): number | undefined;
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
+export declare function findNextSlice(params: {
+    timeSlices: TimeSlice[];
+    index?: number;
+    date?: string;
+}): string | undefined;
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
+export declare function getEndDate(startDate: dayjs.Dayjs, duration: string | number, endDate: any, shopOpeningHours?: string): dayjs.Dayjs;
+export { getDurationValue };

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

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findNextDuration = findNextDuration;
+exports.findNextSlice = findNextSlice;
+Object.defineProperty(exports, "getDurationValue", {
+  enumerable: true,
+  get: function () {
+    return _flexible.getDurationValue;
+  }
+});
+exports.getEndDate = getEndDate;
+exports.sliceDayIntoFiveMinutes = sliceDayIntoFiveMinutes;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _flexible = require("./flexible");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 把一天切成等长时间槽，输出 timeSlices（开始时间标签）与 durationSlicesBasedOnTime（基于切片的时长选项）。
+ *
+ * 与 info2 `sliceDayIntoFiveMinutes` 行为等价；为了不依赖 `locales`，label 输出原始时间字符串（'08:00 AM' / '90'），
+ * UI 侧需要本地化展示时可基于 value 自行包装。
+ *
+ * @param config booking config `basic.service_time`，{ value: minutes }
+ * @param isDay 是否跨日预约（true 时按 1~30 天切片）
+ */
+function sliceDayIntoFiveMinutes(config, isDay) {
+  const startTime = (0, _dayjs.default)().startOf('day');
+  const endTime = (0, _dayjs.default)().endOf('day');
+  const timeSlice = config && config.value || 5;
+  const timeSlices = [];
+  const durationSlicesBasedOnTime = [];
+  let currentTime = startTime;
+  if (isDay) {
+    let currentDay = 1;
+    while (currentDay <= 30) {
+      timeSlices.push({
+        label: currentTime.format('hh:mm A'),
+        value: currentTime.format('HH:mm')
+      });
+      durationSlicesBasedOnTime.push({
+        label: String(currentDay),
+        value: currentDay
+      });
+      currentDay += 1;
+    }
+    return {
+      timeSlices,
+      durationSlicesBasedOnTime
+    };
+  }
+  while (currentTime.isBefore(endTime)) {
+    timeSlices.push({
+      label: currentTime.format('hh:mm A'),
+      value: currentTime.format('HH:mm')
+    });
+    const nextTime = currentTime.add(timeSlice, 'minute');
+    const durationValue = nextTime.diff(startTime, 'minute');
+    durationSlicesBasedOnTime.push({
+      label: String(durationValue),
+      value: durationValue
+    });
+    currentTime = nextTime;
+  }
+  return {
+    timeSlices,
+    durationSlicesBasedOnTime
+  };
+}
+
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
+function findNextDuration(current, array, defaultValue) {
+  if (defaultValue !== undefined && defaultValue !== null) return defaultValue;
+  if (!array || array.length === 0) return undefined;
+  for (let i = 0; i < array.length; i += 1) {
+    if (array[i].value === current?.value) return array[i].value;
+  }
+  return array[0].value;
+}
+
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
+function findNextSlice(params) {
+  const {
+    timeSlices,
+    index = 0,
+    date = ''
+  } = params;
+  const currentTimeValue = date || (0, _dayjs.default)().format('HH:mm');
+  for (let i = 0; i < timeSlices.length; i += 1) {
+    if (timeSlices[i].value !== 'now' && timeSlices[i].value >= currentTimeValue) {
+      return timeSlices[i].value;
+    }
+  }
+  return timeSlices[index]?.value;
+}
+
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
+function getEndDate(startDate, duration, endDate, shopOpeningHours) {
+  if (duration === 'flexible') {
+    let openingDate = (0, _dayjs.default)(`${startDate.format('YYYY-MM-DD')} ${shopOpeningHours || '23:59'}`);
+    if ((0, _dayjs.default)(startDate).isAfter(openingDate)) {
+      openingDate = openingDate.add(1, 'day');
+    }
+    if (!endDate) return openingDate;
+    const endDateObj = (0, _dayjs.default)(endDate);
+    if (endDateObj.isAfter(openingDate)) return openingDate;
+    return endDateObj;
+  }
+  return startDate.add(Number(duration), 'minute');
+}

package/lib/modules/Cart/utils/cartProduct.js

@@ -8,6 +8,7 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../Product/utils");
 var _utils2 = require("../../../solution/ShopDiscount/utils");
 var _utils3 = require("../../Summary/utils");
+var _utils4 = require("../../Order/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
 const toDiscountPayload = discountItem => ({
@@ -160,7 +161,9 @@ const formatProductToCartItemOrigin = params => {
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: origin.product?.product_bundle || [],
-      product_option_item: origin.product?.product_option_item || [],
+      product_sku: origin.product?.product_sku || {
+        option: []
+      },
       metadata: {
         product_discount_difference
       }
@@ -173,7 +176,17 @@ const formatProductToCartItemOrigin = params => {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options?.length) {
-      origin.product.product_option_item = formatOptionsToOrigin(options);
+      origin.product.product_sku = {
+        ...(origin.product.product_sku || {}),
+        option: formatOptionsToOrigin(options).map(option => {
+          const next = {
+            ...option,
+            add_price: option.add_price ?? option.price
+          };
+          delete next.price;
+          return next;
+        })
+      };
     }
   }
   return origin;
@@ -307,7 +320,7 @@ const formatOptionsToOrigin = options => {
   return options.map(d => {
     return {
       num: d.num,
-      option_group_item_id: d.product_option_item_id,
+      option_group_item_id: d.option_group_item_id,
       option_group_id: d.option_group_id
     };
   });
@@ -352,6 +365,15 @@ const formatBundleToOrigin = bundle => {
     const product_discount_difference = (d?.discount_list || []).reduce((pre, cur) => {
       return pre + (cur?.metadata?.product_discount_difference || 0);
     }, 0);
+    const normalizedBundle = {
+      ...d,
+      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
+      price: d?.price ?? d?.custom_price,
+      bundle_selling_price: d?.bundle_selling_price,
+      price_type: d?.price_type ?? d?.custom_price_type,
+      price_type_ext: d?.price_type_ext ?? d?.custom_price_type_ext,
+      option: getBundleValueByKey('option')
+    };
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -362,8 +384,8 @@ const formatBundleToOrigin = bundle => {
       extension_type: getBundleValueByKey('extension_type'),
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
-      "bundle_selling_price": d?.price,
-      // "custom_price": d?.price,
+      "bundle_selling_price": (0, _utils4.getBundleSellingMagnitude)(normalizedBundle).toFixed(2),
+      "custom_price": d?.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference

package/lib/modules/Cart/utils/changePrice.js

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateAllCartItemPrice = updateAllCartItemPrice;
-var _decimal = _interopRequireDefault(require("decimal.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _utils = require("../../Order/utils");
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
   for (const item of cartItems) {
     const targetProduct = priceData.find(n => n.id === item.id);
@@ -14,28 +13,35 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
     if (!productInfo) {
       productInfo = item._productOrigin;
     }
+
+    // 查找选择的规格id
+    const variantId = item?._productOrigin?.product_variant_id ?? item?._origin?.product?.product_variant_id;
+    const targetVariant = targetProduct?.variant?.find(variant => Number(variant.id) === Number(variantId));
     let bundle = item._bundleOrigin;
-    productInfo.price = targetProduct?.price;
-    productInfo.base_price = targetProduct?.base_price;
+    // productInfo.price = targetProduct?.price;
+    // productInfo.base_price = targetProduct?.base_price;
+    productInfo.price = targetVariant?.price ?? targetProduct?.price ?? productInfo.price;
+    productInfo.base_price = targetVariant?.base_price ?? targetProduct?.base_price ?? productInfo.base_price;
     productInfo.product_variant_id = item._productOrigin?.product_variant_id;
     bundle = bundle?.map(n => {
       // 更新 bundle 的价格
       const targetBundle = targetProduct?.bundle_group?.find(m => m.id === n.group_id);
       if (targetBundle) {
         const targetBundleItem = targetBundle.bundle_item.find(m => m.id === n.id);
-        if (targetBundleItem.price_type === 'markdown') {
-          targetBundleItem.price = new _decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
-        }
-        // 如果有选择 option，还需要加上 option 的价格
-        if (n.option) {
-          targetBundleItem.price = new _decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
-            return pre + new _decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
-          }, 0)).toNumber();
-        }
         if (targetBundleItem) {
-          return {
+          const normalizedBundle = {
             ...n,
             price: targetBundleItem.price,
+            custom_price: targetBundleItem.price,
+            price_type: targetBundleItem.price_type,
+            price_type_ext: targetBundleItem.price_type_ext
+          };
+          const bundleSellingPrice = (0, _utils.getBundleSellingMagnitude)(normalizedBundle).toFixed(2);
+          return {
+            ...n,
+            custom_price: targetBundleItem.price,
+            price: targetBundleItem.price_type === 'markdown' ? bundleSellingPrice : targetBundleItem.price,
+            bundle_selling_price: bundleSellingPrice,
             base_price: targetBundleItem.base_price
           };
         }

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

@@ -7,11 +7,25 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private store;
     private request;
     private cacheId;
+    /**
+     * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
+     *
+     * @example
+     * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
+     */
+    private isSameSelectedCustomer;
     private openCache;
     private fatherModule;
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
+     *
+     * @example
+     * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 获取客户列表数据（内部方法）
      * @param params 查询参数
@@ -24,6 +38,12 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
+    /**
+     * 查询客户列表但不写入 customerList / pagination 状态。
+     *
+     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+     */
+    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -40,6 +40,24 @@ class CustomerModule extends _BaseModule.BaseModule {
   };
   request;
   cacheId;
+
+  /**
+   * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
+   *
+   * @example
+   * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
+   */
+  isSameSelectedCustomer(current, next) {
+    const normalizedNext = !next ? _constants.DEFAULT_CUSTOMER : next;
+    const normalizedCurrent = current || null;
+    if (!normalizedCurrent) return false;
+    // Walk-In 是默认客户，展示文案 / 默认区号可能来自不同入口；同为 id=1 时视为同一客户。
+    if (String(normalizedCurrent?.id ?? '') === '1' && String(normalizedNext?.id ?? '') === '1') {
+      return true;
+    }
+    const keys = ['id', 'name', 'phone', 'email', 'country_calling_code'];
+    return keys.every(key => String(normalizedCurrent?.[key] ?? '') === String(normalizedNext?.[key] ?? ''));
+  }
   openCache = false;
   fatherModule;
   otherParams = {};
@@ -74,7 +92,7 @@ class CustomerModule extends _BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof options?.initialState?.pageSize === 'number') {
+    if (typeof options?.initialState?.pageSize === 'number' && options.initialState.pageSize > 1) {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = _constants.DEFAULT_PAGE_SIZE;
@@ -95,6 +113,19 @@ class CustomerModule extends _BaseModule.BaseModule {
     }
   }
 
+  /**
+   * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
+   *
+   * @example
+   * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
+   */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+    this.openCache = this.otherParams.openCache ?? false;
+    this.cacheId = this.otherParams.cacheId;
+    this.fatherModule = this.otherParams.fatherModule;
+  }
+
   /**
    * 获取客户列表数据（内部方法）
    * @param params 查询参数
@@ -163,6 +194,26 @@ class CustomerModule extends _BaseModule.BaseModule {
     await this.core.effects.emit(`${this.name}:onCustomerListError`, this.store.error);
   }
 
+  /**
+   * 查询客户列表但不写入 customerList / pagination 状态。
+   *
+   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+   */
+  async queryCustomerList(params = {}) {
+    const {
+      customerList,
+      total,
+      page,
+      pageSize
+    } = await this.fetchCustomerListData(params);
+    return {
+      list: customerList,
+      total,
+      page,
+      pageSize
+    };
+  }
+
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -197,7 +248,6 @@ class CustomerModule extends _BaseModule.BaseModule {
 
       // 设置客户列表（替换模式）
       this.store.customerList = (0, _lodashEs.cloneDeep)(customerList);
-      await this.core.effects.emit(`${this.name}:onCustomerListUpdate`, this.store);
 
       // 触发分页变化事件
       this.triggerPaginationChange({
@@ -219,6 +269,7 @@ class CustomerModule extends _BaseModule.BaseModule {
     } finally {
       this.store.loading = false;
       this.storeChange();
+      await this.core.effects.emit(`${this.name}:onCustomerListUpdate`, this.store);
     }
   }
 
@@ -240,6 +291,9 @@ class CustomerModule extends _BaseModule.BaseModule {
    * @param customer 选择的客户
    */
   setSelectedCustomer(customer) {
+    if (this.isSameSelectedCustomer(this.store.selectedCustomer, customer)) {
+      return;
+    }
     this.store.selectedCustomer = !customer ? _constants.DEFAULT_CUSTOMER : (0, _lodashEs.cloneDeep)(customer);
     this.core.effects.emit(`${this.name}:onCustomerSelected`, this.store.selectedCustomer);
     this.storeChange();
@@ -399,6 +453,11 @@ class CustomerModule extends _BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
+      const loadMoreParams = {
+        skip: nextPage,
+        num: this.store.pageSize,
+        ...this.store.searchParams // 使用存储的搜索条件
+      };
 
       // 使用公共方法获取数据，传入存储的搜索条件
       const {
@@ -406,11 +465,7 @@ class CustomerModule extends _BaseModule.BaseModule {
         total,
         page,
         pageSize
-      } = await this.fetchCustomerListData({
-        skip: nextPage,
-        num: this.store.pageSize,
-        ...this.store.searchParams // 使用存储的搜索条件
-      });
+      } = await this.fetchCustomerListData(loadMoreParams);
 
       // 将新数据追加到现有列表（追加模式）
       const updatedCustomerList = [...this.store.customerList, ...(0, _lodashEs.cloneDeep)(newCustomers)];
@@ -429,9 +484,6 @@ class CustomerModule extends _BaseModule.BaseModule {
         hasMore: this.store.hasMore
       });
 
-      // 触发通用更新事件
-      await this.core.effects.emit(`${this.name}:onCustomerListUpdate`, this.store);
-
       // 触发分页变化事件
       this.triggerPaginationChange({
         page,
@@ -453,6 +505,7 @@ class CustomerModule extends _BaseModule.BaseModule {
     } finally {
       this.store.loadingMore = false;
       this.storeChange();
+      await this.core.effects.emit(`${this.name}:onCustomerListUpdate`, this.store);
     }
   }
 

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

@@ -110,6 +110,8 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询客户列表但不更新列表分页状态 */
+    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

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

@@ -16,6 +16,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     getDiscountList(): Discount[];
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
+    private normalizePositiveNumberIds;
     loadPrepareConfig(params: {
         action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
@@ -25,7 +26,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
-        order_id?: number;
+        order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
     private extractAvailableWalletIds;
     batchSearch(code: string, options?: {