app专辑分润数据tongji

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

@@ -305,6 +305,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         BigDecimal liveShareAmount = BigDecimal.ZERO;
         BigDecimal videoShareAmount = BigDecimal.ZERO;
         BigDecimal musicShareAmount = BigDecimal.ZERO;
+        BigDecimal albumShareAmount = BigDecimal.ZERO;
         BigDecimal vipShareAmount = BigDecimal.ZERO;
         BigDecimal mallShareAmount = BigDecimal.ZERO;
         BigDecimal actiRegistShareAmount = BigDecimal.ZERO;
@@ -320,6 +321,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
             liveShareAmount = liveShareAmount.add(info.getLiveShareAmount());
             videoShareAmount = videoShareAmount.add(info.getVideoShareAmount());
             musicShareAmount = musicShareAmount.add(info.getMusicShareAmount());
+            albumShareAmount = albumShareAmount.add(info.getAlbumShareAmount());
             vipShareAmount = vipShareAmount.add(info.getVipShareAmount());
             mallShareAmount = mallShareAmount.add(info.getMallShareAmount());
             actiRegistShareAmount = actiRegistShareAmount.add(info.getActiRegistShareAmount());
@@ -329,7 +331,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         total.setTotalInAmount(
                 practiceAmount.add(liveAmount).add(videoAmount).add(musicAmount)
                         .add(liveShareAmount).add(videoShareAmount).add(musicShareAmount)
-                        .add(vipShareAmount).add(mallShareAmount).add(actiRegistShareAmount)
+                        .add(vipShareAmount).add(mallShareAmount).add(actiRegistShareAmount).add(albumShareAmount)
         );
         if (total.getTotalInAmount().doubleValue() > 0) {
             total.setPracticeAmount(practiceAmount);
@@ -367,6 +369,11 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
                     .divide(total.getTotalInAmount(), 4, RoundingMode.HALF_UP)
                     .multiply(new BigDecimal("100")));
 
+            total.setAlbumShareAmount(albumShareAmount);
+            total.setAlbumShareRate(total.getAlbumShareRate()
+                                         .divide(total.getTotalInAmount(), 4, RoundingMode.HALF_UP)
+                                         .multiply(new BigDecimal("100")));
+
             total.setVipShareAmount(vipShareAmount);
             total.setVipShareRate(total.getVipShareAmount()
                     .divide(total.getTotalInAmount(), 4, RoundingMode.HALF_UP)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/AccountTotal.java

@@ -42,6 +42,10 @@ public class AccountTotal {
     private BigDecimal musicShareAmount = BigDecimal.ZERO;
     @ApiModelProperty("乐谱分润-百分比")
     private BigDecimal musicShareRate = BigDecimal.ZERO;
+    @ApiModelProperty("专辑分润")
+    private BigDecimal albumShareAmount = BigDecimal.ZERO;
+    @ApiModelProperty("专辑分润-百分比")
+    private BigDecimal albumShareRate = BigDecimal.ZERO;
     @ApiModelProperty("直播课分润")
     private BigDecimal liveShareAmount = BigDecimal.ZERO;
     @ApiModelProperty("直播课分润-百分比")
@@ -61,6 +65,22 @@ public class AccountTotal {
     @ApiModelProperty("详情数据")
     private List<AccountTotal> infoList;
 
+    public BigDecimal getAlbumShareAmount() {
+        return albumShareAmount;
+    }
+
+    public void setAlbumShareAmount(BigDecimal albumShareAmount) {
+        this.albumShareAmount = albumShareAmount;
+    }
+
+    public BigDecimal getAlbumShareRate() {
+        return albumShareRate;
+    }
+
+    public void setAlbumShareRate(BigDecimal albumShareRate) {
+        this.albumShareRate = albumShareRate;
+    }
+
     public BigDecimal getTotalInAmount() {
         return totalInAmount;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountMapper.xml

@@ -110,6 +110,7 @@
             sum(a.liveShareAmount) as liveShareAmount,
             sum(a.videoShareAmount) as videoShareAmount,
             sum(a.musicShareAmount) as musicShareAmount,
+            sum(a.albumShareAmount) as albumShareAmount,
             sum(a.vipShareAmount) as vipShareAmount,
             sum(a.mallShareAmount) as mallShareAmount,
             sum(a.actiRegistShareAmount) as actiRegistShareAmount
@@ -124,6 +125,7 @@
                 sum(if(t.biz_type_ = 'LIVE_SHARE',t.trans_amount_,0)) as liveShareAmount,
                 sum(if(t.biz_type_ = 'VIDEO_SHARE',t.trans_amount_,0)) as videoShareAmount,
                 sum(if(t.biz_type_ = 'MUSIC_SHARE',t.trans_amount_,0)) as musicShareAmount,
+                sum(if(t.biz_type_ = 'ALBUM_SHARE',t.trans_amount_,0)) as albumShareAmount,
                 sum(if(t.biz_type_ = 'VIP_SHARE',t.trans_amount_,0)) as vipShareAmount,
                 sum(if(t.biz_type_ = 'MALL_SHARE',t.trans_amount_,0)) as mallShareAmount,
                 sum(if(t.biz_type_ = 'ACTI_REGIST_SHARE',t.trans_amount_,0)) as actiRegistShareAmount