@pisell/pisellos 2.2.193 → 2.2.194

package/lib/modules/SalesSummary/utils.js

@@ -42,6 +42,31 @@ function toDecimal(value) {
 function toFixed2(value) {
   return new import_decimal.default(value || 0).toFixed(2);
 }
+function toAmountFormat(value) {
+  return new import_decimal.default(value || 0).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+}
+function toBackendTaxFee(value) {
+  return toBcScale(value, 2);
+}
+function toBcScale(value, scale) {
+  const factor = new import_decimal.default(10).pow(scale);
+  return new import_decimal.default(value || 0).times(factor).toDecimalPlaces(0, import_decimal.default.ROUND_DOWN).div(factor);
+}
+function bcAdd(left, right, scale) {
+  return toBcScale(new import_decimal.default(left || 0).plus(right || 0), scale);
+}
+function bcSub(left, right, scale) {
+  return toBcScale(new import_decimal.default(left || 0).minus(right || 0), scale);
+}
+function bcMul(left, right, scale) {
+  return toBcScale(new import_decimal.default(left || 0).times(right || 0), scale);
+}
+function bcDiv(left, right, scale) {
+  const divisor = new import_decimal.default(right || 0);
+  if (divisor.eq(0))
+    return new import_decimal.default(0);
+  return toBcScale(new import_decimal.default(left || 0).div(divisor), scale);
+}
 function getSafeNum(num) {
   if (!num || Number.isNaN(num))
     return 1;
@@ -71,6 +96,11 @@ function getUnitOriginalTotal(product) {
   const basePrice = mainOriginal !== void 0 ? toDecimal(mainOriginal) : mainSelling !== void 0 ? toDecimal(mainSelling) : toDecimal(product.original_price || product.selling_price);
   return basePrice.plus(getBundleUnitPrice(product, true));
 }
+function isGeneratedVoucherProduct(product) {
+  const record = product;
+  const metadata = (record == null ? void 0 : record.metadata) || {};
+  return (record == null ? void 0 : record.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+}
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {
     var _a, _b;
@@ -101,6 +131,252 @@ function buildSurchargeServiceItems(products) {
     };
   });
 }
+function getRelationSurchargeIds(item) {
+  var _a;
+  const ids = (item == null ? void 0 : item.relation_surcharge_ids) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.relation_surcharge_ids);
+  if (!Array.isArray(ids))
+    return [];
+  return ids.filter((id) => id !== void 0 && id !== null && id !== "");
+}
+function getSurchargeConfigId(config) {
+  return (config == null ? void 0 : config.id) ?? (config == null ? void 0 : config.surcharge_id);
+}
+function getSurchargeConfigById(surchargeList) {
+  const map = /* @__PURE__ */ new Map();
+  for (const config of surchargeList || []) {
+    const id = getSurchargeConfigId(config);
+    if (id !== void 0)
+      map.set(id, config);
+  }
+  return map;
+}
+function getMainSurchargeUnitAmount(product) {
+  var _a, _b;
+  const record = product;
+  return toDecimal(
+    ((_a = record.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price) ?? ((_b = record.metadata) == null ? void 0 : _b.main_product_selling_price) ?? record.selling_price ?? 0
+  );
+}
+function getBundleSurchargeUnitAmount(bundle) {
+  return toDecimal((bundle == null ? void 0 : bundle.bundle_selling_price) ?? (bundle == null ? void 0 : bundle.bundle_sum_price) ?? (bundle == null ? void 0 : bundle.price) ?? 0);
+}
+function getBundleProductId(bundle) {
+  const id = (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id);
+  if (id === void 0 || id === null || id === "")
+    return null;
+  const parsed = Number(id);
+  if (!Number.isFinite(parsed))
+    return null;
+  return parsed;
+}
+function createSurchargeAllocationNodes(products, sourceItems) {
+  var _a;
+  const nodes = [];
+  for (let productIndex = 0; productIndex < products.length; productIndex++) {
+    const product = products[productIndex];
+    const sourceItem = sourceItems[productIndex] || {};
+    const productQuantity = new import_decimal.default(getSafeNum(product.num));
+    for (let bundleIndex = 0; bundleIndex < (product.product_bundle || []).length; bundleIndex++) {
+      const bundle = product.product_bundle[bundleIndex];
+      if (!isBundleOriginalPrice(bundle))
+        continue;
+      const sourceBundle = ((_a = sourceItem == null ? void 0 : sourceItem.bundle) == null ? void 0 : _a[bundleIndex]) || {};
+      nodes.push({
+        kind: "bundle",
+        target: bundle,
+        source: sourceBundle,
+        productId: getBundleProductId(bundle),
+        unitAmount: getBundleSurchargeUnitAmount(bundle),
+        quantity: new import_decimal.default(getSafeNum((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity))).times(productQuantity),
+        relationSurchargeIds: getRelationSurchargeIds(sourceBundle)
+      });
+    }
+    nodes.push({
+      kind: "main",
+      target: product,
+      source: sourceItem,
+      productId: product.product_id ?? null,
+      unitAmount: getMainSurchargeUnitAmount(product),
+      quantity: productQuantity,
+      relationSurchargeIds: getRelationSurchargeIds(sourceItem)
+    });
+  }
+  return nodes;
+}
+function resetProductSurchargeFields(products) {
+  for (const product of products) {
+    product.surcharge_fee = 0;
+    product.main_product_attached_bundle_surcharge_fee = "0.00";
+    product.surcharge_rounding_remainder = 0;
+    product.relation_surcharge_ids = [];
+    for (const bundle of product.product_bundle || []) {
+      bundle.surcharge_fee = 0;
+      bundle.relation_surcharge_ids = [];
+      bundle.metadata = {
+        ...bundle.metadata || {},
+        surcharge_fee: "0.00",
+        surcharge_rounding_remainder: "0.00",
+        relation_surcharge_ids: []
+      };
+    }
+  }
+}
+function buildSurchargeQuantityTotals(nodes) {
+  const totals = /* @__PURE__ */ new Map();
+  for (const node of nodes) {
+    for (const surchargeId of node.relationSurchargeIds) {
+      totals.set(
+        surchargeId,
+        (totals.get(surchargeId) || new import_decimal.default(0)).plus(node.quantity)
+      );
+    }
+  }
+  return totals;
+}
+function getFallbackAllProductSurchargeIds(surchargeList) {
+  return (surchargeList || []).reduce((ids, config) => {
+    const id = getSurchargeConfigId(config);
+    if (id === void 0)
+      return ids;
+    if (Number(config.open_product ?? 0) === 0)
+      return ids;
+    if (Number(config.is_all ?? 0) !== 1)
+      return ids;
+    ids.push(id);
+    return ids;
+  }, []);
+}
+function getBackendSurchargeState(stateMap, surchargeId, config) {
+  let state = stateMap.get(surchargeId);
+  if (!state) {
+    state = {
+      config,
+      amount: new import_decimal.default(0),
+      totalOffsetFee: new import_decimal.default(0),
+      calculatedQuantity: new import_decimal.default(0),
+      fixedIncluded: false,
+      fixedRemainderAssigned: false
+    };
+    stateMap.set(surchargeId, state);
+  }
+  return state;
+}
+function applySurchargeNodeResult(node, params) {
+  const { unitSurchargeFee, roundingRemainder, surchargeIds } = params;
+  if (node.kind === "main") {
+    node.target.surcharge_fee = unitSurchargeFee.toNumber();
+    node.target.main_product_attached_bundle_surcharge_fee = toFixed2(unitSurchargeFee);
+    node.target.surcharge_rounding_remainder = roundingRemainder.toNumber();
+    node.target.relation_surcharge_ids = surchargeIds;
+    return;
+  }
+  node.target.surcharge_fee = unitSurchargeFee.toNumber();
+  node.target.relation_surcharge_ids = surchargeIds;
+  node.target.metadata = {
+    ...node.target.metadata || {},
+    surcharge_fee: toFixed2(unitSurchargeFee),
+    surcharge_rounding_remainder: toFixed2(roundingRemainder),
+    relation_surcharge_ids: surchargeIds
+  };
+}
+function calculateBackendProductSurcharges(params) {
+  const { products, sourceItems, surchargeList } = params;
+  resetProductSurchargeFields(products);
+  const configById = getSurchargeConfigById(surchargeList);
+  const nodes = createSurchargeAllocationNodes(products, sourceItems);
+  const fallbackAllProductSurchargeIds = getFallbackAllProductSurchargeIds(surchargeList);
+  for (const node of nodes) {
+    if (node.relationSurchargeIds.length === 0) {
+      node.relationSurchargeIds = fallbackAllProductSurchargeIds;
+    }
+  }
+  const quantityTotals = buildSurchargeQuantityTotals(nodes);
+  const stateMap = /* @__PURE__ */ new Map();
+  for (const node of nodes) {
+    let unitSurchargeFee = new import_decimal.default(0);
+    let roundingRemainder = new import_decimal.default(0);
+    const appliedSurchargeIds = [];
+    for (const surchargeId of node.relationSurchargeIds) {
+      const config = configById.get(surchargeId);
+      const totalQuantity = quantityTotals.get(surchargeId) || new import_decimal.default(0);
+      if (!config || totalQuantity.lte(0))
+        continue;
+      const percentage = new import_decimal.default(config.percentage || 0);
+      const fixed = new import_decimal.default(config.fixed || 0);
+      const unitPercentageFee = import_decimal.default.max(0, bcMul(node.unitAmount, percentage, 2));
+      const percentageTotalFee = bcMul(node.quantity, unitPercentageFee, 2);
+      let unitFixedFee = new import_decimal.default(0);
+      let fixedRemainder = new import_decimal.default(0);
+      if (fixed.gt(0)) {
+        unitFixedFee = bcDiv(fixed, totalQuantity, 2);
+        const distributedFixed = bcMul(unitFixedFee, totalQuantity, 2);
+        fixedRemainder = bcSub(fixed, distributedFixed, 2);
+      }
+      const currentUnitSurcharge = import_decimal.default.max(
+        0,
+        bcAdd(unitPercentageFee, unitFixedFee, 2)
+      );
+      if (currentUnitSurcharge.lte(0))
+        continue;
+      const state = getBackendSurchargeState(stateMap, surchargeId, config);
+      state.amount = bcAdd(state.amount, percentageTotalFee, 2);
+      const precisePercentage = import_decimal.default.max(0, bcMul(node.unitAmount, percentage, 6));
+      const offsetBaseFee = import_decimal.default.max(0, bcSub(precisePercentage, unitPercentageFee, 6));
+      state.totalOffsetFee = bcAdd(
+        state.totalOffsetFee,
+        bcMul(offsetBaseFee, node.quantity, 6),
+        6
+      );
+      state.calculatedQuantity = bcAdd(state.calculatedQuantity, node.quantity, 6);
+      if (!state.fixedIncluded && fixed.gt(0)) {
+        state.amount = bcAdd(state.amount, fixed, 2);
+        state.fixedIncluded = true;
+      }
+      if (!state.fixedRemainderAssigned && !fixedRemainder.eq(0)) {
+        state.fixedRemainderAssigned = true;
+        roundingRemainder = bcAdd(roundingRemainder, fixedRemainder, 2);
+      }
+      if (state.calculatedQuantity.gte(totalQuantity) && state.totalOffsetFee.gt(0)) {
+        const totalOffsetFee = toAmountFormat(state.totalOffsetFee);
+        state.amount = bcAdd(state.amount, totalOffsetFee, 2);
+        roundingRemainder = bcAdd(roundingRemainder, totalOffsetFee, 2);
+        state.totalOffsetFee = new import_decimal.default(0);
+      }
+      unitSurchargeFee = bcAdd(unitSurchargeFee, currentUnitSurcharge, 2);
+      appliedSurchargeIds.push(surchargeId);
+    }
+    applySurchargeNodeResult(node, {
+      unitSurchargeFee,
+      roundingRemainder,
+      surchargeIds: appliedSurchargeIds
+    });
+  }
+  return (surchargeList || []).reduce((result, config, index) => {
+    const surchargeId = getSurchargeConfigId(config);
+    if (surchargeId === void 0)
+      return result;
+    const state = stateMap.get(surchargeId);
+    if (!state || state.amount.lte(0))
+      return result;
+    const name = config.name || config.label || {};
+    result.push({
+      key: `custom_surcharge_${index}`,
+      label: name,
+      name,
+      value: state.amount.toNumber(),
+      surcharge_id: surchargeId,
+      description: config.description,
+      type: "default",
+      fixed: config.fixed,
+      amount: state.amount.toNumber(),
+      percentage: config.percentage,
+      metadata: {
+        open_product: config.open_product
+      }
+    });
+    return result;
+  }, []);
+}
 function getProductDepositData(product) {
   var _a, _b, _c;
   const rootDepositData = (_a = product._origin) == null ? void 0 : _a.custom_deposit_data;
@@ -219,47 +495,85 @@ function getMainProductPaymentTotal(product) {
   }
   return import_decimal.default.max(total, 0);
 }
+function getExplicitTaxRemainder(item) {
+  var _a;
+  const value = (item == null ? void 0 : item.tax_fee_rounding_remainder) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder);
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return new import_decimal.default(value || 0);
+}
+function getPersistedTaxRemainder(item, parentProduct) {
+  const isPersistedLine = (item == null ? void 0 : item.order_detail_id) !== void 0 && (item == null ? void 0 : item.order_detail_id) !== null || (parentProduct == null ? void 0 : parentProduct.order_detail_id) !== void 0 && (parentProduct == null ? void 0 : parentProduct.order_detail_id) !== null;
+  if (!isPersistedLine)
+    return null;
+  return getExplicitTaxRemainder(item);
+}
+function writeTaxRemainder(item, roundingRemainder) {
+  item.tax_fee_rounding_remainder = roundingRemainder.toNumber();
+  if (item.metadata && typeof item.metadata === "object") {
+    item.metadata.tax_fee_rounding_remainder = roundingRemainder.toFixed(2);
+  }
+}
+function resetTaxRemainderFields(products) {
+  for (const product of products) {
+    const productRemainder = getPersistedTaxRemainder(product);
+    product.tax_fee_rounding_remainder = (productRemainder == null ? void 0 : productRemainder.toNumber()) ?? 0;
+    product.original_tax_fee_rounding_remainder = 0;
+    for (const bundle of product.product_bundle || []) {
+      const bundleRemainder = getPersistedTaxRemainder(bundle, product);
+      bundle.metadata = {
+        ...bundle.metadata || {},
+        tax_fee_rounding_remainder: (bundleRemainder == null ? void 0 : bundleRemainder.toFixed(2)) ?? "0.00"
+      };
+      bundle.tax_fee_rounding_remainder = (bundleRemainder == null ? void 0 : bundleRemainder.toNumber()) ?? 0;
+      bundle.original_tax_fee_rounding_remainder = 0;
+    }
+  }
+}
+function getBundlePaymentPrice(bundle, product) {
+  var _a;
+  if ((bundle == null ? void 0 : bundle.bundle_payment_price) !== void 0)
+    return toDecimal(bundle.bundle_payment_price);
+  const basePrice = toDecimal((bundle == null ? void 0 : bundle.bundle_selling_price) ?? (bundle == null ? void 0 : bundle.bundle_sum_price) ?? (bundle == null ? void 0 : bundle.price) ?? 0);
+  if (!isBundleOriginalPrice(bundle))
+    return basePrice;
+  const averageDiscountRate = toDecimal(
+    ((_a = product.metadata) == null ? void 0 : _a.average_discount_amount_rate) ?? 1
+  );
+  return toAmountFormat(bcMul(basePrice, averageDiscountRate, 6));
+}
+function applyBackendTaxRemainder(params) {
+  const { target, rawTax, formattedTax, quantity, state } = params;
+  const taxFeeDifference = bcMul(
+    bcSub(rawTax, formattedTax, 6),
+    quantity,
+    6
+  );
+  state.difference = bcAdd(state.difference, taxFeeDifference, 6);
+  if (state.difference.lt(5e-3))
+    return new import_decimal.default(0);
+  const roundingRemainder = toAmountFormat(state.difference);
+  writeTaxRemainder(target, roundingRemainder);
+  state.difference = bcSub(state.difference, roundingRemainder, 6);
+  return roundingRemainder;
+}
 function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
   const rate = new import_decimal.default(taxRate);
