|
@@ -72,7 +72,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
|
|
|
BigDecimal grossProfit = commissionVo.getTotalIncome().subtract(commissionVo.getTotalExpenses());
|
|
|
commissionVo.setGrossGrofit(grossProfit);
|
|
|
|
|
|
- if (commissionVo.getTotalIncome().equals(BigDecimal.ZERO)) {
|
|
|
+ if (commissionVo.getTotalIncome().compareTo(BigDecimal.ZERO)==0||grossProfit.compareTo(BigDecimal.ZERO)==0) {
|
|
|
commissionVo.setGrossRofitMargin(BigDecimal.ZERO);
|
|
|
} else {
|
|
|
commissionVo.setGrossRofitMargin(
|