|
@@ -727,9 +727,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if(musicGroupRegCalender == null){
|
|
|
throw new BizException("缴费信息不存在");
|
|
|
}
|
|
|
- BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
- //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
- //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
+ BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
|
|
|
+ if (musicGroupRegCalender.getMemberRankSettingId() != null) {
|
|
|
+ cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
+ } else {
|
|
|
+ if (musicGroup.getCloudTeacherType() != null) {
|
|
|
+ OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
+ cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
orderAmount = orderAmount.add(cloudTeacherPrice);
|
|
|
studentRegistration.setHasCloudTeacher(1);
|
|
@@ -739,12 +745,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
cloudTeacherOrder = new CloudTeacherOrder();
|
|
|
|
|
|
cloudTeacherOrder.setType(2);//月
|
|
|
- cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
|
|
|
+ cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
|
|
|
|
|
|
cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
|
|
|
cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
|
|
|
- cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
|
|
|
- cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
|
|
|
+ cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
|
|
|
+ cloudTeacherOrder.setAmount(cloudTeacherPrice);
|
|
|
cloudTeacherOrder.setStatus(0);
|
|
|
}
|
|
|
|
|
@@ -950,9 +956,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if(musicGroupRegCalender == null){
|
|
|
throw new BizException("缴费信息不存在");
|
|
|
}
|
|
|
- BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
- //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
- //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
+ BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
|
|
|
+ if (musicGroupRegCalender.getMemberRankSettingId() != null) {
|
|
|
+ cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
+ } else {
|
|
|
+ if (musicGroup.getCloudTeacherType() != null) {
|
|
|
+ OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
+ cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
orderAmount = orderAmount.add(cloudTeacherPrice);
|
|
|
studentRegistration.setHasCloudTeacher(1);
|
|
@@ -962,12 +974,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
cloudTeacherOrder = new CloudTeacherOrder();
|
|
|
|
|
|
cloudTeacherOrder.setType(2);//月
|
|
|
- cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
|
|
|
+ cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
|
|
|
|
|
|
cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
|
|
|
cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
|
|
|
- cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
|
|
|
- cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
|
|
|
+ cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
|
|
|
+ cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
|
|
|
cloudTeacherOrder.setStatus(0);
|
|
|
}
|
|
|
|
|
@@ -3026,6 +3038,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroup.setPaymentExpireDate(DateUtil.toDate(expireDate));
|
|
|
musicGroup.setStatus(MusicGroupStatusEnum.PAY);
|
|
|
musicGroupDao.update(musicGroup);
|
|
|
+ List<Map<Integer, String>> mapList = studentRegistrationDao.findMapByMusicGroupId(musicGroupId, 0);
|
|
|
//所有人开启缴费
|
|
|
studentRegistrationDao.musicGroupOpenPay(musicGroupId, PaymentStatusEnum.OPEN);
|
|
|
MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroupId);
|
|
@@ -3038,12 +3051,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//三方乐团不发送缴费通知
|
|
|
if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
|
|
|
//获取所有已报名学员列表
|
|
|
- HashMap<Integer, String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findMapByMusicGroupId(musicGroupId, 0))), HashMap.class);
|
|
|
+ HashMap<Integer, String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(mapList)), HashMap.class);
|
|
|
if (map != null && map.size() > 0) {
|
|
|
String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
|
|
|
- String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
|
|
|
+// String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
|
|
|
sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.SMS_PAYMENT_MESSAGE,
|
|
|
- map, null, 0, "", "", musicGroup.getName(), studentApplyUrl, DateUtil.format(musicGroup.getPaymentExpireDate(), DateUtil.DATE_FORMAT_MIN), serverPhone);
|
|
|
+ map, null, 0, "", "", musicGroup.getName(), studentApplyUrl);
|
|
|
}
|
|
|
}
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|