|
@@ -70,13 +70,13 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
e.setUpdateTime(date);
|
|
|
e.setExpectAmount(expectAmount);
|
|
|
});
|
|
|
- //如果是设置为0元
|
|
|
- MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
|
|
|
- if(calender.getType() == ONLINE){
|
|
|
- //剩余网管课可购买次数加一
|
|
|
- musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
|
|
|
- }
|
|
|
if(expectAmount.doubleValue() == 0){
|
|
|
+ //如果是设置为0元
|
|
|
+ MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
|
|
|
+ if(calender.getType() == ONLINE){
|
|
|
+ //剩余网管课可购买次数加一
|
|
|
+ musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
|
|
|
+ }
|
|
|
//缴费完成
|
|
|
musicGroupStudentFeeDao.setPaidCompleted(calenderDetails);
|
|
|
}
|
|
@@ -162,22 +162,21 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
MusicGroupStudentFee studentFee = musicGroupStudentFeeDao.findByUser(userId, calender.getMusicGroupId());
|
|
|
- //修改预计人数
|
|
|
-// calender.setExpectNum(calender.getExpectNum());
|
|
|
calender.setUpdateTime(date);
|
|
|
//生成详情
|
|
|
MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
|
|
|
musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(calender.getId());
|
|
|
musicGroupPaymentCalenderDetail.setCreateTime(date);
|
|
|
musicGroupPaymentCalenderDetail.setExpectAmount(studentFee.getCourseFee());
|
|
|
+ studentFee.setUpdateTime(date);
|
|
|
if (studentFee.getCourseFee().doubleValue() == 0) {
|
|
|
studentFee.setPaymentStatus(PAID_COMPLETED);
|
|
|
- studentFee.setUpdateTime(date);
|
|
|
musicGroupPaymentCalenderDetail.setPaymentStatus(PAID_COMPLETED);
|
|
|
if(calender.getType() == ONLINE){
|
|
|
musicGroupStudentFeeDao.remainNetworkClassTimesAdd(userLastCalenderDetail.toString());
|
|
|
}
|
|
|
} else {
|
|
|
+ studentFee.setPaymentStatus(NON_PAYMENT);
|
|
|
musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.NON_PAYMENT);
|
|
|
}
|
|
|
musicGroupPaymentCalenderDetail.setUpdateTime(date);
|