-  let preciseTax = new import_decimal.default(0);
-  let roundedTax = new import_decimal.default(0);
-  let preciseOriginTax = new import_decimal.default(0);
-  let roundedOriginTax = new import_decimal.default(0);
-  let lastTaxableItem = null;
+  const taxRemainderState = { difference: new import_decimal.default(0) };
+  let totalTax = new import_decimal.default(0);
+  let totalOriginTax = new import_decimal.default(0);
+  resetTaxRemainderFields(products);
   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 mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
-    const mainTaxPrecise = calculateSingleItemTax({
-      price: mainTaxableBase,
-      taxRate: rate,
-      isPriceIncludeTax,
-      isChargeTax: product.is_charge_tax ?? 0
-    });
-    const mainTaxRounded = mainTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-    product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
-    if (mainTaxPrecise.gt(0)) {
-      lastTaxableItem = { type: "main", item: product };
-    }
-    const originalTotal = getUnitOriginalTotal(product);
-    const originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
-    const originalTaxPrecise = calculateSingleItemTax({
-      price: originalTaxableBase,
-      taxRate: rate,
-      isPriceIncludeTax,
-      isChargeTax: product.is_charge_tax ?? 0
-    });
-    let bundlePreciseTax = new import_decimal.default(0);
-    let bundleRoundedTax = new import_decimal.default(0);
-    let bundlePreciseOriginTax = new import_decimal.default(0);
-    let bundleRoundedOriginTax = new import_decimal.default(0);
+    let productUnitTax = new import_decimal.default(0);
+    let productUnitOriginTax = new import_decimal.default(0);
     const bundleItems = product.product_bundle || [];
     for (const bundleItem of bundleItems) {
       if (!isBundleOriginalPrice(bundleItem))
         continue;
       const bundleQuantity = new import_decimal.default(getSafeNum(bundleItem.num ?? bundleItem.quantity));
-      const bundlePrice = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
+      const totalBundleQuantity = bundleQuantity.times(quantity);
+      const bundlePrice = getBundlePaymentPrice(bundleItem, product);
       const bundleOriginalPrice = toDecimal(bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? 0);
       const bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
       const bundleTaxPrecise = calculateSingleItemTax({
@@ -268,48 +582,72 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
       });
-      const bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+      const bundleTaxRounded = toBackendTaxFee(bundleTaxPrecise);
+      bundleItem.tax_fee = bundleTaxRounded.toNumber();
+      const persistedBundleRemainder = getPersistedTaxRemainder(bundleItem, product);
+      const bundleRemainder = persistedBundleRemainder ?? applyBackendTaxRemainder({
+        target: bundleItem,
+        rawTax: bundleTaxPrecise,
+        formattedTax: bundleTaxRounded,
+        quantity: totalBundleQuantity,
+        state: taxRemainderState
+      });
+      if (persistedBundleRemainder)
+        writeTaxRemainder(bundleItem, persistedBundleRemainder);
       const bundleOrigTaxPrecise = calculateSingleItemTax({
         price: bundleOriginalPrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
       });
-      const bundleOrigTaxRounded = bundleOrigTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-      bundleItem.tax_fee = bundleTaxRounded.toNumber();
+      const bundleOrigTaxRounded = toAmountFormat(bundleOrigTaxPrecise);
       bundleItem.original_tax_fee = bundleOrigTaxRounded.toNumber();
-      bundlePreciseTax = bundlePreciseTax.plus(bundleTaxPrecise.times(bundleQuantity));
-      bundleRoundedTax = bundleRoundedTax.plus(bundleTaxRounded.times(bundleQuantity));
-      bundlePreciseOriginTax = bundlePreciseOriginTax.plus(bundleOrigTaxPrecise.times(bundleQuantity));
-      bundleRoundedOriginTax = bundleRoundedOriginTax.plus(bundleOrigTaxRounded.times(bundleQuantity));
-      if (bundleTaxPrecise.gt(0)) {
-        lastTaxableItem = { type: "bundle", item: bundleItem };
-      }
-    }
-    const itemTaxPrecise = mainTaxPrecise.plus(bundlePreciseTax);
-    const itemTaxRounded = mainTaxRounded.plus(bundleRoundedTax);
-    const itemOriginTaxPrecise = originalTaxPrecise.plus(bundlePreciseOriginTax);
-    const itemOriginTaxRounded = originalTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).plus(bundleRoundedOriginTax);
-    product.tax_fee = itemTaxRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toFixed(2);
-    product.original_tax_fee = itemOriginTaxRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-    preciseTax = preciseTax.plus(itemTaxPrecise.times(quantity));
-    roundedTax = roundedTax.plus(itemTaxRounded.times(quantity));
-    preciseOriginTax = preciseOriginTax.plus(itemOriginTaxPrecise.times(quantity));
-    roundedOriginTax = roundedOriginTax.plus(itemOriginTaxRounded.times(quantity));
-  }
-  const expectedTax = preciseTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-  const expectedOriginTax = preciseOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-  const taxRemainder = expectedTax.minus(roundedTax).toNumber();
-  const originTaxRemainder = expectedOriginTax.minus(roundedOriginTax).toNumber();
-  if (lastTaxableItem) {
-    if (taxRemainder !== 0) {
-      lastTaxableItem.item.tax_fee_rounding_remainder = taxRemainder;
-    }
-    if (originTaxRemainder !== 0) {
-      lastTaxableItem.item.original_tax_fee_rounding_remainder = originTaxRemainder;
+      productUnitTax = productUnitTax.plus(bundleTaxRounded.times(bundleQuantity));
+      productUnitOriginTax = productUnitOriginTax.plus(bundleOrigTaxRounded.times(bundleQuantity));
+      totalTax = totalTax.plus(bundleTaxRounded.times(totalBundleQuantity)).plus(bundleRemainder);
+      totalOriginTax = totalOriginTax.plus(bundleOrigTaxRounded.times(totalBundleQuantity));
     }
+    const mainTotal = getMainProductPaymentTotal(product);
+    const surchargeFee = toDecimal(product.surcharge_fee);
+    const mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
+    const mainTaxPrecise = calculateSingleItemTax({
+      price: mainTaxableBase,
+      taxRate: rate,
+      isPriceIncludeTax,
+      isChargeTax: product.is_charge_tax ?? 0
+    });
+    const mainTaxRounded = toBackendTaxFee(mainTaxPrecise);
+    product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
+    const persistedMainRemainder = getPersistedTaxRemainder(product);
+    const mainRemainder = persistedMainRemainder ?? applyBackendTaxRemainder({
+      target: product,
+      rawTax: mainTaxPrecise,
+      formattedTax: mainTaxRounded,
+      quantity,
+      state: taxRemainderState
+    });
+    if (persistedMainRemainder)
+      writeTaxRemainder(product, persistedMainRemainder);
+    const originalTotal = getUnitOriginalTotal(product);
+    const originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
+    const originalTaxPrecise = calculateSingleItemTax({
+      price: originalTaxableBase,
+      taxRate: rate,
+      isPriceIncludeTax,
+      isChargeTax: product.is_charge_tax ?? 0
+    });
+    const originalTaxRounded = toAmountFormat(originalTaxPrecise);
+    productUnitTax = productUnitTax.plus(mainTaxRounded);
+    productUnitOriginTax = productUnitOriginTax.plus(originalTaxRounded);
+    product.tax_fee = productUnitTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toFixed(2);
+    product.original_tax_fee = productUnitOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+    totalTax = totalTax.plus(mainTaxRounded.times(quantity)).plus(mainRemainder);
+    totalOriginTax = totalOriginTax.plus(originalTaxRounded.times(quantity));
   }
