Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0301

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

@@ -147,12 +147,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("请登录");
         }
         // 所有缴费项目已完成排课才能创建下一个缴费项目
-        String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
+        /*String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
         if (StringUtils.isNoneBlank(organBatchNo)) {
             if (StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(organBatchNo)) {
                 throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
             }
-        }
+        }*/
 
         List<MusicGroupPaymentCalenderStudentDetail> calenderStudentDetails = musicGroupPaymentCalenderDto.getMusicGroupPaymentCalenderStudentDetails();
 
@@ -247,10 +247,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("创建缴费失败：已存在缴费项目");
         }
         // 所有缴费项目已完成排课才能创建下一个缴费项目
-        String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
+        /*String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
         if (StringUtils.isNoneBlank(orignBatchNo)) {
             throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
-        }
+        }*/
 
         // 不是进行中，只能创建一次缴费
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {

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

@@ -600,6 +600,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setCalenderId(calenderId);
+        studentPaymentOrder.setOrganId(organId);
+        studentPaymentOrder.setRoutingOrganId(organId);
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         // 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
@@ -635,8 +637,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentPaymentOrder.setBalancePaymentAmount(amount);
                 studentPaymentOrder.setActualAmount(new BigDecimal(0));
                 studentPaymentOrder.setUpdateTime(date);
-                studentPaymentOrder.setOrganId(organId);
-                studentPaymentOrder.setRoutingOrganId(organId);
                 studentPaymentOrderService.update(studentPaymentOrder);
                 sysUserCashAccountService.updateBalance(userId, amount.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "乐团续费");
                 amount = BigDecimal.ZERO;
@@ -852,6 +852,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setPaymentChannel(channelType);
         studentPaymentOrder.setMusicGroupId(studentRegistration.getMusicGroupId());
         studentPaymentOrder.setCalenderId(calenderId);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         // 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
@@ -891,8 +893,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setRemitFee(goodsDto.getRemitFee());
         studentPaymentOrder.setCourseRemitFee(goodsDto.getCourseRemitFee());
-        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
         studentPaymentOrder.setUpdateTime(date);
 
         if ("205".equals(studentPaymentOrder.getPaymentAccountNo())) {