24282 před 2 roky
rodič
revize
e7f897276b

+ 0 - 1
hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -93,5 +93,4 @@ public class ContractController {
         return contractService.getContractPdfInfo(dto.getId());
     }
 
-
 }

+ 6 - 1
hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -309,7 +309,12 @@ public class SaleStatementServiceImpl implements SaleStatementService {
 
             profitSettlementVo.setGrossProfit(totalIncome.subtract(totalExpenses));
 
-            profitSettlementVo.setGrossProfitMargin(totalExpenses.divide(totalIncome, RoundingMode.HALF_UP));
+            if (totalIncome.equals(BigDecimal.ZERO)) {
+                profitSettlementVo.setGrossProfitMargin(BigDecimal.ZERO);
+            } else {
+                profitSettlementVo.setGrossProfitMargin(totalExpenses.divide(totalIncome, RoundingMode.HALF_UP));
+            }
+
         }
 
     }