@pisell/pisellos 2.3.141 → 2.3.143

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -260,7 +260,7 @@ function getResourceMaxFreeTime(resource, isAutoAllocationOn) {
     return d.usable && d.id !== 0;
   });
   var defaultResource = [];
-  var maxFreeTime = 0;
+  var maxFreeTime = -1;
   usableList.forEach(function (d) {
     var _d$times = d.times,
       times = _d$times === void 0 ? [] : _d$times;

package/dist/modules/Cart/index.js

@@ -113,11 +113,11 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     key: "addItem",
     value: (function () {
       var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var account, product, bundle, options, date, _params$quantity, quantity, cartItem, newProduct, items;
+        var account, product, bundle, options, date, _params$quantity, quantity, isLegacyOrder, cartItem, newProduct, items;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              account = params.account, product = params.product, bundle = params.bundle, options = params.options, date = params.date, _params$quantity = params.quantity, quantity = _params$quantity === void 0 ? 1 : _params$quantity; // 生成一个唯一的 ID
+              account = params.account, product = params.product, bundle = params.bundle, options = params.options, date = params.date, _params$quantity = params.quantity, quantity = _params$quantity === void 0 ? 1 : _params$quantity, isLegacyOrder = params.isLegacyOrder; // 生成一个唯一的 ID
               cartItem = {
                 _id: getUniqueId(),
                 _origin: createCartItemOrigin()
@@ -134,7 +134,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
                   bundle: bundle,
                   options: options,
                   product_variant_id: newProduct.product_variant_id,
-                  quantity: quantity
+                  quantity: quantity,
+                  isLegacyOrder: isLegacyOrder
                 });
               }
               if (account) {

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

@@ -180,6 +180,8 @@ export interface IAddItemParams {
     };
     /** 商品组合规格ID */
     product_variant_id?: number;
+    /** 是否由旧版下单流程加入购物车 */
+    isLegacyOrder?: boolean;
 }
 /**
  * 更新购物车信息参数

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -21,6 +21,7 @@ export declare const formatProductToCartItem: (params: {
     product_variant_id?: number;
     quantity?: number;
     discounts?: any[];
+    isLegacyOrder?: boolean;
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -29,6 +30,7 @@ export declare const formatProductToCartItemOrigin: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    isLegacyOrder?: boolean;
 }) => any;
 /**
  * 获取商品总价
@@ -61,7 +63,7 @@ export declare const getProductOriginTotalPrice: (params: {
  * @param options 套餐规格信息
  * @returns 格式化后的套餐规格信息
  */
-export declare const formatOptions: (options: any) => any;
+export declare const formatOptions: (options: any, product?: ProductData) => any;
 export declare const formatOptionsToOrigin: (options: any) => any;
 /**
  * 格式化商品套餐信息

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

@@ -1,4 +1,5 @@
 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); }
+var _excluded = ["option"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -10,6 +11,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
@@ -117,7 +120,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
     cartItem.bundle = formatBundle(bundle);
   }
   if (options !== null && options !== void 0 && options.length) {
-    cartItem.options = formatOptions(options);
+    cartItem.options = formatOptions(options, product);
   }
   // 拼装出 product_option_string
   if (product_variant_id) {
@@ -167,7 +170,9 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
     options = params.options,
     product_variant_id = params.product_variant_id,
     _params$quantity2 = params.quantity,
-    quantity = _params$quantity2 === void 0 ? 1 : _params$quantity2;
+    quantity = _params$quantity2 === void 0 ? 1 : _params$quantity2,
+    _params$isLegacyOrder = params.isLegacyOrder,
+    isLegacyOrder = _params$isLegacyOrder === void 0 ? false : _params$isLegacyOrder;
   var origin = cartItem._origin;
   var product_discount_difference = (((_origin$product = origin.product) === null || _origin$product === void 0 ? void 0 : _origin$product.discount_list) || []).filter(function (item) {
     var _item$metadata;
@@ -177,15 +182,23 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
     return pre + ((cur === null || cur === void 0 || (_cur$metadata = cur.metadata) === null || _cur$metadata === void 0 ? void 0 : _cur$metadata.product_discount_difference) || 0);
   }, 0);
   if (product) {
-    var _origin$product2, _origin$product3, _product$duration, _product$duration2;
-    origin.product = _objectSpread(_objectSpread({}, origin.product || {}), {}, {
+    var _origin$product2, _origin$product3, _origin$product4, _origin$product5, _product$duration, _product$duration2;
+    var _ref = ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_sku) || {},
+      _option = _ref.option,
+      legacyProductSku = _objectWithoutProperties(_ref, _excluded);
+    origin.product = _objectSpread(_objectSpread(_objectSpread({}, origin.product || {}), {}, {
       num: quantity,
       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_sku: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_sku) || {
+      product_bundle: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_bundle) || []
+    }, isLegacyOrder ? {
+      product_sku: legacyProductSku,
+      product_option_item: ((_origin$product4 = origin.product) === null || _origin$product4 === void 0 ? void 0 : _origin$product4.product_option_item) || []
+    } : {
+      product_sku: ((_origin$product5 = origin.product) === null || _origin$product5 === void 0 ? void 0 : _origin$product5.product_sku) || {
         option: []
-      },
+      }
+    }), {}, {
       metadata: {
         product_discount_difference: product_discount_difference
       }
@@ -198,16 +211,21 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options !== null && options !== void 0 && options.length) {
-      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;
-        })
-      });
+      var formattedOptions = formatOptionsToOrigin(options);
+      if (isLegacyOrder) {
+        origin.product.product_option_item = formattedOptions;
+      } else {
+        origin.product.product_sku = _objectSpread(_objectSpread({}, origin.product.product_sku || {}), {}, {
+          option: formattedOptions.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;
@@ -230,10 +248,10 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
 
   // option 行：unit 折后价在循环中与主商品使用同一套 getDiscountAmount（含 deductOptionPrice）
   var optionRows = (_options$map = options === null || options === void 0 ? void 0 : options.map(function (currentValue) {
-    var _ref, _currentValue$price, _ref2, _currentValue$num;
+    var _ref2, _currentValue$price, _ref3, _currentValue$num;
     return {
-      unit: Number((_ref = (_currentValue$price = currentValue.price) !== null && _currentValue$price !== void 0 ? _currentValue$price : currentValue.add_price) !== null && _ref !== void 0 ? _ref : 0),
-      num: Number((_ref2 = (_currentValue$num = currentValue.num) !== null && _currentValue$num !== void 0 ? _currentValue$num : currentValue.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1)
+      unit: Number((_ref2 = (_currentValue$price = currentValue.price) !== null && _currentValue$price !== void 0 ? _currentValue$price : currentValue.add_price) !== null && _ref2 !== void 0 ? _ref2 : 0),
+      num: Number((_ref3 = (_currentValue$num = currentValue.num) !== null && _currentValue$num !== void 0 ? _currentValue$num : currentValue.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1)
     };
   })) !== null && _options$map !== void 0 ? _options$map : [];
 
@@ -317,12 +335,21 @@ export var getProductOriginTotalPrice = function getProductOriginTotalPrice(para
  * @param options 套餐规格信息
  * @returns 格式化后的套餐规格信息
  */
-export var formatOptions = function formatOptions(options) {
+export var formatOptions = function formatOptions(options, product) {
   if (!(options !== null && options !== void 0 && options.length)) return [];
   return options.map(function (item) {
+    var _ref4, _item$id, _product$option_group, _optionGroup$option_i, _ref5, _ref6, _item$name;
+    var optionGroupId = item === null || item === void 0 ? void 0 : item.option_group_id;
+    var optionItemId = (_ref4 = (_item$id = item === null || item === void 0 ? void 0 : item.id) !== null && _item$id !== void 0 ? _item$id : item === null || item === void 0 ? void 0 : item.option_group_item_id) !== null && _ref4 !== void 0 ? _ref4 : item === null || item === void 0 ? void 0 : item.product_option_item_id;
+    var optionGroup = product === null || product === void 0 || (_product$option_group = product.option_group) === null || _product$option_group === void 0 ? void 0 : _product$option_group.find(function (group) {
+      return String(group === null || group === void 0 ? void 0 : group.id) === String(optionGroupId);
+    });
+    var optionItem = optionGroup === null || optionGroup === void 0 || (_optionGroup$option_i = optionGroup.option_item) === null || _optionGroup$option_i === void 0 ? void 0 : _optionGroup$option_i.find(function (candidate) {
+      return String(candidate === null || candidate === void 0 ? void 0 : candidate.id) === String(optionItemId);
+    });
     return {
-      id: item === null || item === void 0 ? void 0 : item.id,
-      name: item === null || item === void 0 ? void 0 : item.name,
+      id: optionItemId,
+      name: (_ref5 = (_ref6 = (_item$name = item === null || item === void 0 ? void 0 : item.name) !== null && _item$name !== void 0 ? _item$name : item === null || item === void 0 ? void 0 : item.title) !== null && _ref6 !== void 0 ? _ref6 : optionItem === null || optionItem === void 0 ? void 0 : optionItem.name) !== null && _ref5 !== void 0 ? _ref5 : optionItem === null || optionItem === void 0 ? void 0 : optionItem.title,
       num: item === null || item === void 0 ? void 0 : item.num,
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
@@ -337,7 +364,7 @@ export var formatOptionsToOrigin = function formatOptionsToOrigin(options) {
   return options.map(function (d) {
     return {
       num: d.num,
-      option_group_item_id: d.option_group_item_id,
+      option_group_item_id: (d === null || d === void 0 ? void 0 : d.option_group_item_id) || (d === null || d === void 0 ? void 0 : d.product_option_item_id),
       option_group_id: d.option_group_id
     };
   });
@@ -431,11 +458,11 @@ export var getProductDeposit = function getProductDeposit(params) {
   // 判定商品是否有定金规则
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
     var total = new Decimal(0);
-    var _ref3 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
-      deposit_fixed = _ref3.deposit_fixed,
-      deposit_percentage = _ref3.deposit_percentage,
-      deposit_policy_data = _ref3.deposit_policy_data,
-      self_deposit_policy_ids = _ref3.self_deposit_policy_ids;
+    var _ref7 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref7.deposit_fixed,
+      deposit_percentage = _ref7.deposit_percentage,
+      deposit_policy_data = _ref7.deposit_policy_data,
+      self_deposit_policy_ids = _ref7.self_deposit_policy_ids;
     // 所有协议数据
     var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
@@ -529,9 +556,9 @@ export var handleProductDeposit = function handleProductDeposit(params) {
       depositTotal: new Decimal(0)
     };
   }
-  var _ref4 = depositData || {},
-    deposit_fixed = _ref4.deposit_fixed,
-    deposit_percentage = _ref4.deposit_percentage;
+  var _ref8 = depositData || {},
+    deposit_fixed = _ref8.deposit_fixed,
+    deposit_percentage = _ref8.deposit_percentage;
   if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);

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

@@ -592,7 +592,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -213,6 +213,7 @@ export interface VirtualCurrencySnapshotItem {
     id: number | string;
     tag: 'virtual_currency';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;

package/dist/modules/Order/utils.js

@@ -188,6 +188,10 @@ export function normalizeVirtualCurrencySnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  var code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function normalizeVirtualCurrencySnapshotList(value) {
@@ -219,6 +223,10 @@ export function buildVirtualCurrencySnapshotFromList(value) {
     if (productId !== undefined) {
       snapshot.product_id = productId;
     }
+    var code = normalizeSnapshotScalar(item.code);
+    if (code !== undefined) {
+      snapshot.code = String(code).trim();
+    }
     result.push(snapshot);
     return result;
   }, []);

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

@@ -218,6 +218,17 @@ export interface ProductData {
     bundle?: any[];
     /** 商品选项组成 */
     options?: any[];
+    /** 单规格组；用于由已选 option 反查规格项名称、价格等商品快照字段。 */
+    option_group?: Array<{
+        id: number | string;
+        option_item?: Array<{
+            id: number | string;
+            name?: string | Record<string, any>;
+            title?: string | Record<string, any>;
+            [key: string]: any;
+        }>;
+        [key: string]: any;
+    }>;
     /** 商品原信息 */
     origin?: any;
     /** 容量 */