月度最大进步奖接口自测优化

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountServiceImpl.java

@@ -5,10 +5,7 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
 
-import cn.wisenergy.model.enums.MemberPercentEnum;
-import cn.wisenergy.model.enums.RebateStatusEnum;
-import cn.wisenergy.model.enums.TradeRecordEnum;
-import cn.wisenergy.model.enums.TradeStatusEnum;
+import cn.wisenergy.model.enums.*;
 import cn.wisenergy.model.vo.TeamPerformanceSortVo;
 import cn.wisenergy.service.Manager.PublicManager;
 import cn.wisenergy.service.app.AccountService;
@@ -272,6 +269,11 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                 List<AccountInfo> accountInfoList = new ArrayList<>();
                 List<TradeRecord> tradeRecordList = new ArrayList<>();
                 for (TeamPerformance user : list) {
+                    //用户是普通用户的，不计算最大进步奖
+                    if (user.getUserLevel().equals(UserLevelEnum.NORMAL_USER.getCode())) {
+                        continue;
+                    }
+
                     //获取最大进步奖 百分比
                     MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(), 3);
 
@@ -279,11 +281,18 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                     double userTeamPerformance = user.getMonthTeamPerformance().doubleValue();
                     double percent = memberPercent.getPercent().doubleValue();
 
-                    double income = number * 3980 * percent * userTeamPerformance / twentyTotal;
+                    double income = Math.floor(number * 3980 * percent * userTeamPerformance / twentyTotal);
 
                     //获取账户信息
                     AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
-                    accountInfo.setEarningsMonth(new BigDecimal(income));
+
+                    //用户月收益  =其他收益+最大进步奖收益
+                    BigDecimal earningsMonth = accountInfo.getEarningsMonth().add(BigDecimal.valueOf(income));
+                    accountInfo.setEarningsMonth(earningsMonth);
+
+                    //用户总收益 =其他总收益 + earningsMonth
+                    BigDecimal earningsTotal = accountInfo.getEarningsTotal().add(BigDecimal.valueOf(income));
+                    accountInfo.setEarningsTotal(earningsTotal);
                     accountInfoList.add(accountInfo);
 
                     //添加交易流水记录