Merge remote-tracking branch 'origin/master'

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

@@ -748,7 +748,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setUpdateTime(date);
 
         if ("205".equals(studentPaymentOrder.getPaymentAccountNo())) {
-            studentPaymentOrder.setPaymentChannel("ADAPAY");
+            if(!canPay) {
+                studentPaymentOrder.setPaymentChannel("ADAPAY");
+            }
             studentRegistration.setPayingStatus(2);
         }
         studentPaymentOrderService.update(studentPaymentOrder);
@@ -947,7 +949,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setUpdateTime(date);
 
         if ("205".equals(studentPaymentOrder.getPaymentAccountNo())) {
-            studentPaymentOrder.setPaymentChannel("ADAPAY");
+            if(!canPay) {
+                studentPaymentOrder.setPaymentChannel("ADAPAY");
+            }
             studentRegistration.setPayingStatus(2);
         }
         studentPaymentOrderService.update(studentPaymentOrder);

mec-teacher/src/main/java/com/ym/mec/teacher/handler/WebSocketHandler.java

@@ -125,6 +125,9 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
             recordInfo.add(new MusicPitchDetailDto(timeStamp, pitch));
         }));
         dispatcher.run();
+        if(Objects.isNull(userSoundInfoMap.get(phone).getAccessFile())){
+            return;
+        }
         double recordTime = userSoundInfoMap.get(phone).getAccessFile().length()/(audioFormat.getFrameSize()*audioFormat.getFrameRate())*1000;
         userSoundInfoMap.get(phone).setMeasureStartTime(recordTime);
         userSoundInfoMap.get(phone).getRecordMeasurePithInfo().addAll(recordInfo);
@@ -181,6 +184,7 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
             randomAccessFile.close();
             userSoundInfoMap.get(phone).setAccessFile(null);
         }
+        userSoundInfoMap.get(phone).setRecordMeasurePithInfo(null);
         LOGGER.info("评分数据：{}", JSON.toJSONString(userSoundInfoMap.get(phone)));
         userSoundInfoMap.remove(phone);
     }