对账单计算

sd-business/src/main/java/com/sd/business/entity/statement/vo/ReconciliationDetailVo.java

@@ -66,4 +66,9 @@ public class ReconciliationDetailVo {
      */
     private BigDecimal packagingMaterialCost;
 
+    /**
+     * 管理费
+     */
+    private BigDecimal managementFee;
+
 }

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -143,6 +143,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                 .deliveryMaterialsFee(item.getDeliveryMaterialsFee())
                 .packingLabor(item.getPackingLabor())
                 .packagingMaterialCost(item.getPackagingMaterialCost())
+                .managementFee(item.getManagementFee())
                 .build()
         ).collect(Collectors.toList());
 
@@ -237,7 +238,9 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                                 .add(item.getLssueFee())
                                 .add(item.getDeliveryMaterialsFee())
                                 .add(item.getPackingLabor())
-                                .add(item.getPackagingMaterialCost()))
+                                .add(item.getPackagingMaterialCost())
+                                .add(item.getManagementFee())
+                        )
                         .build())
                 .peek(item -> item.setSubtotal(item.getQuantity().multiply(item.getUnitPrice())))
                 .peek(item -> item.setTotal(item.getSubtotal()))
@@ -292,15 +295,17 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                         .lssueFeeSummary(item.getLssueFee().multiply(item.getQuantity()))
                         .deliveryMaterialsFeeSummary(item.getDeliveryMaterialsFee().multiply(item.getQuantity()))
                         .packingLaborSummary(item.getPackingLabor().multiply(item.getQuantity()))
-                        .managementFeeSummary(item.getManagementFee().multiply(item.getManagementFee()))
+                        .managementFeeSummary(item.getManagementFee().multiply(item.getQuantity()))
                         .build())
-                .peek(item -> item.setSubtotal(item.getUnitPrice().multiply(item.getQuantity())
-                        .add(item.getLaserLogoSummary())
-                        .add(item.getLaserMitochondrialSummary())
-                        .add(item.getLssueFeeSummary())
-                        .add(item.getDeliveryMaterialsFeeSummary())
-                        .add(item.getPackingLaborSummary())
-                        .add(item.getManagementFeeSummary())
+                .peek(item -> item.setSubtotal(
+                        item.getUnitPrice()
+                                .multiply(item.getQuantity())
+                                .add(item.getLaserLogoSummary())
+                                .add(item.getLaserMitochondrialSummary())
+                                .add(item.getLssueFeeSummary())
+                                .add(item.getDeliveryMaterialsFeeSummary())
+                                .add(item.getPackingLaborSummary())
+                                .add(item.getManagementFeeSummary())
                 ))
                 .peek(item -> item.setTotal(item.getSubtotal()))
                 .collect(Collectors.toList());
@@ -474,7 +479,8 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                                 .add(item.getLssueFee())
                                 .add(item.getDeliveryMaterialsFee())
                                 .add(item.getPackingLabor())
-                                .add(item.getPackagingMaterialCost()))
+                                .add(item.getPackagingMaterialCost())
+                                .add(item.getManagementFee()))
                         .build())
                 .peek(item -> item.setSubtotal(item.getQuantity().multiply(item.getUnitPrice())))
                 .peek(item -> item.setTotal(item.getSubtotal()))