Skip to content

C
cloud-platform
Commit 263e7f36 authored by libin's avatar libin
Browse files
Options

Merge branch 'staff-statistics' into dev

parents 2480be39 df220352
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java
View file @ 263e7f36
...@@ -365,14 +365,14 @@ public class StaffStatisticsBiz { ...@@ -365,14 +365,14 @@ public class StaffStatisticsBiz {
for (AppUserSellingWaterDTO waterDTO : appUserSellingWaterDTOS) { for (AppUserSellingWaterDTO waterDTO : appUserSellingWaterDTOS) {
if (waterDTO.getStatus() == 0) { if (waterDTO.getStatus() == 0) {
royaltyAmount = royaltyAmount.add(waterDTO.getCommission()); royaltyAmount = royaltyAmount.add(waterDTO.getCommission());
totalAmount = totalAmount.add(waterDTO.getCommission().divide(new BigDecimal(String.valueOf(waterDTO.getExtract()/100.00)),BigDecimal.ROUND_HALF_UP)); totalAmount = totalAmount.add(waterDTO.getCommission().divide(new BigDecimal(String.valueOf(waterDTO.getExtract()/100.00)),2,BigDecimal.ROUND_HALF_UP));
inAmount = inAmount.add(waterDTO.getCommission()); inAmount = inAmount.add(waterDTO.getCommission());
isCommissionZero = waterDTO.getCommission().intValue()==0; isCommissionZero = waterDTO.getCommission().intValue()==0;
} }
if (waterDTO.getStatus() == 1) { if (waterDTO.getStatus() == 1) {
royaltyAmount = royaltyAmount.subtract(waterDTO.getCommission()); royaltyAmount = royaltyAmount.subtract(waterDTO.getCommission());
totalAmount = totalAmount.subtract(waterDTO.getCommission().divide(new BigDecimal(String.valueOf(waterDTO.getExtract()/100.00)),BigDecimal.ROUND_HALF_UP)); totalAmount = totalAmount.subtract(waterDTO.getCommission().divide(new BigDecimal(String.valueOf(waterDTO.getExtract()/100.00)),2,BigDecimal.ROUND_HALF_UP));
outAmount = outAmount.add(waterDTO.getCommission()); outAmount = outAmount.add(waterDTO.getCommission());
isCommissionZero=!isCommissionZero; isCommissionZero=!isCommissionZero;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment