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

@@ -231,16 +231,16 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
     public void syncOaPayLog(Integer workOrderId,String fileUrl) throws Exception {
         PWorkOrderInfo pWorkOrderInfo = financialExpenditureDao.getWorkOrderInfo(workOrderId);
         if (pWorkOrderInfo != null){
-            Integer hasFinancial = financialExpenditureDao.findByBatchNoAndProcessNo(workOrderId);
-            if(hasFinancial != null){
-                return;
-            }
+//            Integer hasFinancial = financialExpenditureDao.findByBatchNoAndProcessNo(workOrderId);
+//            if(hasFinancial != null){
+//                return;
+//            }
             String formStructure = financialExpenditureDao.getFormStructure(workOrderId);
             JSONObject formData = JSONObject.parseObject(financialExpenditureDao.getFormData(workOrderId));
             OaFormStructureDto oaFormStructureDto = JSONObject.parseObject(formStructure, OaFormStructureDto.class);
             List<OaInputDto> oaInputDtos = oaFormStructureDto.getList();
             //课程退费和乐团退费需要单独处理
-            if(pWorkOrderInfo.getProcess().equals(34) ||
+            if(pWorkOrderInfo.getProcess().equals(33) ||
                     pWorkOrderInfo.getProcess().equals(22) ||
                     pWorkOrderInfo.getProcess().equals(19)){
                 List<FinancialExpenditure> financialExpenditureList = new ArrayList<>();
@@ -409,14 +409,18 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                             }
                         }
                     }
-                    for (FinancialExpenditure financialExpenditure : financialExpenditures) {
-                        financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
-                        financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
-                        financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
-                        financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
+                    if(CollectionUtils.isNotEmpty(financialExpenditures)){
+                        for (FinancialExpenditure financialExpenditure : financialExpenditures) {
+                            financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
+                            financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
+                            financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
+                            financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
+                        }
+                        financialExpenditureList = financialExpenditures;
+                    }
+                    for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
                         musicGroupService.directQuitMusicGroupOa(financialExpenditure);
                     }
-                    financialExpenditureList = financialExpenditures;
                 }
                 financialExpenditureDao.batchInsert(financialExpenditureList);
             }else {