소스 검색

修改数据计算问题

wks 1 년 전
부모
커밋
8a32f00467

+ 3 - 1
src/main/java/com/ydtech/modules/esm/model/vo/EsmUserCountVO.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.esm.model.vo;
 
+import com.ydtech.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -53,7 +54,8 @@ public class EsmUserCountVO implements Serializable {
             userPolicyList.forEach(x->{
                 aggregateDataO.setOrdernum(aggregateDataO.getOrdernum() + x.getOrdernum());
                 aggregateDataO.setPolicynum(aggregateDataO.getPolicynum() + x.getPolicynum());
-                aggregateDataO.setSumpremium(aggregateDataO.getSumpremium() + x.getSumpremium());
+                double sumPremium = BigDecimalUtils.addDouble(aggregateDataO.getSumpremium(), x.getSumpremium());
+                aggregateDataO.setSumpremium(sumPremium);
                 aggregateDataO.setBjpolicynum(aggregateDataO.getBjpolicynum() + x.getBjpolicynum());
                 aggregateDataO.setBjsumpremium(aggregateDataO.getBjsumpremium() + x.getBjpolicynum());
             });

+ 4 - 4
src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -380,7 +380,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                 EsmTeamPolicyVO esmTeamPolicyVO1_t = this.baseMapper.queryOrderCountHz(userList1, record.getStartdate(),
                         record.getEnddate());
                 if (esmTeamPolicyVO1_t != null) {
-                    esmTeamPolicyVO1.setSumpremium(Double.parseDouble(String.format("%.2f",esmTeamPolicyVO1_t.getSumpremium())));
+                    esmTeamPolicyVO1.setSumpremium(esmTeamPolicyVO1_t.getSumpremium());
                     esmTeamPolicyVO1.setUsernum(userPolicyList1.size());//出单人力
                 }
                 esmTeamPolicyVO1.setTeamnum(userList1.size());//团队人数
@@ -393,7 +393,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                     EsmTeamPolicyVO esmTeamPolicyVO2_t = this.baseMapper.queryOrderCountHz(userList2, record.getStartdate(),
                             record.getEnddate());
                     if (esmTeamPolicyVO2_t != null) {
-                        esmTeamPolicyVO2.setSumpremium(Double.parseDouble(String.format("%.2f",esmTeamPolicyVO2_t.getSumpremium())));
+                        esmTeamPolicyVO2.setSumpremium(esmTeamPolicyVO2_t.getSumpremium());
                         esmTeamPolicyVO2.setUsernum(userPolicyList2.size());
                     }
                     esmTeamPolicyVO2.setTeamnum(userList2.size());
@@ -405,7 +405,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                         esmTeamPolicyVO3.setTeamlevel("三级会员");
                         esmTeamPolicyVO3.setTeamnum(userList3.size());
                         if (esmTeamPolicyVO3_t != null) {
-                            esmTeamPolicyVO3.setSumpremium(Double.parseDouble(String.format("%.2f",esmTeamPolicyVO3_t.getSumpremium())));
+                            esmTeamPolicyVO3.setSumpremium(esmTeamPolicyVO3_t.getSumpremium());
                             esmTeamPolicyVO3.setUsernum(userPolicyList3.size());
                         }
 
@@ -434,7 +434,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             EsmTeamPolicyVO esmTeamPolicyVO = new EsmTeamPolicyVO();
             EsmTeamPolicyVO esmTeamPolicyVO_t = this.baseMapper.queryOrderCountHz(userList, record.getStartdate(), record.getEnddate());
             if (esmTeamPolicyVO_t != null) {
-                esmTeamPolicyVO.setSumpremium(Double.parseDouble(String.format("%.2f",esmTeamPolicyVO_t.getSumpremium())));
+                esmTeamPolicyVO.setSumpremium(esmTeamPolicyVO_t.getSumpremium());
                 esmTeamPolicyVO.setUsernum(userPolicyList.size());
             }
             esmTeamPolicyVO.setTeamlevel("汇总");