@pisell/pisellos 2.2.182 → 2.2.184

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

@@ -747,9 +747,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.price - a.price;
       });
 
-      // 3. 计算可以凑成多少组
+      // 3. 计算可以凑成多少组（cumulative 缺省视为 true，与 adapter 一致）
       var totalUnits = unitProducts.length;
-      var groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+      var isCumulative = cumulative !== false;
+      var groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
       var promotionUnits = groupCount * x;
 
       // 4. 分离参与促销的和不参与的商品

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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -312,6 +312,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private normalizeHydratedProductOptionItem;
+    private resolveHydratedProductOptions;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;

package/dist/modules/Order/index.js

@@ -1,3 +1,7 @@
+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); }
@@ -2108,7 +2112,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) : null;
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
               incomingFingerprint = buildProductLineFingerprint(productToAdd.product_option_item, productToAdd.product_bundle);
-              normalizedIncoming = normalizeOrderProduct(productToAdd);
+              normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
               normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
@@ -2156,11 +2160,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 targetProduct = matchedProduct;
                 targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-                normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+                normalizedProduct = mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
                   metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
                     unique_identification_number: targetUid
                   })
-                }));
+                })));
                 normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
                 tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
                   metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
@@ -2286,7 +2290,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
-              normalizedProduct = normalizeOrderProduct(nextProduct);
+              normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               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());
@@ -3187,6 +3191,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context32.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
+              }, {
+                osServer: true
               });
             case 2:
               res = _context32.sent;
@@ -3215,34 +3221,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(record, options) {
-        var raw, defaults, nextTempOrder, TEMP_ORDER_KEYS;
+        var raw, nextTempOrder;
         return _regeneratorRuntime().wrap(function _callee31$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              defaults = this.createDefaultTempOrderInstance();
-              nextTempOrder = _objectSpread({}, defaults);
-              TEMP_ORDER_KEYS = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'customer', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'buzzer', 'delivery_type', 'table_number', 'schedule_date', 'created_at', 'request_unique_idempotency_token'];
-              TEMP_ORDER_KEYS.forEach(function (key) {
-                if (raw[key] !== undefined) {
-                  nextTempOrder[key] = raw[key];
-                }
-              });
+              nextTempOrder = this.normalizeTempOrderForRuntime(raw);
               this.store.tempOrder = nextTempOrder;
               this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context33.next = 11;
+                _context33.next = 8;
                 break;
               }
-              _context33.next = 11;
+              _context33.next = 8;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 11:
+            case 8:
               this.persistTempOrder();
               return _context33.abrupt("return", nextTempOrder);
-            case 13:
+            case 10:
             case "end":
               return _context33.stop();
           }
@@ -3273,7 +3272,8 @@ 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;
-      nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
+      var rawProducts = Array.isArray(raw.products) ? raw.products : [];
+      nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
         return _this10.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
@@ -3300,11 +3300,66 @@ 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);
       }
+      nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    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 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 parsedPrice = Number(rawPrice);
+      return {
+        option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
+        option_group_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id,
+        num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
+        price: Number.isFinite(parsedPrice) ? parsedPrice : 0
+      };
+    }
+  }, {
+    key: "resolveHydratedProductOptions",
+    value: function resolveHydratedProductOptions(row) {
+      var _row$product_sku,
+        _this11 = this;
+      if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
+        return row.product_option_item;
+      }
+      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.option;
+      if (!Array.isArray(skuOptions)) return [];
+      return skuOptions.map(function (optionItem) {
+        return _this11.normalizeHydratedProductOptionItem(optionItem || {});
+      });
+    }
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
@@ -3312,7 +3367,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
       }
-      if (!Array.isArray(row.product_option_item)) row.product_option_item = [];
+      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 = {};
       var existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
@@ -3322,6 +3377,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var normalized = normalizeOrderProduct(row);
       normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
+        product_sku: row.product_sku,
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
       if (result.metadata) delete result.metadata.price_schema_version;
@@ -3376,67 +3432,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 _iterator8 = _createForOfIteratorHelper(productList),
-        _step8;
+      var _iterator9 = _createForOfIteratorHelper(productList),
+        _step9;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var product = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var product = _step9.value;
           var qty = product.num || 1;
-          var _iterator10 = _createForOfIteratorHelper(product.discount_list || []),
-            _step10;
+          var _iterator11 = _createForOfIteratorHelper(product.discount_list || []),
+            _step11;
           try {
-            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-              var pd = _step10.value;
+            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+              var pd = _step11.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator10.e(err);
+            _iterator11.e(err);
           } finally {
-            _iterator10.f();
+            _iterator11.f();
           }
-          var _iterator11 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step11;
+          var _iterator12 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step12;
           try {
-            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-              var _ref23, _bundle$num;
-              var bundle = _step11.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref23 = (_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 && _ref23 !== void 0 ? _ref23 : 1) || 1).toNumber();
-              var _iterator12 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step12;
+            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;
               try {
-                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-                  var _pd = _step12.value;
+                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                  var _pd = _step13.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator12.e(err);
+                _iterator13.e(err);
               } finally {
-                _iterator12.f();
+                _iterator13.f();
               }
             }
           } catch (err) {
-            _iterator11.e(err);
+            _iterator12.e(err);
           } finally {
-            _iterator11.f();
+            _iterator12.f();
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
-      var _iterator9 = _createForOfIteratorHelper(discountList),
-        _step9;
+      var _iterator10 = _createForOfIteratorHelper(discountList),
+        _step10;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var d = _step9.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var d = _step10.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator9.f();
+        _iterator10.f();
       }
     }
   }]);

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

@@ -397,6 +397,7 @@ export interface SubmitSalesOrderParams {
         products: OrderSubmitProduct[];
         bookings: OrderSubmitBooking[];
         payments: any[];
+        vouchers: any[];
         surcharges?: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -176,6 +176,18 @@ export declare function getOrderProductOriginalPriceForPromotion(product: any):
 export declare function mergeIdenticalPromotionCartLines(products: any[]): any[];
 /** 获取行 uid（统一以 `metadata.unique_identification_number` 为唯一键） */
 export declare function getOrderProductUid(product: any): string;
+/**
+ * 促销评估前合并同 SKU 拆分行（含促销/原价行），避免加购后仅前 2 件享受优惠。
+ * 带 `booking_uid` 的预约行不参与合并（每次加车独立 booking + 商品行）。
+ *
+ * @example
+ * consolidateMainProductsForPromotion([
+ *   { item: promoLineNum2, originalListIndex: 0 },
+ *   { item: regularLineNum2, originalListIndex: 1 },
+ * ]);
+ * // => 单行 num=4，清除 _promotion 后重新评估
+ */
+export declare function buildConsolidateKeyForPromotion(item: any): string;
 /**
  * 从策略配置的 product_match 规则提取可参与商品列表。
  *