commit

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -213,8 +213,8 @@ public class TbCfOrder {
             BigDecimal priceTotal = item.getItemPriceTotal();
             TbCfExpressTemplate template = item.getTemplate();
             itemsPrice = itemsPrice.add(priceTotal);
-            tax = tax.add(calculateDutyFee(BigDecimal.valueOf(item.getItemNum()), template));
-            fee = fee.add(calculateHandlingFee(BigDecimal.valueOf(item.getItemNum()), template));
+            tax = tax.add(calculateDutyFee(itemsPrice, template));
+            fee = fee.add(calculateHandlingFee(itemsPrice, template));
             if (template != null)
                 templateList.add(new TemplateVo(template, template.getTemplateId(), item.getItemNum(), itemsPrice));
         });
@@ -295,13 +295,14 @@ public class TbCfOrder {
     private List<String> usedList = new ArrayList<>();
 
 
-    private BigDecimal calculateHandlingFee(BigDecimal itemNum, TbCfExpressTemplate expressTemplate) {
+    private BigDecimal calculateHandlingFee(BigDecimal itemPrice, TbCfExpressTemplate expressTemplate) {
         if (expressTemplate == null) return BigDecimal.ZERO;
         //计算手续费
+        //计算手续费
         BigDecimal handlingFee = expressTemplate.getHandlingFee()
-                .multiply(itemNum);
+                .multiply(itemPrice);
 
-        return handlingFee.setScale(BigDecimal.ROUND_DOWN, 2);
+        return handlingFee;
 
     }
 
@@ -331,10 +332,9 @@ public class TbCfOrder {
     private BigDecimal calculateDutyFee(BigDecimal itemPrice, TbCfExpressTemplate expressTemplate) {
         if (expressTemplate == null) return BigDecimal.ZERO;
         //计算关税
-        BigDecimal dutyFee = expressTemplate.getTariff().multiply(itemPrice);
 
 
-        return dutyFee.setScale(BigDecimal.ROUND_DOWN, 2);
+        return expressTemplate.getTariff().multiply(itemPrice);
 
     }