Merge branch 'dev_v1.3.6_20221011'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -385,9 +385,18 @@ 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.valueOf(100)
+                            .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);