Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

 Conflicts:

	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

	mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

	mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

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

	mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

	mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

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

	mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -603,32 +603,32 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     int getFirstPayNum(@Param("musicGroupId") String musicGroupId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
-     * 获取报名缴费的相关人数
-     *
-     * @param musicGroupIds
+     * 获取不在指定班级类型的学员列表
+     * @param musicGroupId
      * @return
      */
-    List<MusicGroupRegAndMoneyDto> getRegisters(@Param("musicGroupIds") List<String> musicGroupIds);
+    String getNotClassName(@Param("musicGroupId") String musicGroupId);
 
     /**
-     * 获取已缴费审核中的人数
+     * 是否有其他会员收费团
      * @param musicGroupId
+     * @param userId
      * @return
      */
-    int countPayAndCheckNum(@Param("musicGroupId") String musicGroupId);
+    boolean checkHasMemberGroup(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
     /**
-     * 获取不在班的学员列表
-     * @param musicGroupId
+     * 获取报名缴费的相关人数
+     *
+     * @param musicGroupIds
      * @return
      */
-    String getNotClassName(@Param("musicGroupId") String musicGroupId);
+    List<MusicGroupRegAndMoneyDto> getRegisters(@Param("musicGroupIds") List<String> musicGroupIds);
 
     /**
-     * 是否有其他会员收费团
+     * 获取已缴费审核中的人数
      * @param musicGroupId
-     * @param userId
      * @return
      */
-    boolean checkHasMemberGroup(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+    int countPayAndCheckNum(@Param("musicGroupId") String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

@@ -46,6 +46,17 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Integer comeOnPackage;
 
+    //是否有会员
+    private Integer hasMember;
+
+    public Integer getHasMember() {
+        return hasMember;
+    }
+
+    public void setHasMember(Integer hasMember) {
+        this.hasMember = hasMember;
+    }
+
     private Integer subjectId;
 
     private String activityCourseType;
@@ -74,17 +85,6 @@ public class StudentManageQueryInfo extends QueryInfo {
         this.activityCourseType = activityCourseType;
     }
 
-    //是否有会员
-    private Integer hasMember;
-
-    public Integer getHasMember() {
-        return hasMember;
-    }
-
-    public void setHasMember(Integer hasMember) {
-        this.hasMember = hasMember;
-    }
-
     public Integer getCarePackage() {
         return carePackage;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -213,8 +213,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String WARNING_MIN_COURSE_SALARY = "warning_min_course_salary";
 
-    String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
-
     //提醒乐团主管排下学期的课程的时间节点（默认提前14天）
     String REMIND_COURSE_TIME = "remind_course_time";
 
@@ -224,6 +222,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //会员结束前5天提醒学员续费(退团提醒)（默认提前15天）
     String PUSH_MEMBER_RENEW_QUIT = "push_member_renew_quit";
 
+    String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -2946,6 +2946,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseSchedule.setPreCourseFlag(1);
                     courseSchedule.setMemberFlag(1);
                     courseSchedule.setValidEndTime(schoolTermCourseDetail.getEndSchoolTerm());
+                    courseSchedule.setValidStartTime(schoolTermCourseDetail.getStartSchoolTerm());
                     courseScheduleDao.insert(courseSchedule);
                     courseScheduleList.add(courseSchedule);
 

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

@@ -79,7 +79,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		//校验当前乐团是否所有学员都在班
 		String notClassName = studentRegistrationDao.getNotClassName(musicGroupId);
 		if(StringUtils.isNotEmpty(notClassName)){
-			throw new BizException("操作失败：{} 学员未在任何班级",notClassName);
+			throw new BizException("操作失败：{} 学员未在以下任何班级",notClassName);
 		}
 		MusicGroupSchoolTermCourseDetail courseDetail = musicGroupSchoolTermCourseDetailDao.
 				findByCourseDateAndMusicGroupId(musicGroupId,null,0);

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

@@ -26,9 +26,6 @@ import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;

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

@@ -2289,7 +2289,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			return;
 		}
 
-		if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
+		if(!studentPaymentOrder.getStatus().equals(DealStatusEnum.ING)){
 			return;
 		}
 

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -39,6 +39,7 @@
         <result column="member_flag_" property="memberFlag"/>
         <result column="pre_course_flag_" property="preCourseFlag"/>
         <result column="valid_end_time_" property="validEndTime"/>
+        <result column="valid_start_time_" property="validStartTime"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -163,6 +164,7 @@
         cs.new_course_id_,
         cs.member_flag_,
         cs.valid_end_time_,
+        cs.valid_start_time_,
         cs.pre_course_flag_
     </sql>
 
@@ -186,13 +188,13 @@
         INSERT INTO course_schedule
         (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
-        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_)
+        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
         #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},
         #{endClassTime},#{teacherId},#{teacherId},now(),now(),
         #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},
         #{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentNum},#{leaveStudentNum},
-        #{schoolId},#{isLock},#{note},#{teachingContent},#{organId},#{memberFlag},#{preCourseFlag},#{validEndTime})
+        #{schoolId},#{isLock},#{note},#{teachingContent},#{organId},#{memberFlag},#{preCourseFlag},#{validEndTime},#{validStartTime})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
@@ -200,7 +202,7 @@
         INSERT INTO course_schedule
         (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
-        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_)
+        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_)
         VALUE
         <foreach collection="list" item="course" separator=",">
             (#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
@@ -209,7 +211,7 @@
             #{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},
             #{course.leaveStudentNum},#{course.schoolId},#{course.isLock},#{course.note},#{course.teachingContent},
-            #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime})
+            #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime},#{course.validStartTime})
         </foreach>
     </insert>
 
@@ -220,6 +222,9 @@
             <if test="validEndTime != null">
                 valid_end_time_ = #{validEndTime},
             </if>
+            <if test="validStartTime != null">
+                valid_start_time_ = #{validStartTime},
+            </if>
             <if test="preCourseFlag != null">
                 pre_course_flag_ = #{preCourseFlag},
             </if>

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -22,10 +22,10 @@
         <result column="current_grade_num_" property="currentGradeNum"/>
         <result column="current_class_" property="currentClass"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
-        <result column="activity_course_detail_" property="activityCourseDetail"/>
         <result column="member_rank_setting_id_" property="memberRankSettingId"/>
         <result column="membership_start_time_" property="membershipStartTime"/>
         <result column="membership_end_time_" property="membershipEndTime"/>
+        <result column="activity_course_detail_" property="activityCourseDetail"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -124,9 +124,6 @@
             <if test="currentClass != null">
                 current_class_=#{currentClass},
             </if>
-            <if test="activityCourseDetail != null">
-                activity_course_detail_=#{activityCourseDetail},
-            </if>
             <if test="memberRankSettingId != null">
                 member_rank_setting_id_=#{memberRankSettingId},
             </if>
@@ -136,6 +133,9 @@
             <if test="membershipEndTime != null">
                 membership_end_time_=#{membershipEndTime},
             </if>
+            <if test="activityCourseDetail != null">
+                activity_course_detail_=#{activityCourseDetail},
+            </if>
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -1502,7 +1502,14 @@
         SELECT GROUP_CONCAT(DISTINCT su.username_) FROM student_registration sr
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL'
-        AND sr.user_id_ NOT IN (SELECT DISTINCT user_id_ FROM class_group_student_mapper WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND status_ != 'QUIT')
+        AND sr.user_id_ NOT IN (SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
+        WHERE cgsm.music_group_id_ = #{musicGroupId} AND cgsm.group_type_ = 'MUSIC' AND cgsm.status_ != 'QUIT' AND cg.type_ IN ('SNAP','NORMAL','MIX'))
+    </select>
+    <select id="checkHasMemberGroup" resultType="java.lang.Boolean">
+        SELECT COUNT(sr.id_) > 0 FROM student_registration sr
+        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        WHERE sr.music_group_id_ != #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ = #{userId} AND mg.course_view_type_ = 1
     </select>
 
     <!-- 获取报名相关数据 -->
@@ -1526,9 +1533,4 @@
           AND paying_status_ = 2
           AND music_group_status_ = 'NORMAL'
     </select>
-    <select id="checkHasMemberGroup" resultType="java.lang.Boolean">
-        SELECT COUNT(sr.id_) > 0 FROM student_registration sr
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_id_ != #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ = #{userId} AND mg.course_view_type_ = 1
-    </select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -205,6 +205,6 @@ public interface TaskRemoteService {
 	void autoCleanPreCourseTask();
 
 	//每天10点推送排课、续费、退团提醒
-	@GetMapping("task/autoCleanPreCourseTask")
+	@GetMapping("task/musicSchoolTermPush")
     void musicSchoolTermPush();
 }

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

@@ -1,5 +1,47 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
@@ -11,8 +53,8 @@ import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
@@ -86,11 +128,16 @@ public class StudentOrderController extends BaseController {
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
     @Autowired
     private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
+
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
 
+	@Autowired
+	private MemberRankPrivilegesService memberRankPrivilegesService;
+
+
     @Value("${spring.profiles.active:dev}")
     private String profiles;
 

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSchoolTermCourseDetailController.java

@@ -26,11 +26,4 @@ public class MusicGroupSchoolTermCourseDetailController extends BaseController {
 	public HttpResponseResult upset(MusicGroupSchoolTermCourseDetail musicGroupSchoolTermCourseDetail) {
 		return musicGroupSchoolTermCourseDetailService.upset(musicGroupSchoolTermCourseDetail);
 	}
-
-	@ApiOperation("每天10点推送排课、续费、退团提醒")
-	@GetMapping(value = "musicSchoolTermPush")
-	public HttpResponseResult musicSchoolTermPush() {
-		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
-		return succeed();
-	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -1,16 +1,18 @@
 package com.ym.mec.web.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.MusicGroupSchoolTermCourseDetailDao;
 import com.ym.mec.biz.dal.entity.MusicGroupSchoolTermCourseDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupSchoolTermStudentCourseDetail;
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.enums.IndexDataType;
 import com.ym.mec.biz.event.source.CourseEventSource;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.redis.service.RedisCache;
+import io.swagger.annotations.ApiOperation;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.service.HistoryMessageService;
@@ -157,6 +159,9 @@ public class TaskController extends BaseController {
 	}
 
 
+	@Autowired
+	private MusicGroupSchoolTermCourseDetailService musicGroupSchoolTermCourseDetailService;
+
 	@GetMapping(value = "/autoAffirmReceiveTask")
 	// 自动确认收货
 	public void affirmReceive(){
@@ -467,4 +472,11 @@ public class TaskController extends BaseController {
 			}
 		}
 	}
+
+	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@GetMapping(value = "/musicSchoolTermPush")
+	public HttpResponseResult musicSchoolTermPush() {
+		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
+		return succeed();
+	}
 }