@pisell/pisellos 2.2.183 → 2.2.185

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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         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

@@ -2108,7 +2108,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 +2156,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 || {}), {}, {
@@ -2220,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:
@@ -2286,10 +2286,17 @@ 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);
+              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
                 });
@@ -2311,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();
           }
@@ -2337,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) {
@@ -2378,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);
@@ -3187,6 +3194,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;
@@ -3299,6 +3308,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "normalizeHydratedProductOptionItem",
+    value: function normalizeHydratedProductOptionItem(optionItem) {
+      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 = (_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,
+        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) {
@@ -3306,9 +3344,12 @@ 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 = {};
+      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();
@@ -3316,6 +3357,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;
@@ -3392,9 +3434,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step11;
           try {
             for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-              var _ref23, _bundle$num;
+              var _ref25, _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 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 {

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/index.js

@@ -606,103 +606,102 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-              debugger;
               if (params.forceRemote) {
-                _context5.next = 36;
+                _context5.next = 35;
                 break;
               }
               if (!(params.orderId !== undefined)) {
-                _context5.next = 12;
+                _context5.next = 11;
                 break;
               }
-              _context5.next = 9;
+              _context5.next = 8;
               return this.store.order.getLocalOrderByOrderId(params.orderId);
-            case 9:
+            case 8:
               _context5.t0 = _context5.sent;
-              _context5.next = 27;
+              _context5.next = 26;
               break;
-            case 12:
+            case 11:
               if (!externalSaleNumber) {
-                _context5.next = 18;
+                _context5.next = 17;
                 break;
               }
-              _context5.next = 15;
+              _context5.next = 14;
               return this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber);
-            case 15:
+            case 14:
               _context5.t1 = _context5.sent;
-              _context5.next = 26;
+              _context5.next = 25;
               break;
-            case 18:
+            case 17:
               if (!params.orderNumber) {
-                _context5.next = 24;
+                _context5.next = 23;
                 break;
               }
-              _context5.next = 21;
+              _context5.next = 20;
               return this.store.order.getLocalOrderByOrderNumber(params.orderNumber);
-            case 21:
+            case 20:
               _context5.t2 = _context5.sent;
-              _context5.next = 25;
+              _context5.next = 24;
               break;
-            case 24:
+            case 23:
               _context5.t2 = null;
-            case 25:
+            case 24:
               _context5.t1 = _context5.t2;
-            case 26:
+            case 25:
               _context5.t0 = _context5.t1;
-            case 27:
+            case 26:
               localRecord = _context5.t0;
               if (!localRecord) {
-                _context5.next = 36;
+                _context5.next = 35;
                 break;
               }
-              _context5.next = 31;
+              _context5.next = 30;
               return this.store.order.hydrateTempOrderFromRecord(localRecord, {
                 recalcOnHydrate: false
               });
-            case 31:
+            case 30:
               _sales = _context5.sent;
               this.currentSalesDetail = _sales;
-              _context5.next = 35;
+              _context5.next = 34;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: _sales
               });
-            case 35:
+            case 34:
               return _context5.abrupt("return", _sales);
-            case 36:
+            case 35:
               if (!(params.orderId === undefined || params.orderId === null)) {
-                _context5.next = 38;
+                _context5.next = 37;
                 break;
               }
               throw new Error('加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber');
-            case 38:
-              _context5.next = 40;
+            case 37:
+              _context5.next = 39;
               return this.store.order.getOrderInfoByRemote(Number(params.orderId));
-            case 40:
+            case 39:
               res = _context5.sent;
               if (!(!res || res.code !== 200)) {
-                _context5.next = 44;
+                _context5.next = 43;
                 break;
               }
               message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(params.orderId);
               throw new Error(message);
-            case 44:
-              _context5.next = 46;
+            case 43:
+              _context5.next = 45;
               return this.store.order.hydrateTempOrderFromRecord(res.data, {
                 recalcOnHydrate: false
               });
-            case 46:
+            case 45:
               sales = _context5.sent;
-              _context5.next = 49;
+              _context5.next = 48;
               return this.store.order.saveDraft();
-            case 49:
+            case 48:
               this.currentSalesDetail = sales;
-              _context5.next = 52;
+              _context5.next = 51;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 52:
+            case 51:
               return _context5.abrupt("return", sales);
-            case 53:
+            case 52:
             case "end":
               return _context5.stop();
           }

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 规则提取可参与商品列表。
  *