helixiao 2 лет назад
Родитель
Сommit
15073e3aad

+ 8 - 3
src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -814,9 +814,14 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     }
                     agencyTeamVo.setDeptManNum(deptManNum);
                     agencyTeamVo.setSumpremium(bigDecimal);
-                    BigDecimal multiply = bigDecimal.multiply(new BigDecimal(sysAgencyLeader.getProportional())
-                            .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
-                    agencyTeamVo.setExtractFee(multiply);
+                    if (bigDecimal.equals(new BigDecimal("0.00"))) {
+
+                        BigDecimal multiply = bigDecimal.multiply(new BigDecimal(sysAgencyLeader.getProportional())
+                                .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
+                        agencyTeamVo.setExtractFee(multiply);
+                    }else {
+                        agencyTeamVo.setExtractFee(new BigDecimal("0.00"));
+                    }
                     agencyTeamVoList.add(agencyTeamVo);
 
                 }

+ 8 - 3
src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -434,9 +434,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         }
                     }
                     sysPartnerAPPPageVo.setSumpremium(bigDecimal);
-                    BigDecimal multiply = bigDecimal.multiply(new BigDecimal(sysPartner.getProportional())
-                            .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
-                    sysPartnerAPPPageVo.setExtractFee(multiply);
+                    if (!bigDecimal.equals(new BigDecimal("0.00"))) {
+                        BigDecimal multiply = bigDecimal.multiply(new BigDecimal(sysPartner.getProportional())
+                                .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
+                        sysPartnerAPPPageVo.setExtractFee(multiply);
+                    }else {
+                        sysPartnerAPPPageVo.setExtractFee(new BigDecimal("0.00"));
+                    }
+
                     sysPartnerAPPPageVoList.add(sysPartnerAPPPageVo);
 
                 }