update

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

@@ -42,6 +42,7 @@ import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
@@ -64,6 +65,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	private MusicGroupOrganizationCourseSettingsDetailDao musicGroupOrganizationCourseSettingsDetailDao;
 	
 	@Autowired
+	private IdGeneratorService idGeneratorService;
+	
+	@Autowired
 	private MusicGroupDao musicGroupDao;
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -170,7 +174,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				musicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
 			}
 		}
-		
+		//设置批次号
+		musicGroupPaymentCalender.setBatchNo(idGeneratorService.generatorId()+"");
 		musicGroupPaymentCalenderDao.insert(musicGroupPaymentCalender);
 		
 		for(MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingsList){
@@ -435,13 +440,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						mgpcd.setUpdateTime(date);
 						updateMusicGroupPaymentCalenderDetailList.add(mgpcd);
 
-						// 更新fee表，且加1
-						musicGroupStudentFee = feeMap.get(mgpcd.getUserId());
-						if (musicGroupStudentFee != null) {
-							musicGroupStudentFee.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
-							musicGroupStudentFee.setUpdateTime(date);
-							musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getContinuousAbsenteeismTimes() + 1);
-							updateMusicGroupStudentFeeList.add(musicGroupStudentFee);
+						if (mgpc.getIsGiveMusicNetwork()) {
+							// 更新fee表，且加1
+							musicGroupStudentFee = feeMap.get(mgpcd.getUserId());
+							if (musicGroupStudentFee != null) {
+								musicGroupStudentFee.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
+								musicGroupStudentFee.setUpdateTime(date);
+								musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getContinuousAbsenteeismTimes() + 1);
+								updateMusicGroupStudentFeeList.add(musicGroupStudentFee);
+							}
 						}
 					}
 				}