@pisell/pisellos 0.0.566 → 0.0.567

package/dist/modules/SalesSummary/utils.js

@@ -271,7 +271,8 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
 
       // --- 主商品折后税费 ---
       var mainTotal = getMainProductPaymentTotal(product);
-      var surchargeFee = toDecimal(product.surcharge_fee);
+      var surchargeRoundingRemainder = toDecimal(product.surcharge_rounding_remainder);
+      var surchargeFee = toDecimal(product.surcharge_fee).plus(quantity.gt(0) ? surchargeRoundingRemainder.div(quantity) : 0);
       var mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
       var mainTaxPrecise = calculateSingleItemTax({
         price: mainTaxableBase,
@@ -440,8 +441,9 @@ export function calculateSalesSummary(params) {
     isEdit: false
   }) || 0);
   for (var i = 0; i < products.length; i++) {
-    var _surchargeServiceItem;
+    var _surchargeServiceItem, _surchargeServiceItem2;
     products[i].surcharge_fee = ((_surchargeServiceItem = surchargeServiceItems[i]) === null || _surchargeServiceItem === void 0 ? void 0 : _surchargeServiceItem.surcharge_fee) || 0;
+    products[i].surcharge_rounding_remainder = ((_surchargeServiceItem2 = surchargeServiceItems[i]) === null || _surchargeServiceItem2 === void 0 ? void 0 : _surchargeServiceItem2.surcharge_rounding_remainder) || 0;
   }
   var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
   var productTaxFee;

package/dist/modules/Summary/utils.js

@@ -1174,7 +1174,7 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
                 var _item2$item;
                 var originSurchargeFee = new Decimal(_item2.item.surcharge_fee || 0);
                 // 保留两位小数
-                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
                 productTotalSurcharge = productTotalSurcharge.plus(new Decimal(surchargeFee).times(itemQuantity).toNumber());
                 _item2.item.surcharge_fee = surchargeFee;
                 _item2.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item2$item = _item2.item) === null || _item2$item === void 0 ? void 0 : _item2$item.relation_surcharge_ids) || []), [id]);
@@ -1182,7 +1182,7 @@ export var getSurcharge = function getSurcharge(_ref14, options) {
                 var _item2$item2;
                 var _originSurchargeFee = new Decimal(_item2.item.surcharge_fee || 0);
                 // 保留两位小数
-                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
                 productTotalSurcharge = productTotalSurcharge.plus(new Decimal(_surchargeFee).times(itemQuantity).toNumber());
                 _item2.item.surcharge_fee = _surchargeFee;
                 _item2.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item2$item2 = _item2.item) === null || _item2$item2 === void 0 ? void 0 : _item2$item2.relation_surcharge_ids) || []), [id]);

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/SalesSummary/utils.js

@@ -227,7 +227,8 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
   for (const product of products) {
     const quantity = new import_decimal.default(getSafeNum(product.num));
     const mainTotal = getMainProductPaymentTotal(product);
-    const surchargeFee = toDecimal(product.surcharge_fee);
+    const surchargeRoundingRemainder = toDecimal(product.surcharge_rounding_remainder);
+    const surchargeFee = toDecimal(product.surcharge_fee).plus(quantity.gt(0) ? surchargeRoundingRemainder.div(quantity) : 0);
     const mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
     const mainTaxPrecise = calculateSingleItemTax({
       price: mainTaxableBase,
@@ -329,7 +330,7 @@ function createEmptySalesSummary() {
   };
 }
 function calculateSalesSummary(params) {
-  var _a;
+  var _a, _b;
   const {
     products,
     isPriceIncludeTax,
@@ -376,6 +377,7 @@ function calculateSalesSummary(params) {
   );
   for (let i = 0; i < products.length; i++) {
     products[i].surcharge_fee = ((_a = surchargeServiceItems[i]) == null ? void 0 : _a.surcharge_fee) || 0;
+    products[i].surcharge_rounding_remainder = ((_b = surchargeServiceItems[i]) == null ? void 0 : _b.surcharge_rounding_remainder) || 0;
   }
   const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
   let productTaxFee;

package/lib/modules/Summary/utils.js

@@ -746,13 +746,13 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (open_product !== 0) {
             if (item.isMain) {
               const originSurchargeFee = new import_decimal.default(item.item.surcharge_fee || 0);
-              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
               item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
             } else {
               const originSurchargeFee = new import_decimal.default(item.item.surcharge_fee || 0);
-              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
               item.item.relation_surcharge_ids = [...((_d = item.item) == null ? void 0 : _d.relation_surcharge_ids) || [], id];

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.566",
+  "version": "0.0.567",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",