Merge remote-tracking branch 'origin/feature/1108_audio' into feature/1108_audio

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicPracticeRecordController.java

@@ -74,7 +74,7 @@ public class MusicPracticeRecordController {
         }
         MusicPracticeRecordWrapper.MusicPracticeRecord from = MusicPracticeRecordWrapper.MusicPracticeRecord.from(JSON.toJSONString(wrapper));
         // 曲目信息
-        MusicSheet musicSheet = musicSheetService.getDao().get(id);
+        MusicSheet musicSheet = musicSheetService.getDao().get(Long.parseLong(wrapper.getMusicSheetId()));
         if (Objects.isNull(musicSheet)) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息不存在");
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicPracticeRecordController.java

@@ -73,7 +73,7 @@ public class MusicPracticeRecordController {
         }
         MusicPracticeRecordWrapper.MusicPracticeRecord from = MusicPracticeRecordWrapper.MusicPracticeRecord.from(JSON.toJSONString(wrapper));
         // 曲目信息
-        MusicSheet musicSheet = musicSheetService.getDao().get(id);
+        MusicSheet musicSheet = musicSheetService.getDao().get(Long.parseLong(wrapper.getMusicSheetId()));
         if (Objects.isNull(musicSheet)) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息不存在");
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetCbsController.java

@@ -117,7 +117,7 @@ public class MusicSheetCbsController extends BaseController {
                 .eq(CourseCourseware::getClientType, ClientEnum.TEACHER)
                 .eq(CourseCourseware::getUserId, sysUser.getId())
                 .eq(CourseCourseware::getDelFlag, false).last("limit 1").one();
-        if (one == null) {
+        if (one != null) {
             musicSheetDetail.setCoursewareStatus(YesOrNoEnum.YES);
             musicSheetDetail.setCoursewareId(one.getId());
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -83,13 +83,14 @@ public class TenantAlbumSheetController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumMusicWrapper.StudentTenantAlbumMusic>> page(@RequestBody @Validated TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
-//        SysUser user = sysUserFeignService.queryUserInfo();
-//        if (user == null || null == user.getId()) {
-//            return failed(HttpStatus.FORBIDDEN, "请登录");
-//        }
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
 
 //        Teacher teacher = teacherService.getById(user.getId());
 //        query.setTenantId(Optional.ofNullable(teacher.getTenantId()).orElse(-1L));
+        query.setUserId(user.getId());
         query.setClientType(ClientEnum.TEACHER);
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));

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

@@ -743,12 +743,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                         // 老师所在机构启用的专辑
                         Teacher teacher = teacherService.getById(sysUser.getId());
                         if (teacher.getTenantId() >0) {
-                            List<Long> musicSheetIds = tenantAlbumMusicService.getMusicIdsByTenantIds(teacher.getTenantId());
-                            if (musicSheetIds.contains(detail.getId())) {
-                                detail.setPlay(YesOrNoEnum.YES);
-                                detail.setBuyed(true);
-                                detail.setTenantFlag(true);
-                            }
+//                            List<Long> musicSheetIds = tenantAlbumMusicService.getMusicIdsByTenantIds(teacher.getTenantId());
+//                            if (musicSheetIds.contains(detail.getId())) {
+//                                detail.setPlay(YesOrNoEnum.YES);
+//                                detail.setBuyed(true);
+//                                detail.setTenantFlag(true);
+//                            }
                         }
                         if (detail.getPlay() ==YesOrNoEnum.NO) {
                             platformMusicUseCheck(sysUser, userType, detail);

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

@@ -306,7 +306,11 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                             .orderNo(userOrderVo.getOrderNo())
                             .amount(userOrderVo.getExpectPrice().doubleValue())
                             .build());
-            userOrderVo.setDiscountPrice(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));
+            BigDecimal discountPrice = BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices());
+            if (discountPrice.compareTo(userOrderVo.getExpectPrice()) >0) {
+                discountPrice = userOrderVo.getExpectPrice();
+            }
+            userOrderVo.setDiscountPrice(discountPrice);
 
             List<UserOrderDetailVo> userOrderDetailVos = getUserOrderDetailVos(Lists.newArrayList(userOrderVo.getOrderNo()));
 

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

@@ -603,6 +603,10 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             .map(UserOrderDetail::getActualPrice)
             .reduce(BigDecimal.ZERO, BigDecimal::add);
 
+        if (couponAmount.compareTo(currentPrice) >0) {
+            couponAmount = currentPrice;
+        }
+
 
         orderReq.originalPrice(originalPrice.setScale(2, RoundingMode.HALF_UP))
             .currentPrice(currentPrice.setScale(2, RoundingMode.HALF_UP))

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

@@ -591,7 +591,7 @@
     </select>
 
     <select id="selectFavoriteMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
-        select <include refid="Base_Column_List"/>
+        select distinct <include refid="Base_Column_List"/>
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt