Merge branch 'dev_v1.3.6_20221011'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -317,6 +317,11 @@ public interface SysConfigConstant {
      */
     String MUSIC_ACCOUNT_PERIOD = "music_account_period";
     /**
+     * 专辑账期
+     */
+    String ALBUM_ACCOUNT_PERIOD = "album_account_period";
+
+    /**
      * 活动报名账期
      */
     String ACTI_REGIST_ACCOUNT_PERIOD = "acti_regist_account_period";

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

@@ -492,7 +492,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         //修改视频封面
         styleVideo.forEach(o -> {
             TeacherStyleVideo old = oldMap.get(o.getId());
-            if (!o.getCover().equals(old.getCover())) {
+            if (old != null && !o.getCover().equals(old.getCover())) {
                 teacherStyleVideoService.update(Wrappers.<TeacherStyleVideo>lambdaUpdate()
                         .set(TeacherStyleVideo::getCover, o.getCover())
                         .set(TeacherStyleVideo::getAuthStatus, AuthStatusEnum.DOING)

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

@@ -370,7 +370,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
                     .multiply(new BigDecimal("100")));
 
             total.setAlbumShareAmount(albumShareAmount);
-            total.setAlbumShareRate(total.getAlbumShareRate()
+            total.setAlbumShareRate(total.getAlbumShareAmount()
                                          .divide(total.getTotalInAmount(), 4, RoundingMode.HALF_UP)
                                          .multiply(new BigDecimal("100")));
 

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

@@ -1028,6 +1028,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             instance.add(Calendar.DAY_OF_MONTH, Integer.parseInt(sysConfigService.findConfigValue(SysConfigConstant.VIDEO_ACCOUNT_PERIOD)));
         } else if (GoodTypeEnum.MUSIC.equals(goodType)) {
             instance.add(Calendar.DAY_OF_MONTH, Integer.parseInt(sysConfigService.findConfigValue(SysConfigConstant.MUSIC_ACCOUNT_PERIOD)));
+        } else if (GoodTypeEnum.ALBUM.equals(goodType)) {
+            instance.add(Calendar.DAY_OF_MONTH, Integer.parseInt(sysConfigService.findConfigValue(SysConfigConstant.ALBUM_ACCOUNT_PERIOD)));
         } else if (GoodTypeEnum.ACTI_REGIST.equals(goodType)) {
             instance.add(Calendar.DAY_OF_MONTH, Integer.parseInt(sysConfigService.findConfigValue(SysConfigConstant.ACTI_REGIST_ACCOUNT_PERIOD)));
         }