|
@@ -385,9 +385,17 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
|
|
|
.multiply(new BigDecimal("100")));
|
|
|
|
|
|
total.setActiRegistShareAmount(actiRegistShareAmount);
|
|
|
- total.setActiRegistShareRate(total.getActiRegistShareAmount()
|
|
|
- .divide(total.getTotalInAmount(), 4, RoundingMode.HALF_UP)
|
|
|
- .multiply(new BigDecimal("100")));
|
|
|
+ total.setActiRegistShareRate(
|
|
|
+ BigDecimal.ONE.subtract(total.getPracticeRate())
|
|
|
+ .subtract(total.getLiveRate())
|
|
|
+ .subtract(total.getVideoRate())
|
|
|
+ .subtract(total.getMusicRate())
|
|
|
+ .subtract(total.getLiveShareRate())
|
|
|
+ .subtract(total.getVideoShareRate())
|
|
|
+ .subtract(total.getAlbumShareRate())
|
|
|
+ .subtract(total.getVipShareRate())
|
|
|
+ .subtract(total.getMallShareRate())
|
|
|
+ );
|
|
|
}
|
|
|
total.setInfoList(infoList);
|
|
|
return HttpResponseResult.succeed(total);
|