Merge branch 'vip_group_activity'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SoundServiceImpl.java

@@ -211,6 +211,7 @@ public class SoundServiceImpl implements SoundService {
                 }
             }
             double cadence_d = 0;
+            sameTimes = sameTimes>times_r.size()?times_r.size():sameTimes;
             if (times_r.size()>0){
                 cadence_d = sameTimes/times_r.size();
             }
@@ -224,7 +225,6 @@ public class SoundServiceImpl implements SoundService {
             }else{
                 integrity = new BigDecimal(100);
             }
-            integrity = integrity;
 
             score = intonation.add(cadence).add(integrity).divide(new BigDecimal(3), 0, BigDecimal.ROUND_HALF_UP);