| 
														
															@@ -2187,6 +2187,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     Long aLong1 = currentClassTimeMap.get(e.getId() + ""); 
														 | 
														
														 | 
														
															                     Long aLong1 = currentClassTimeMap.get(e.getId() + ""); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     e.setCurrentClassTimes(aLong1 == null ? 0 : aLong1.intValue()); 
														 | 
														
														 | 
														
															                     e.setCurrentClassTimes(aLong1 == null ? 0 : aLong1.intValue()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     e.setEducationalTeacherName(idNameMap.get(e.getEducationalTeacherId())); 
														 | 
														
														 | 
														
															                     e.setEducationalTeacherName(idNameMap.get(e.getEducationalTeacherId())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    e.setSubClassTimes(e.getTotalClassTimes() == null ? 0 : e.getTotalClassTimes() - (e.getCurrentClassTimes() == null ? 0 : e.getCurrentClassTimes())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    if(e.getBuyMonths() == null || e.getBuyMonths() == 0){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        e.setPayStatus("免费"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    }else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        if(e.getBeRenewGroupId() == null || e.getBeRenewGroupId() == 0l){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            e.setPayStatus("首充"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        }else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            e.setPayStatus("续费"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 } 
														 | 
														
														 | 
														
															                 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 |