@pisell/pisellos 2.2.184 → 2.2.185

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 } from "./examples";

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

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

package/dist/modules/Order/index.js

@@ -1,7 +1,3 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -2224,8 +2220,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta, normalizedProduct, _normalizedProduct$me, _targetProduct$metada3, productUid, linked;
+        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _nextProduct$metadata, _targetProduct$metada3, _tempOrder$products$p;
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada4, productUid, linked;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -2292,8 +2288,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
               normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.booking_uid);
+              if (!booking && preservedBookingUid) {
+                normalizedProduct.booking_uid = preservedBookingUid;
+                normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
+                  booking_uid: preservedBookingUid
+                });
+              }
               if (booking) {
-                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.unique_identification_number) || unique_identification_number || createUuidV4());
+                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number || createUuidV4());
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
                   unique_identification_number: productUid
                 });
@@ -2315,18 +2318,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
-              _context19.next = 25;
+              _context19.next = 27;
               return this.applyPromotion();
-            case 25:
+            case 27:
               this.applyDiscount();
-              _context19.next = 28;
+              _context19.next = 30;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 28:
+            case 30:
               this.persistTempOrder();
               return _context19.abrupt("return", tempOrder.products);
-            case 30:
+            case 32:
             case "end":
               return _context19.stop();
           }
@@ -2341,7 +2344,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _targetProduct$metada4;
+        var _targetProduct$metada5;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -2382,7 +2385,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
@@ -3272,8 +3275,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       delete nextTempOrder.holder_id;
       nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
-      var rawProducts = Array.isArray(raw.products) ? raw.products : [];
-      nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
+      nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
         return _this10.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
@@ -3300,31 +3302,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }) : {
         productsByUid: {}
       };
-      var tempOrderExtend = nextTempOrder._extend;
-      var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator8 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step8;
-      try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var _product$metadata6, _ref23, _ref24, _existed$origin, _rawProduct$metadata;
-          var _step8$value = _slicedToArray(_step8.value, 2),
-            index = _step8$value[0],
-            product = _step8$value[1];
-          var uid = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number;
-          if (!uid) continue;
-          var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
-          var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref23 = (_ref24 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref24 !== void 0 ? _ref24 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref23 !== void 0 ? _ref23 : rawProduct;
-          productsByUid[uid] = _objectSpread(_objectSpread({}, existed), {}, {
-            origin: cloneDeep(origin)
-          });
-        }
-      } catch (err) {
-        _iterator8.e(err);
-      } finally {
-        _iterator8.f();
-      }
-      tempOrderExtend.productsByUid = productsByUid;
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
@@ -3334,10 +3311,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref25, _optionItem$num, _ref26, _optionItem$price;
-      var rawNum = (_ref25 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref25 !== void 0 ? _ref25 : 1;
+      var _ref23, _optionItem$num, _ref24, _optionItem$price;
+      var rawNum = (_ref23 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref23 !== void 0 ? _ref23 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref26 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref26 !== void 0 ? _ref26 : 0;
+      var rawPrice = (_ref24 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref24 !== void 0 ? _ref24 : 0;
       var parsedPrice = Number(rawPrice);
       return {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -3370,6 +3347,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       row.product_option_item = this.resolveHydratedProductOptions(row);
       if (!Array.isArray(row.product_bundle)) row.product_bundle = [];
       if (!row.metadata || _typeof(row.metadata) !== 'object') row.metadata = {};
+      if (row.booking_uid && !row.metadata.booking_uid) {
+        row.metadata.booking_uid = row.booking_uid;
+      }
       var existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
       if (!existingIdentity) {
         row.metadata.unique_identification_number = createUuidV4();
@@ -3432,67 +3412,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator9 = _createForOfIteratorHelper(productList),
-        _step9;
+      var _iterator8 = _createForOfIteratorHelper(productList),
+        _step8;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var product = _step9.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var product = _step8.value;
           var qty = product.num || 1;
-          var _iterator11 = _createForOfIteratorHelper(product.discount_list || []),
-            _step11;
+          var _iterator10 = _createForOfIteratorHelper(product.discount_list || []),
+            _step10;
           try {
-            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-              var pd = _step11.value;
+            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+              var pd = _step10.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator11.e(err);
+            _iterator10.e(err);
           } finally {
-            _iterator11.f();
+            _iterator10.f();
           }
-          var _iterator12 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step12;
+          var _iterator11 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step11;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-              var _ref27, _bundle$num;
-              var bundle = _step12.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref27 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1) || 1).toNumber();
-              var _iterator13 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step13;
+            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+              var _ref25, _bundle$num;
+              var bundle = _step11.value;
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref25 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref25 !== void 0 ? _ref25 : 1) || 1).toNumber();
+              var _iterator12 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step12;
               try {
-                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                  var _pd = _step13.value;
+                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+                  var _pd = _step12.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator13.e(err);
+                _iterator12.e(err);
               } finally {
-                _iterator13.f();
+                _iterator12.f();
               }
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator11.e(err);
           } finally {
-            _iterator12.f();
+            _iterator11.f();
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator9.f();
+        _iterator8.f();
       }
