@pisell/private-materials 6.6.50 → 6.6.52

package/es/components/booking/components/footer/amount.d.ts

@@ -1,5 +1,6 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
+export declare const getOptionDiscountAmount: (discounts: any[]) => number;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额

package/es/components/booking/components/footer/amount.js

@@ -807,6 +807,12 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
     return total.add(new Decimal(discount.amount || 0));
   }, new Decimal(0)).toNumber();
 };
+export var getOptionDiscountAmount = function getOptionDiscountAmount(discounts) {
+  return (discounts || []).reduce(function (total, discount) {
+    var _discount$metadata;
+    return total.add(new Decimal((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.optionDiscountAmount) || 0));
+  }, new Decimal(0)).toNumber();
+};
 
 /**
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
@@ -821,6 +827,9 @@ var getMainProductTotal = function getMainProductTotal(item) {
     total = total.add((_item$_extend$other5 = item._extend.other) === null || _item$_extend$other5 === void 0 ? void 0 : _item$_extend$other5.option.reduce(function (t, option) {
       return t.add(new Decimal(option.price || 0).mul(option.num || 1));
     }, new Decimal(0)));
+    if (item.booking_id) {
+      total = total.sub(getOptionDiscountAmount((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+    }
   }
   var _iterator13 = _createForOfIteratorHelper(((_item$_extend$other6 = item._extend.other) === null || _item$_extend$other6 === void 0 ? void 0 : _item$_extend$other6.bundle) || []),
     _step13;

package/es/components/booking/components/footer/utils.js

@@ -22,6 +22,7 @@ import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
+import { getOptionDiscountAmount } from "./amount";
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || '';
@@ -462,6 +463,9 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       var currentNum = new Decimal(currentValue.num || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
+    if (item !== null && item !== void 0 && item.booking_id) {
+      optionPrice = optionPrice.sub(getOptionDiscountAmount((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+    }
   }
   return new Decimal((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.main_product_selling_price).add(optionPrice).toNumber();
 };

package/es/components/ticketBooking/utils/index.js

@@ -413,8 +413,10 @@ export var rulesHooks = {
       _id: values._id || product._id,
       discount_list: values.discount_list,
       _extend: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, product._extend), {}, {
-        other: _objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
+        other: _objectSpread(_objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
           bundle: values.bundle
+        } : {}), Array.isArray(values.options) ? {
+          option: values.options
         } : {})
       }, 'total' in values ? {
         total: values.total

package/lib/components/booking/components/footer/amount.d.ts

@@ -1,5 +1,6 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
+export declare const getOptionDiscountAmount: (discounts: any[]) => number;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额

package/lib/components/booking/components/footer/amount.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var amount_exports = {};
 __export(amount_exports, {
   getIsPriceIncludeTax: () => getIsPriceIncludeTax,
+  getOptionDiscountAmount: () => getOptionDiscountAmount,
   getProductDiscountProductDiscountDifference: () => getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal: () => getRelationDetailsTotal,
   getSumTotal: () => getSumTotal
@@ -486,6 +487,12 @@ var getDiscountAmount = (discounts) => {
     return total.add(new import_decimal.default(discount.amount || 0));
   }, new import_decimal.default(0)).toNumber();
 };
+var getOptionDiscountAmount = (discounts) => {
+  return (discounts || []).reduce((total, discount) => {
+    var _a;
+    return total.add(new import_decimal.default(((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.optionDiscountAmount) || 0));
+  }, new import_decimal.default(0)).toNumber();
+};
 var getMainProductTotal = (item) => {
   var _a, _b, _c, _d, _e, _f;
   let total = new import_decimal.default(((_a = item._extend) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_selling_price) ?? item._extend.price ?? 0);
@@ -493,6 +500,9 @@ var getMainProductTotal = (item) => {
     total = total.add((_e = item._extend.other) == null ? void 0 : _e.option.reduce((t, option) => {
       return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
     }, new import_decimal.default(0)));
+    if (item.booking_id) {
+      total = total.sub(getOptionDiscountAmount((item == null ? void 0 : item.discount_list) || []));
+    }
   }
   for (let bundleItem of ((_f = item._extend.other) == null ? void 0 : _f.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -922,6 +932,7 @@ var getSumTotal = (state, options) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getIsPriceIncludeTax,
+  getOptionDiscountAmount,
   getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal,
   getSumTotal

package/lib/components/booking/components/footer/utils.js

@@ -56,6 +56,7 @@ var import_materials = require("@pisell/materials");
 var import_utils6 = require("../../../../plus/clientName/utils");
 var import_lodash = require("lodash");
 var import_decimal = __toESM(require("decimal.js"));
+var import_amount = require("./amount");
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -364,6 +365,9 @@ var getMainProductSellingPrice = (item) => {
       const currentNum = new import_decimal.default(currentValue.num || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
+    if (item == null ? void 0 : item.booking_id) {
+      optionPrice = optionPrice.sub((0, import_amount.getOptionDiscountAmount)((item == null ? void 0 : item.discount_list) || []));
+    }
   }
   return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };

package/lib/components/ticketBooking/utils/index.js

@@ -382,7 +382,9 @@ var rulesHooks = {
         ...product._extend,
         other: {
           ...product._extend.other,
-          ..."bundle" in values ? { bundle: values.bundle } : {}
+          ..."bundle" in values ? { bundle: values.bundle } : {},
+          // 仅在有有效数组时写入，避免 `options: undefined` 清空 other.option
+          ...Array.isArray(values.options) ? { option: values.options } : {}
         },
         ..."total" in values ? { total: values.total } : {},
         ..."main_product_selling_price" in values ? { main_product_selling_price: values.main_product_selling_price } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.50",
+  "version": "6.6.52",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,9 +61,9 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
+    "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.14",
-    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {