feat:

1、网管课活动只针对石家庄开放
2、石家庄用户始终是新用户

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

@@ -193,6 +193,9 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         Date now=new Date();
 
         int studentExitChargePractices = practiceGroupDao.checkStudentExitChargePractice(practiceGroupBuyParams.getStudentId());
+        if(sysUser.getOrganId()==14){
+            studentExitChargePractices = 0;
+        }
 
         LocalDate courseStartDay=LocalDate.now();
         LocalDate tempCourseLocalDate=LocalDate.parse("2020-03-01", DateUtil.dateFormatter);

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

@@ -2787,6 +2787,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Date now = new Date();
 
         int studentExitChargePractices = practiceGroupDao.checkStudentExitChargePractice(practiceGroupBuyParams.getStudentId());
+        if(sysUser.getOrganId()==14){
+            studentExitChargePractices = 0;
+        }
 
         LocalDate courseStartDay = LocalDate.now();
         LocalDate tempCourseLocalDate = LocalDate.parse("2020-03-01", DateUtil.dateFormatter);

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -200,7 +200,12 @@ public class PracticeGroupController extends BaseController {
         }
         int studentExitChargePractices = practiceGroupDao.checkStudentExitChargePractice(sysUser.getId());
         Map<String, Integer> result=new HashMap<>();
-        result.put("isNewStudent", studentExitChargePractices<=0?0:1);
+        result.put("organId", sysUser.getOrganId());
+        if(sysUser.getOrganId()==14){
+            result.put("isNewStudent", 0);
+        }else{
+            result.put("isNewStudent", studentExitChargePractices<=0?0:1);
+        }
         return succeed(result);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -167,7 +167,12 @@ public class EduPracticeGroupController extends BaseController {
         }
         int studentExitChargePractices = practiceGroupDao.checkStudentExitChargePractice(studentId);
         Map<String, Integer> result=new HashMap<>();
-        result.put("isNewStudent", studentExitChargePractices<=0?0:1);
+        result.put("organId", sysUser.getOrganId());
+        if(sysUser.getOrganId()==14){
+            result.put("isNewStudent", 0);
+        }else{
+            result.put("isNewStudent", studentExitChargePractices<=0?0:1);
+        }
         return succeed(result);
     }