@pisell/pisellos 2.2.197 → 2.2.199

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

@@ -61,10 +61,14 @@ function mapOrderBundleToOtherBundle(bundle) {
     var selling = (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : catalogOriginal;
     var _omitBundleSelling = item.bundle_selling_price,
       rest = _objectWithoutProperties(item, _excluded);
-    return _objectSpread(_objectSpread({}, rest), {}, {
+    var isMarkupOrMarkdown = (item.price_type === 'markdown' || item.price_type === 'markup') && (item.price_type_ext === '' || item.price_type_ext === undefined || item.price_type_ext === null);
+    if (isMarkupOrMarkdown) delete rest.original_total;
+    return _objectSpread(_objectSpread(_objectSpread({}, rest), {}, {
       price: selling,
-      original_price: catalogOriginal,
-      original_total: (_item$original_total = item.original_total) !== null && _item$original_total !== void 0 ? _item$original_total : catalogOriginal,
+      original_price: catalogOriginal
+    }, isMarkupOrMarkdown ? {} : {
+      original_total: (_item$original_total = item.original_total) !== null && _item$original_total !== void 0 ? _item$original_total : catalogOriginal
+    }), {}, {
       num: (_ref4 = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1,
       quantity: (_ref5 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref5 !== void 0 ? _ref5 : 1
     });

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

@@ -14,6 +14,7 @@ import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 
 /** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
 var toDiscountPayload = function toDiscountPayload(discountItem) {
@@ -374,6 +375,7 @@ export var formatBundle = function formatBundle(bundle) {
 export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
   if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
   return bundle.map(function (d) {
+    var _d$price, _d$price_type, _d$price_type_ext;
     var getBundleValueByKey = function getBundleValueByKey(key) {
       var _d$originBundleItem;
       return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
@@ -382,6 +384,14 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       var _cur$metadata2;
       return pre + ((cur === null || cur === void 0 || (_cur$metadata2 = cur.metadata) === null || _cur$metadata2 === void 0 ? void 0 : _cur$metadata2.product_discount_difference) || 0);
     }, 0);
+    var normalizedBundle = _objectSpread(_objectSpread({}, d), {}, {
+      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
+      price: (_d$price = d === null || d === void 0 ? void 0 : d.price) !== null && _d$price !== void 0 ? _d$price : d === null || d === void 0 ? void 0 : d.custom_price,
+      bundle_selling_price: d === null || d === void 0 ? void 0 : d.bundle_selling_price,
+      price_type: (_d$price_type = d === null || d === void 0 ? void 0 : d.price_type) !== null && _d$price_type !== void 0 ? _d$price_type : d === null || d === void 0 ? void 0 : d.custom_price_type,
+      price_type_ext: (_d$price_type_ext = d === null || d === void 0 ? void 0 : d.price_type_ext) !== null && _d$price_type_ext !== void 0 ? _d$price_type_ext : d === null || d === void 0 ? void 0 : d.custom_price_type_ext,
+      option: getBundleValueByKey('option')
+    });
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -392,7 +402,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       extension_type: getBundleValueByKey('extension_type'),
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
-      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
+      "bundle_selling_price": getBundleSellingMagnitude(normalizedBundle).toFixed(2),
       "custom_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,

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

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import Decimal from "decimal.js";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 export function updateAllCartItemPrice(_x, _x2, _x3, _x4, _x5) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
@@ -54,18 +54,18 @@ function _updateAllCartItemPrice() {
                       var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                         return m.id === n.id;
                       });
-                      if (targetBundleItem.price_type === 'markdown') {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
-                      }
-                      // 如果有选择 option，还需要加上 option 的价格
-                      if (n.option) {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
-                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
-                        }, 0)).toNumber();
-                      }
                       if (targetBundleItem) {
-                        return _objectSpread(_objectSpread({}, n), {}, {
+                        var normalizedBundle = _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,
+                          custom_price: targetBundleItem.price,
+                          price_type: targetBundleItem.price_type,
+                          price_type_ext: targetBundleItem.price_type_ext
+                        });
+                        var bundleSellingPrice = getBundleSellingMagnitude(normalizedBundle).toFixed(2);
+                        return _objectSpread(_objectSpread({}, n), {}, {
+                          custom_price: targetBundleItem.price,
+                          price: targetBundleItem.price_type === 'markdown' ? bundleSellingPrice : targetBundleItem.price,
+                          bundle_selling_price: bundleSellingPrice,
                           base_price: targetBundleItem.base_price
                         });
                       }

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

@@ -34,6 +34,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * BigSale 弹窗等短生命周期场景通过 setEnableTempOrderPersist(false) 关闭。
      */
     private draftPersistEnabled;
+    private collectHydratedEditDiscounts;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
      * Only selected discounts get a non-zero value.
@@ -63,6 +64,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: Discount[];
@@ -147,11 +149,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
     private calculatePaymentGapAmount;
+    private calculatePaymentRoundingAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
     private calculateSummaryAmountGap;
     private getSummaryRefundAmount;
     private calculatePaymentTargetAmount;
+    private normalizeFingerprintMoney;
+    private normalizeFingerprintValue;
+    private buildProductFingerprintItem;
+    private buildOrderProductsFingerprint;
+    private buildProductStructuralFingerprintItem;
+    private buildOrderProductsStructuralFingerprint;
+    private getOriginalSalesSnapshot;
+    private restoreOriginalSnapshotIfProductsUnchanged;
+    private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;
@@ -186,6 +198,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
+    private isCustomerBoundDiscount;
+    private clearCustomerBoundDiscounts;
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
@@ -234,6 +248,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
+    private getBundleRuntimeIdentity;
+    private preservePersistedBundlePriceFields;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
     updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];