yonge 5 năm trước cách đây
mục cha
commit
a64edc78f5

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
@@ -18,6 +19,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -113,7 +115,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
 					if (mgsf.getCourseFee().doubleValue() == 0) {
 						mgsf.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
-						mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+						if (musicGroupPaymentCalender.getType() != FeeType.OFFLINE) {
+							mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+						}
 					} else {
 						mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 					}
@@ -200,7 +204,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
 					if (mgsf.getCourseFee().doubleValue() == 0) {
 						mgsf.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
-						mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+						if (mgpc.getType() != FeeType.OFFLINE) {
+							mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+						}
 					} else {
 						mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 					}