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

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/UserPaymentCoreServiceImpl.java

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