Merge branch 'oa_2022-03-29' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -476,7 +476,11 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
             throw new BizException("参数校验失败");
         }
         if(tplInfoId.equals("11") || tplInfoId.equals("8")){
-            JSONObject formData = JSONObject.parseObject(paramMap.get("formData"));
+            String data = paramMap.get("formData");
+            if(StringUtils.isEmpty(data)){
+                return;
+            }
+            JSONObject formData = JSONObject.parseObject(data);
             String formStructure = financialExpenditureDao.getTplInfo(tplInfoId);
             OaFormStructureDto oaFormStructureDto = JSONObject.parseObject(formStructure, OaFormStructureDto.class);
             List<OaInputDto> oaInputDtos = oaFormStructureDto.getList();
@@ -536,6 +540,13 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
             }
             //课程退费
             if(tplInfoId.equals("11")){
+                long count = financialExpenditureList.stream().filter(e -> StringUtils.isEmpty(e.getGroupType()) ||
+                        Objects.isNull(e.getAmount()) ||
+                        Objects.isNull(e.getStudentId()) ||
+                        Objects.isNull(e.getVipGroupId())).count();
+                if(count > 0){
+                    return;
+                }
                 for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
                     ReturnFeeDto returnFeeDto = new ReturnFeeDto();
                     returnFeeDto.setGroupType(GroupType.valueOfDesc(financialExpenditure.getGroupType()));
@@ -551,6 +562,12 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                     }
                 }
             }else {
+                long count = financialExpenditureList.stream().
+                        filter(e -> StringUtils.isEmpty(e.getMusicGroupId()) ||
+                        Objects.isNull(e.getStudentId())).count();
+                if(count > 0){
+                    return;
+                }
                 for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
                     musicGroupService.checkDirectQuitMusicGroupOa(financialExpenditure);
                 }