@pisell/pisellos 0.0.568 → 0.0.570

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

@@ -0,0 +1,151 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import dayjs from 'dayjs';
+import { flexibleObj, getDurationValue } from "./flexible";
+
+/**
+ * 判断商品是否为跨日预约（duration.type === 'days'）。与 info2 isMultiDayProduct 等价。
+ */
+export function isMultiDayProduct(product) {
+  var _product$duration;
+  return (product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.type) === 'days';
+}
+
+/**
+ * 判断 cacheItem 是否为 session 商品（extension_type ∈ session_product / session_ticket）。
+ */
+export function isSessionProduct(cacheItem) {
+  return ['session_product', 'session_ticket'].includes(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.extension_type);
+}
+
+/** 从 catalog `cartDetailValue` 或 `_extend.other` 取 session 快照。 */
+export function getSessionFromItem(item) {
+  var _item$cartDetailValue, _item$cartDetailValue2, _item$_extend;
+  var session = (_item$cartDetailValue = item === null || item === void 0 || (_item$cartDetailValue2 = item.cartDetailValue) === null || _item$cartDetailValue2 === void 0 ? void 0 : _item$cartDetailValue2.session) !== null && _item$cartDetailValue !== void 0 ? _item$cartDetailValue : item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.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。
+ */
+export function applySessionTimesToExtend(item, extend, ctx) {
+  var _extend$other$session, _extend$other, _session$start_time, _session$end_time;
+  var session = (_extend$other$session = extend === null || extend === void 0 || (_extend$other = extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.session) !== null && _extend$other$session !== void 0 ? _extend$other$session : getSessionFromItem(item);
+  if (!session || !isSessionProduct(item)) {
+    return extend;
+  }
+  var baseDate = ctx !== null && ctx !== void 0 && ctx.date ? dayjs(ctx.date) : dayjs();
+  var startAt = dayjs("".concat(baseDate.format('YYYY-MM-DD'), " ").concat(dayjs(session.start_at).format('HH:mm:ss')));
+  var endAt = dayjs("".concat(baseDate.format('YYYY-MM-DD'), " ").concat(dayjs(session.end_at).format('HH:mm:ss')));
+  var nextExtend = _objectSpread(_objectSpread({}, extend), {}, {
+    other: _objectSpread(_objectSpread({}, extend.other || {}), {}, {
+      session: session
+    }),
+    start_date: startAt,
+    startDate: startAt,
+    start_time: (_session$start_time = session.start_time) !== null && _session$start_time !== void 0 ? _session$start_time : dayjs(session.start_at).format('HH:mm'),
+    end_date: endAt,
+    endDate: endAt,
+    end_time: (_session$end_time = session.end_time) !== null && _session$end_time !== void 0 ? _session$end_time : dayjs(session.end_at).format('HH:mm')
+  });
+  return _objectSpread(_objectSpread({}, nextExtend), {}, {
+    duration: getDays({
+      _extend: nextExtend
+    }, 'minutes')
+  });
+}
+
+/**
+ * 是否应写入 booking（与 Product.utils isNormalProduct 对齐，并覆盖 session_ticket / cartDetailValue.session）。
+ */
+export function isBookingProduct(item) {
+  var _item$schedules, _item$scheduleIds;
+  if (!item) return false;
+  if (item.duration) return true;
+  if (item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) return true;
+  if (item !== null && item !== void 0 && (_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length) return true;
+  if (isSessionProduct(item)) return true;
+  if (getSessionFromItem(item)) return true;
+  return false;
+}
+
+/**
+ * 处理 'now' 时间占位：'now' → 当前 HH:mm；其他原样返回。
+ * 与 info2 `getServeStartTime` 等价。
+ */
+export function getServeStartTime(startTime) {
+  if (startTime === 'now') return dayjs().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 处理）
+ */
+export function getServiceTimes(service) {
+  var _service$_extend, _service$_extend2, _service$_extend6, _service$_extend7;
+  var startDate = dayjs("".concat(dayjs(service === null || service === void 0 || (_service$_extend = service._extend) === null || _service$_extend === void 0 ? void 0 : _service$_extend.start_date).format('YYYY-MM-DD'), " ").concat(getServeStartTime(service === null || service === void 0 || (_service$_extend2 = service._extend) === null || _service$_extend2 === void 0 ? void 0 : _service$_extend2.start_time)));
+  if (isMultiDayProduct(service)) {
+    var _service$_extend3, _service$_extend$end_, _service$_extend4, _service$_extend5;
+    var startTime = getServeStartTime(service === null || service === void 0 || (_service$_extend3 = service._extend) === null || _service$_extend3 === void 0 ? void 0 : _service$_extend3.start_time);
+    var endDateRaw = (_service$_extend$end_ = service === null || service === void 0 || (_service$_extend4 = service._extend) === null || _service$_extend4 === void 0 ? void 0 : _service$_extend4.end_date) !== null && _service$_extend$end_ !== void 0 ? _service$_extend$end_ : service === null || service === void 0 || (_service$_extend5 = service._extend) === null || _service$_extend5 === void 0 ? void 0 : _service$_extend5.endDate;
+    var endBase = dayjs(endDateRaw);
+    // 跨日结束日保留与开始相同的时刻（如 11:24），避免 end_date 仅日期时被解析为 00:00
+    var _endDate = endBase.isValid() ? dayjs("".concat(endBase.format('YYYY-MM-DD'), " ").concat(startTime)) : endBase;
+    return {
+      startDate: startDate,
+      endDate: _endDate
+    };
+  }
+  var session = service === null || service === void 0 || (_service$_extend6 = service._extend) === null || _service$_extend6 === void 0 || (_service$_extend6 = _service$_extend6.other) === null || _service$_extend6 === void 0 ? void 0 : _service$_extend6.session;
+  if (isSessionProduct(service) && session) {
+    return {
+      startDate: dayjs(session.start_at),
+      endDate: dayjs(session.end_at)
+    };
+  }
+  var endDate = startDate.add(flexibleObj.getValue(service === null || service === void 0 || (_service$_extend7 = service._extend) === null || _service$_extend7 === void 0 ? void 0 : _service$_extend7.duration), 'minute');
+  return {
+    startDate: startDate,
+    endDate: endDate
+  };
+}
+
+/**
+ * 跨日预约相关：把 _extend.start_date / end_date 都对齐到 dayjs startOf('day')。
+ * 与 info2 `formatDayDate` 等价。
+ */
+export function formatDayDate(_extend) {
+  return {
+    start_date: dayjs(_extend === null || _extend === void 0 ? void 0 : _extend.start_date).startOf('day'),
+    end_date: dayjs(_extend === null || _extend === void 0 ? void 0 : _extend.end_date).startOf('day')
+  };
+}
+
+/**
+ * 计算跨日预约时长：
+ *   - type='days' → end - start 的天数
+ *   - type='minutes' → end - start 的分钟数
+ * 与 info2 `getDays` 等价。
+ */
+export function getDays(cacheItem, type) {
+  var _cacheItem$_extend, _cacheItem$_extend2;
+  if (type === 'days') {
+    var _formatDayDate = formatDayDate(cacheItem._extend),
+      start_date = _formatDayDate.start_date,
+      end_date = _formatDayDate.end_date;
+    return end_date.diff(start_date, 'day');
+  }
+  var startDate = dayjs(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.start_date);
+  var endDate = dayjs(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.end_date);
+  return endDate.diff(startDate, type);
+}
+export { getDurationValue };

package/dist/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/dist/modules/BookingContext/utils/timeSlices.js

@@ -0,0 +1,100 @@
+import dayjs from 'dayjs';
+import { getDurationValue } from "./flexible";
+/**
+ * 把一天切成等长时间槽，输出 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 function sliceDayIntoFiveMinutes(config, isDay) {
+  var startTime = dayjs().startOf('day');
+  var endTime = dayjs().endOf('day');
+  var timeSlice = config && config.value || 5;
+  var timeSlices = [];
+  var durationSlicesBasedOnTime = [];
+  var currentTime = startTime;
+  if (isDay) {
+    var 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: timeSlices,
+      durationSlicesBasedOnTime: durationSlicesBasedOnTime
+    };
+  }
+  while (currentTime.isBefore(endTime)) {
+    timeSlices.push({
+      label: currentTime.format('hh:mm A'),
+      value: currentTime.format('HH:mm')
+    });
+    var nextTime = currentTime.add(timeSlice, 'minute');
+    var durationValue = nextTime.diff(startTime, 'minute');
+    durationSlicesBasedOnTime.push({
+      label: String(durationValue),
+      value: durationValue
+    });
+    currentTime = nextTime;
+  }
+  return {
+    timeSlices: timeSlices,
+    durationSlicesBasedOnTime: durationSlicesBasedOnTime
+  };
+}
+
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
+export function findNextDuration(current, array, defaultValue) {
+  if (defaultValue !== undefined && defaultValue !== null) return defaultValue;
+  if (!array || array.length === 0) return undefined;
+  for (var i = 0; i < array.length; i += 1) {
+    if (array[i].value === (current === null || current === void 0 ? void 0 : current.value)) return array[i].value;
+  }
+  return array[0].value;
+}
+
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
+export function findNextSlice(params) {
+  var _timeSlices$index;
+  var timeSlices = params.timeSlices,
+    _params$index = params.index,
+    index = _params$index === void 0 ? 0 : _params$index,
+    _params$date = params.date,
+    date = _params$date === void 0 ? '' : _params$date;
+  var currentTimeValue = date || dayjs().format('HH:mm');
+  for (var i = 0; i < timeSlices.length; i += 1) {
+    if (timeSlices[i].value !== 'now' && timeSlices[i].value >= currentTimeValue) {
+      return timeSlices[i].value;
+    }
+  }
+  return (_timeSlices$index = timeSlices[index]) === null || _timeSlices$index === void 0 ? void 0 : _timeSlices$index.value;
+}
+
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
+export function getEndDate(startDate, duration, endDate, shopOpeningHours) {
+  if (duration === 'flexible') {
+    var openingDate = dayjs("".concat(startDate.format('YYYY-MM-DD'), " ").concat(shopOpeningHours || '23:59'));
+    if (dayjs(startDate).isAfter(openingDate)) {
+      openingDate = openingDate.add(1, 'day');
+    }
+    if (!endDate) return openingDate;
+    var endDateObj = dayjs(endDate);
+    if (endDateObj.isAfter(openingDate)) return openingDate;
+    return endDateObj;
+  }
+  return startDate.add(Number(duration), 'minute');
+}
+export { getDurationValue };

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

@@ -14,6 +14,7 @@ import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 
 /** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
 var toDiscountPayload = function toDiscountPayload(discountItem) {
@@ -182,7 +183,9 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_bundle) || [],
-      product_option_item: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_option_item) || [],
+      product_sku: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_sku) || {
+        option: []
+      },
       metadata: {
         product_discount_difference: product_discount_difference
       }
@@ -195,7 +198,16 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options !== null && options !== void 0 && options.length) {
-      origin.product.product_option_item = formatOptionsToOrigin(options);
+      origin.product.product_sku = _objectSpread(_objectSpread({}, origin.product.product_sku || {}), {}, {
+        option: formatOptionsToOrigin(options).map(function (option) {
+          var _option$add_price;
+          var next = _objectSpread(_objectSpread({}, option), {}, {
+            add_price: (_option$add_price = option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option.price
+          });
+          delete next.price;
+          return next;
+        })
+      });
     }
   }
   return origin;
@@ -325,7 +337,7 @@ export var formatOptionsToOrigin = function formatOptionsToOrigin(options) {
   return options.map(function (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
     };
   });
@@ -362,6 +374,7 @@ export var formatBundle = function formatBundle(bundle) {
 export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
   if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
   return bundle.map(function (d) {
+    var _d$price, _d$price_type, _d$price_type_ext;
     var getBundleValueByKey = function getBundleValueByKey(key) {
       var _d$originBundleItem;
       return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
@@ -370,6 +383,14 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       var _cur$metadata2;
       return pre + ((cur === null || cur === void 0 || (_cur$metadata2 = cur.metadata) === null || _cur$metadata2 === void 0 ? void 0 : _cur$metadata2.product_discount_difference) || 0);
     }, 0);
+    var normalizedBundle = _objectSpread(_objectSpread({}, d), {}, {
+      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
+      price: (_d$price = d === null || d === void 0 ? void 0 : d.price) !== null && _d$price !== void 0 ? _d$price : d === null || d === void 0 ? void 0 : d.custom_price,
+      bundle_selling_price: d === null || d === void 0 ? void 0 : d.bundle_selling_price,
+      price_type: (_d$price_type = d === null || d === void 0 ? void 0 : d.price_type) !== null && _d$price_type !== void 0 ? _d$price_type : d === null || d === void 0 ? void 0 : d.custom_price_type,
+      price_type_ext: (_d$price_type_ext = d === null || d === void 0 ? void 0 : d.price_type_ext) !== null && _d$price_type_ext !== void 0 ? _d$price_type_ext : d === null || d === void 0 ? void 0 : d.custom_price_type_ext,
+      option: getBundleValueByKey('option')
+    });
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -380,8 +401,8 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       extension_type: getBundleValueByKey('extension_type'),
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
-      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
-      // "custom_price": d?.price,
+      "bundle_selling_price": getBundleSellingMagnitude(normalizedBundle).toFixed(2),
+      "custom_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference: product_discount_difference

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

@@ -10,7 +10,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; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import Decimal from "decimal.js";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 export function updateAllCartItemPrice(_x, _x2, _x3, _x4, _x5) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _item$_productOrigin, _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
+            var _item$_productOrigin$, _item$_productOrigin, _item$_origin, _targetProduct$varian, _ref, _targetVariant$price, _ref2, _targetVariant$base_p, _item$_productOrigin2, _bundle;
+            var item, targetProduct, cartProduct, productInfo, variantId, targetVariant, bundle, _productInfo$variant;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,10 +40,17 @@ function _updateAllCartItemPrice() {
                   if (!productInfo) {
                     productInfo = item._productOrigin;
                   }
-                  bundle = item._bundleOrigin;
-                  productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
-                  productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
+
+                  // 查找选择的规格id
+                  variantId = (_item$_productOrigin$ = item === null || item === void 0 || (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.product_variant_id;
+                  targetVariant = targetProduct === null || targetProduct === void 0 || (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (variant) {
+                    return Number(variant.id) === Number(variantId);
+                  });
+                  bundle = item._bundleOrigin; // productInfo.price = targetProduct?.price;
+                  // productInfo.base_price = targetProduct?.base_price;
+                  productInfo.price = (_ref = (_targetVariant$price = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.price) !== null && _targetVariant$price !== void 0 ? _targetVariant$price : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price) !== null && _ref !== void 0 ? _ref : productInfo.price;
+                  productInfo.base_price = (_ref2 = (_targetVariant$base_p = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.base_price) !== null && _targetVariant$base_p !== void 0 ? _targetVariant$base_p : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price) !== null && _ref2 !== void 0 ? _ref2 : productInfo.base_price;
+                  productInfo.product_variant_id = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -54,18 +61,18 @@ function _updateAllCartItemPrice() {
                       var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                         return m.id === n.id;
                       });
-                      if (targetBundleItem.price_type === 'markdown') {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
-                      }
-                      // 如果有选择 option，还需要加上 option 的价格
-                      if (n.option) {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
-                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
-                        }, 0)).toNumber();
-                      }
                       if (targetBundleItem) {
-                        return _objectSpread(_objectSpread({}, n), {}, {
+                        var normalizedBundle = _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,
+                          custom_price: targetBundleItem.price,
+                          price_type: targetBundleItem.price_type,
+                          price_type_ext: targetBundleItem.price_type_ext
+                        });
+                        var bundleSellingPrice = getBundleSellingMagnitude(normalizedBundle).toFixed(2);
+                        return _objectSpread(_objectSpread({}, n), {}, {
+                          custom_price: targetBundleItem.price,
+                          price: targetBundleItem.price_type === 'markdown' ? bundleSellingPrice : targetBundleItem.price,
+                          bundle_selling_price: bundleSellingPrice,
                           base_price: targetBundleItem.base_price
                         });
                       }
@@ -75,8 +82,8 @@ function _updateAllCartItemPrice() {
                   // 如果有返回variant，则把对应variant的数据也补充进去
                   if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
                     productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
-                      var _targetProduct$varian;
-                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
+                      var _targetProduct$varian2;
+                      var targetVariant = (_targetProduct$varian2 = targetProduct.variant) === null || _targetProduct$varian2 === void 0 ? void 0 : _targetProduct$varian2.find(function (m) {
                         return m.id === n.id;
                       });
                       if (targetVariant) {
@@ -99,7 +106,7 @@ function _updateAllCartItemPrice() {
                     bundle: bundle,
                     options: item._optionsOrigin
                   });
-                case 15:
+                case 17:
                 case "end":
                   return _context.stop();
               }

package/dist/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 查询参数