|
@@ -94,11 +94,11 @@ public class AppAgentController extends BaseController {
|
|
|
if(null != redisCache.getCacheMapValue(CacheConstants.USER_AGENT_TEAM_PHASE,String.valueOf(topUserId))){
|
|
|
money = redisCache.getCacheMapValue(CacheConstants.USER_AGENT_TEAM_PHASE,String.valueOf(topUserId));
|
|
|
}
|
|
|
- if(money >0 && null != appUserAgent.getDividendGuaranteeRate()){
|
|
|
- money = money * appUserAgent.getDividendGuaranteeRate() ;
|
|
|
+ if(null != appUserAgent.getDividendGuaranteeRate()){
|
|
|
+ money = money * appUserAgent.getDividendGuaranteeRate() / 100 ;
|
|
|
}
|
|
|
|
|
|
- vo.setMyCommission(BigDecimal.valueOf(money).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
+ vo.setMyCommission(BigDecimal.valueOf(money>0?money:0).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
vo.setLiveCommission(appUserCountList.stream().mapToDouble(e->e.getLiveCommission()).sum());
|
|
|
vo.setGameCommission(appUserCountList.stream().mapToDouble(e->e.getGameCommission()).sum());
|
|
|
|