Merge branch 'dev_v1.3.5_20220929' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.5_20220929

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -536,7 +536,7 @@ public class UserController extends BaseController {
 
 
     // 实名认证改到对应的服务中
-    // @PostMapping("/realNameAuth")
+    @PostMapping("/realNameAuth")
     @ApiOperation(value = "实名认证", notes = "传入realNameAuthDto")
     @ResponseBody
     public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthReq realNameAuthDto) {

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

@@ -796,7 +796,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Override
     @Transactional
     public void buyMusicSheetSuccess(UserOrderDetailVo userOrderDetailVo) {
-        MusicSheet musicSheet = this.getById(userOrderDetailVo.getBizId());
         // 曲目服务费比例
         String musicSheetServiceFee = sysConfigService.findConfigValue(SysConfigConstant.MUSIC_SHEET_SERVICE_FEE);
         BigDecimal serviceFee = new BigDecimal(musicSheetServiceFee).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
@@ -813,13 +812,17 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         // 保存购买记录
         addMusicSheetPurchaseRecord(userOrderDetailVo, actualPrice, serviceFeeAmount);
 
-        if (!musicSheet.getSourceType().getCode().equals(SourceTypeEnum.PLATFORM.getCode())) {
+        // 曲目判断老师收入
+        if (userOrderDetailVo.getOrderType().equals(OrderTypeEnum.MUSIC)) {
+            MusicSheet musicSheet = this.getById(userOrderDetailVo.getBizId());
+            if (!musicSheet.getSourceType().getCode().equals(SourceTypeEnum.PLATFORM.getCode())) {
 
-            // 老师收入
-            BigDecimal teacherAmount = BigDecimal.ONE.subtract(serviceFee).multiply(expectPrice);
+                // 老师收入
+                BigDecimal teacherAmount = BigDecimal.ONE.subtract(serviceFee).multiply(expectPrice);
 
-            // 加入账户
-            addTeacherAccount(userOrderDetailVo, teacherAmount, userOrderDetailVo.getBizId());
+                // 加入账户
+                addTeacherAccount(userOrderDetailVo, teacherAmount, userOrderDetailVo.getBizId());
+            }
         }
 
         // 消息通知

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

@@ -126,7 +126,7 @@
             ar.reward_type_ as rewardType,
             ar.reward_describe_ as rewardDescribe,
             ar.img_url_ as imgUrl,
-            aur.winning_time_ as winningTime
+            aur.create_time_ as winningTime
         from
         activity_user_reward aur
         left join activity_plan ap on ap.id_ = aur.activity_id_

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

@@ -49,8 +49,7 @@
         ,(select count(1) as num
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            left join sys_user su on su.id_ = ms.user_id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
             and amr.album_id_ = t.id_) as musicSheetCount
         ,t2.num as albumFavoriteCount
         <if test="query.userId != null">
@@ -58,8 +57,7 @@
         </if>
         from music_album t
         left join (select count(1) as num,af.album_id_ from album_favorite af
-            left join sys_user su on af.user_id_ = su.id_
-            where su.del_flag_ = 0 group by af.album_id_
+            group by af.album_id_
         ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0
@@ -173,12 +171,10 @@
         left join (select count(1) as num,amr.album_id_
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            left join sys_user su on su.id_ = ms.user_id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
             group by amr.album_id_) t1 on t1.album_id_ = t.id_
         left join (select count(1) as num,af.album_id_ from album_favorite af
-                left join sys_user su on af.user_id_ = su.id_
-                where su.del_flag_ = 0 group by af.album_id_
+              group by af.album_id_
         ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0
@@ -207,14 +203,12 @@
             , (
                 select count(1) as num from album_music_relate amr
                 join music_sheet ms on amr.music_sheet_id_ = ms.id_
-                left join sys_user su on su.id_ = ms.user_id_
-                where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+                where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
                 and amr.album_id_ = t.id_
             ) as musicSheetCount
             ,(
                 select count(1) as num from album_favorite af
-                left join sys_user su on af.user_id_ = su.id_
-                where su.del_flag_ = 0 and af.album_id_ = t.id_
+                where af.album_id_ = t.id_
             ) as albumFavoriteCount
         from music_album t
         where t.id_ = #{musicAlbumId}
@@ -227,19 +221,17 @@
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.subject_id_) and s.del_flag_ = 0 ) as subjectNames
         ,(select count(1) as num
-        from album_music_relate amr
-        join music_sheet ms on amr.music_sheet_id_ = ms.id_
-        left join sys_user su on su.id_ = ms.user_id_
-        where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
-       and amr.album_id_ = t.id_) as musicSheetCount
+            from album_music_relate amr
+            join music_sheet ms on amr.music_sheet_id_ = ms.id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
+           and amr.album_id_ = t.id_) as musicSheetCount
         ,if(t2.num >0,t2.num,0) as albumFavoriteCount
         from music_album t
         <if test="query.musicId != null">
             JOIN album_music_relate t1 ON (t.id_ = t1.album_id_ AND t1.music_sheet_id_ = #{query.musicId})
         </if>
         left join (select count(1) as num,af.album_id_ from album_favorite af
-            left join sys_user su on (af.user_id_ = su.id_ <if test="clientType != null"> AND af.client_type_ = #{clientType} </if>)
-            where su.del_flag_ = 0 group by af.album_id_
+            group by af.album_id_
         ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0