-  return { tax: expectedTax, originTax: expectedOriginTax };
+  return {
+    tax: totalTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP),
+    originTax: totalOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP)
+  };
 }
 function createEmptySalesSummary() {
   return {
@@ -347,20 +685,23 @@ function calculateSalesSummary(params) {
   } = params;
   if (!(products == null ? void 0 : products.length))
     return createEmptySalesSummary();
-  const productQuantity = products.reduce(
+  const summaryProducts = products.filter((product) => !isGeneratedVoucherProduct(product));
+  if (!summaryProducts.length)
+    return createEmptySalesSummary();
+  const productQuantity = summaryProducts.reduce(
     (sum, item) => sum + getSafeNum(item.num),
     0
   );
-  const productOriginalAmount = products.reduce(
+  const productOriginalAmount = summaryProducts.reduce(
     (sum, item) => sum.plus(getUnitOriginalTotal(item).times(getSafeNum(item.num))),
     new import_decimal.default(0)
   );
-  const productAmount = products.reduce(
+  const productAmount = summaryProducts.reduce(
     (sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))),
     new import_decimal.default(0)
   );
-  const surchargeServiceItems = buildSurchargeServiceItems(products);
-  const surcharge = (0, import_utils.getSurcharge)(
+  const surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
+  (0, import_utils.getSurcharge)(
     {
       service: surchargeServiceItems,
       addons: [],
@@ -374,6 +715,11 @@ function calculateSalesSummary(params) {
       scheduleById
     }
   );
+  const surcharge = calculateBackendProductSurcharges({
+    products: summaryProducts,
+    sourceItems: surchargeServiceItems,
+    surchargeList
+  });
   const surchargeAmount = new import_decimal.default(
     (0, import_utils.getSurchargeAmount)(
       { bookingDetail: null, bookingId: void 0 },
@@ -381,29 +727,13 @@ function calculateSalesSummary(params) {
       { isEdit: false }
     ) || 0
   );
-  for (let i = 0; i < products.length; i++) {
-    const sourceItem = surchargeServiceItems[i] || {};
-    const product = products[i];
-    product.surcharge_fee = sourceItem.surcharge_fee || 0;
-    const relationSurchargeIds = Array.isArray(sourceItem.relation_surcharge_ids) ? sourceItem.relation_surcharge_ids : [];
-    const hasSurcharge = new import_decimal.default(product.surcharge_fee || 0).gt(0) || relationSurchargeIds.length > 0;
-    if (hasSurcharge) {
-      product.main_product_attached_bundle_surcharge_fee = toFixed2(product.surcharge_fee);
-    }
-    if (relationSurchargeIds.length > 0) {
-      product.relation_surcharge_ids = sourceItem.relation_surcharge_ids;
-    }
-    if (hasSurcharge && sourceItem.surcharge_rounding_remainder !== void 0) {
-      product.surcharge_rounding_remainder = sourceItem.surcharge_rounding_remainder;
-    }
-  }
   const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
   let productTaxFee;
   if (hasTaxRate) {
-    const taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
+    const taxResult = calculateProductsTax(summaryProducts, taxRate, isPriceIncludeTax);
     productTaxFee = taxResult.tax;
   } else {
-    productTaxFee = products.reduce(
+    productTaxFee = summaryProducts.reduce(
       (sum, item) => sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num))),
       new import_decimal.default(0)
     );
@@ -411,7 +741,7 @@ function calculateSalesSummary(params) {
   const shopDiscountAmount = import_decimal.default.max(new import_decimal.default(Number(shopDiscount) || 0), 0);
   const preTaxExpectAmount = import_decimal.default.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
   const totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
-  const deposit = calculateProductsDeposit(products);
+  const deposit = calculateProductsDeposit(summaryProducts);
   return {
     product_quantity: productQuantity,
     product_original_amount: toFixed2(productOriginalAmount),

package/lib/server/index.js

@@ -945,11 +945,11 @@ var Server = class {
   async setupProductsQuotationPriceBridge() {
     var _a;
     if (!this.products) {
-      this.logWarning("setupProductsQuotationPriceBridge: Products 模块未注册");
+      this.logInfo("setupProductsQuotationPriceBridge: Products 模块未注册");
       return;
     }
     if (!this.schedule) {
-      this.logWarning("setupProductsQuotationPriceBridge: Schedule 模块未注册");
+      this.logInfo("setupProductsQuotationPriceBridge: Schedule 模块未注册");
       return;
     }
     try {

package/lib/server/modules/products/index.js

@@ -1170,10 +1170,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.productDataSource.run({
       pubsub: {
         callback: (res) => {
-          console.log("sse_products_callback", res);
-          this.logInfo("sse_products_callback: 收到同步消息", {
-            data: res == null ? void 0 : res.data
-          });
           if (!(res == null ? void 0 : res.data))
             return;
           const data = res.data;

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -279,7 +279,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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