commit

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

@@ -210,13 +210,13 @@ public class TbCfOrder {
         List<TemplateVo> templateList = new ArrayList<>();
 
         itemOrderList.forEach(item -> {
-            BigDecimal priceTotal = item.getItemPriceTotal();
+            BigDecimal itemPrice = item.getItemPriceTotal();
             TbCfExpressTemplate template = item.getTemplate();
-            itemsPrice = itemsPrice.add(priceTotal);
-            tax = tax.add(calculateDutyFee(itemsPrice, template));
-            fee = fee.add(calculateHandlingFee(itemsPrice, template));
+            itemsPrice = itemsPrice.add(itemPrice);
+            tax = tax.add(calculateDutyFee(itemPrice, template));
+            fee = fee.add(calculateHandlingFee(itemPrice, template));
             if (template != null)
-                templateList.add(new TemplateVo(template, template.getTemplateId(), item.getItemNum(), itemsPrice));
+                templateList.add(new TemplateVo(template, template.getTemplateId(), item.getItemNum(), itemPrice));
         });
         Map<String, List<TemplateVo>> map = templateList.stream().collect(Collectors.groupingBy(TemplateVo::getTemplateId));
         //按模板分组计算商品价格