-      var _iterator10 = _createForOfIteratorHelper(discountList),
-        _step10;
+      var _iterator9 = _createForOfIteratorHelper(discountList),
+        _step9;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var d = _step10.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var d = _step9.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator10.f();
+        _iterator9.f();
       }
     }
   }]);

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -33,7 +33,7 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
     var _ref, _optionItem$price, _optionItem$num;
-    var optionGroupItemId = toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id);
+    var optionGroupItemId = toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.id);
     var price = (_ref = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
     return {
       option_group_item_id: optionGroupItemId,

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -1,49 +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,
-  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,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

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

package/lib/modules/Order/index.js

@@ -1559,7 +1559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
   }
   async updateOrderProduct(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const {
       product_id,
       product_variant_id,
@@ -1634,9 +1634,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
+    const preservedBookingUid = nextProduct.booking_uid || ((_e = nextProduct.metadata) == null ? void 0 : _e.booking_uid) || targetProduct.booking_uid || ((_f = targetProduct.metadata) == null ? void 0 : _f.booking_uid);
+    if (!booking && preservedBookingUid) {
+      normalizedProduct.booking_uid = preservedBookingUid;
+      normalizedProduct.metadata = {
+        ...normalizedProduct.metadata || {},
+        booking_uid: preservedBookingUid
+      };
+    }
     if (booking) {
       const productUid = String(
-        ((_e = normalizedProduct.metadata) == null ? void 0 : _e.unique_identification_number) || ((_f = targetProduct.metadata) == null ? void 0 : _f.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_g = normalizedProduct.metadata) == null ? void 0 : _g.unique_identification_number) || ((_h = targetProduct.metadata) == null ? void 0 : _h.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -1666,7 +1674,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_g = tempOrder.products[productIndex].metadata) == null ? void 0 : _g.unique_identification_number
+      (_i = tempOrder.products[productIndex].metadata) == null ? void 0 : _i.unique_identification_number
     );
     await this.applyPromotion();
     this.applyDiscount();
@@ -2274,7 +2282,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return nextTempOrder;
   }
   normalizeTempOrderForRuntime(raw, options) {
-    var _a, _b;
     const nextTempOrder = {
       ...this.createDefaultTempOrderInstance(),
       ...raw || {}
@@ -2294,8 +2301,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     delete nextTempOrder.holder_id;
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
-    const rawProducts = Array.isArray(raw.products) ? raw.products : [];
-    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => ({
       ...b || {},
       is_all: (0, import_utils.normalizeBookingIsAll)(b || {}),
@@ -2310,21 +2316,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...raw._extend,
       productsByUid: raw._extend.productsByUid || {}
     } : { productsByUid: {} };
-    const tempOrderExtend = nextTempOrder._extend;
-    const productsByUid = tempOrderExtend.productsByUid || {};
-    for (const [index, product] of nextTempOrder.products.entries()) {
-      const uid = (_a = product.metadata) == null ? void 0 : _a.unique_identification_number;
-      if (!uid)
-        continue;
-      const existed = productsByUid[uid] && typeof productsByUid[uid] === "object" ? productsByUid[uid] : {};
-      const rawProduct = rawProducts[index] && typeof rawProducts[index] === "object" ? rawProducts[index] : product;
-      const origin = existed.origin ?? rawProduct._origin ?? ((_b = rawProduct.metadata) == null ? void 0 : _b.origin) ?? rawProduct;
-      productsByUid[uid] = {
-        ...existed,
-        origin: (0, import_lodash_es.cloneDeep)(origin)
-      };
-    }
-    tempOrderExtend.productsByUid = productsByUid;
     if ((options == null ? void 0 : options.ensureIdentity) !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
@@ -2365,6 +2356,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       row.product_bundle = [];
     if (!row.metadata || typeof row.metadata !== "object")
       row.metadata = {};
+    if (row.booking_uid && !row.metadata.booking_uid) {
+      row.metadata.booking_uid = row.booking_uid;
+    }
     const existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
     if (!existingIdentity) {
       row.metadata.unique_identification_number = (0, import_utils.createUuidV4)();

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -53,7 +53,7 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
   return optionItems.map((optionItem) => {
-    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.option_group_item_id);
+    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.id);
     const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     return {
       option_group_item_id: optionGroupItemId,

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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