@pisell/private-materials 6.6.58 → 6.6.59

package/es/components/booking/info/service2/Group/utils.js

@@ -7,7 +7,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
+import { setProductPrice } from "../../../info2/service/editService/utils";
 import { genServiceKey } from "../../../../ticketBooking/utils";
+import Decimal from "decimal.js";
 
 // 创建group
 
@@ -121,7 +123,34 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     // 折扣金额 转成负数
     var discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
-      bookings = distributeDiscountOrIncrease(bookings, discountAmount, groupOriginTotalPrice);
+      if (groupOriginTotalPrice !== 0) {
+        bookings = distributeDiscountOrIncrease(bookings, discountAmount, groupOriginTotalPrice);
+        bookings = bookings.map(function (booking) {
+          var _booking$_extend, _booking$_extend2;
+          return setProductPrice(booking, {
+            newTotal: booking === null || booking === void 0 || (_booking$_extend = booking._extend) === null || _booking$_extend === void 0 ? void 0 : _booking$_extend.total,
+            origin_total: booking === null || booking === void 0 || (_booking$_extend2 = booking._extend) === null || _booking$_extend2 === void 0 ? void 0 : _booking$_extend2.origin_total
+          });
+        });
+      } else {
+        // 原价为 0 无法按比例分摊（会除零），按 booking 数量均摊手动改价后的 groupTotalPrice
+        // 最后一个 booking 吸收两位小数的精度误差，确保总和等于 groupTotalPrice
+        var count = bookings.length;
+        var avgTotal = new Decimal(groupTotalPrice).div(count).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+        var assignedSum = new Decimal(0);
+        bookings = bookings.map(function (booking, i) {
+          var newTotal = i === count - 1 ? new Decimal(groupTotalPrice).sub(assignedSum).toNumber() : avgTotal.toNumber();
+          if (i !== count - 1) {
+            assignedSum = assignedSum.add(avgTotal);
+          }
+          return _objectSpread(_objectSpread({}, booking), {}, {
+            _extend: _objectSpread(_objectSpread({}, booking._extend), {}, {
+              total: newTotal,
+              price: newTotal
+            })
+          });
+        });
+      }
     }
   }
   console.log('bookings', bookings);

package/lib/components/booking/info/service2/Group/utils.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/components/booking/info/service2/Group/utils.ts
@@ -31,7 +41,9 @@ module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../../utils");
 var import_distributeDiscount = require("../../service/serviceManager/distributeDiscount");
-var import_utils3 = require("../../../../ticketBooking/utils");
+var import_utils3 = require("../../../info2/service/editService/utils");
+var import_utils4 = require("../../../../ticketBooking/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var getGroupTotalPrice = (items) => {
   return items.reduce((prev, next) => {
     prev.duration += next._extend.duration;
@@ -100,7 +112,7 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = origin_total ?? totalPrice;
     cacheItem._extend.items = void 0;
-    cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
+    cacheItem._serviceKey = (0, import_utils4.genServiceKey)(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {
@@ -108,7 +120,34 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     const groupOriginTotalPrice = item._extend.origin_total;
     const discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
-      bookings = (0, import_distributeDiscount.distributeDiscountOrIncrease)(bookings, discountAmount, groupOriginTotalPrice);
+      if (groupOriginTotalPrice !== 0) {
+        bookings = (0, import_distributeDiscount.distributeDiscountOrIncrease)(bookings, discountAmount, groupOriginTotalPrice);
+        bookings = bookings.map((booking) => {
+          var _a2, _b2;
+          return (0, import_utils3.setProductPrice)(booking, {
+            newTotal: (_a2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _a2.total,
+            origin_total: (_b2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _b2.origin_total
+          });
+        });
+      } else {
+        const count = bookings.length;
+        const avgTotal = new import_decimal.default(groupTotalPrice).div(count).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+        let assignedSum = new import_decimal.default(0);
+        bookings = bookings.map((booking, i) => {
+          const newTotal = i === count - 1 ? new import_decimal.default(groupTotalPrice).sub(assignedSum).toNumber() : avgTotal.toNumber();
+          if (i !== count - 1) {
+            assignedSum = assignedSum.add(avgTotal);
+          }
+          return {
+            ...booking,
+            _extend: {
+              ...booking._extend,
+              total: newTotal,
+              price: newTotal
+            }
+          };
+        });
+      }
     }
   }
   console.log("bookings", bookings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.58",
+  "version": "6.6.59",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.14",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",