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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MemberRankSetting.java

@@ -10,9 +10,15 @@ import java.util.List;
 public class MemberRankSetting {
 
 	/**  */
-	private Integer id;
+	private Integer operator;
 	
 	/**  */
+	private String operatorName;
+
+	/**  */
+	private Integer id;
+
+	/**  */
 	private String name;
 	
 	/**  */
@@ -38,6 +44,22 @@ public class MemberRankSetting {
 	
 	private MemberFeeSetting memberFeeSetting;
 
+	public Integer getOperator() {
+		return operator;
+	}
+
+	public void setOperator(Integer operator) {
+		this.operator = operator;
+	}
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	public List<MemberRankPrivileges> getMemberRankPrivileges() {
 		return memberRankPrivileges;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,16 @@ public class MusicGroupQueryInfo extends QueryInfo {
 
     private String searchType;
 
+    private CourseViewTypeEnum courseViewType;
+
+    public CourseViewTypeEnum getCourseViewType() {
+        return courseViewType;
+    }
+
+    public void setCourseViewType(CourseViewTypeEnum courseViewType) {
+        this.courseViewType = courseViewType;
+    }
+
     public String getSearchType() {
         return searchType;
     }

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

@@ -222,11 +222,10 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //会员结束前5天提醒学员续费(退团提醒)（默认提前5天）
     String PUSH_MEMBER_RENEW_QUIT = "push_member_renew_quit";
 
-    //会员结束后3天学员自动退团
-    String MEMBER_END_AUTO_QUIT_MUSIC = "member_end_auto_quit_music";
-
     String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
 
+    String HOMEWORK_OPEN_FLAG = "homework_open_flag";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -588,6 +588,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                 if (Objects.isNull(existHomework)) {
                     studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
                     studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
+                    studentCourseHomework.setMusicScoreId(musicScoreId);
                     studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
                     studentCourseHomework.setCreateTime(date);
                     studentCourseHomework.setUpdateTime(date);

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

@@ -232,7 +232,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         currentCourseDetail.setAdvanceSignOutMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_OUT_MINUTES)));
 		List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseID);
 		//获取有会员的学员数
-		currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
+		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+		if(StringUtils.isEmpty(configValue)){
+			configValue = "0";
+		}
+		if(configValue.equals("0")){
+			currentCourseDetail.setMemberNum(0);
+		}else {
+			currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
+		}
 		return currentCourseDetail;
     }
 

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.StudentServeService;
+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;
@@ -52,6 +53,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Autowired
 	private StudentDao studentDao;
 	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
 	private StudentServeService studentServeService;
@@ -102,8 +105,16 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setStudentName(extraExerciseReply.getStudentName());
 		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		detail.setType("EXTRA");
-		Student student = studentDao.get(extraExerciseReply.getUserId());
-		detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+		if(StringUtils.isEmpty(configValue)){
+			configValue = "0";
+		}
+		if(configValue.equals("0")){
+			detail.setHasMember(0);
+		}else {
+			Student student = studentDao.get(extraExerciseReply.getUserId());
+			detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+		}
 		detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
 		detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
 		return detail;

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

@@ -351,7 +351,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalender.setMusicGroupId(musicGroupId);
 			musicGroupPaymentCalender.setMusicGroupOrganizationCourseSettingId(musicGroupPaymentCalenderDto.getMusicGroupOrganizationCourseSettingId());
 
-			BigDecimal totalPaymentAmount = BigDecimal.ZERO;
+			BigDecimal totalPaymentAmount = musicGroupPaymentCalenderDto.getMasterTotalPrice();
 			if(musicGroupPaymentCalenderCourseSettingsList != null){
 				List<MusicGroupPaymentCalenderCourseSettings> newCSList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>(
 						musicGroupPaymentCalenderCourseSettingsList.size());

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

@@ -217,41 +217,6 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					null,
 					"STUDENT",pushMemberRenew);
 		}
-		//会员结束前5天提醒学员续费(退团提醒)
-		/*String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
-		if(StringUtils.isEmpty(pushMemberRenewQuit)){
-			pushMemberRenewQuit = "5";
-		}
-		//会员结束后3天学员自动退团
-		String memberEndAutoQuitMusic = sysConfigDao.findConfigValue(SysConfigService.MEMBER_END_AUTO_QUIT_MUSIC);
-		if(StringUtils.isEmpty(memberEndAutoQuitMusic)){
-			memberEndAutoQuitMusic = "3";
-		}
-		List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewQuit);
-		if(studentIdList.size() > 0){
-			Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIdList,",")));
-			Map<Integer,String> userMap = new HashMap<>(studentIdList.size());
-			Map<Integer,String> userMap1 = new HashMap<>(studentIdList.size());
-			for (Integer studentId : studentIdList) {
-				userMap.put(studentId,studentPhoneMap.get(studentId));
-				userMap1.put(studentId,studentId.toString());
-			}
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
-					userMap,
-					null,
-					0,
-					null,
-					null,pushMemberRenewQuit,memberEndAutoQuitMusic);
-
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
-					userMap1,
-					null,
-					0,
-					null,
-					"STUDENT",pushMemberRenewQuit,memberEndAutoQuitMusic);
-		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -72,6 +72,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     private PracticeGroupDao practiceGroupDao;
     @Autowired
     private ExtracurricularExercisesReplyDao extracurricularExercisesReplyDao;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @Override
     public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -208,8 +210,16 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             }
         }
         courseHomeworkStudentDetail.setType("HOMEWORK");
-        Student student = studentDao.get(userId.intValue());
-        courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+        if(StringUtils.isEmpty(configValue)){
+            configValue = "0";
+        }
+        if(configValue.equals("0")){
+            courseHomeworkStudentDetail.setHasMember(0);
+        }else {
+            Student student = studentDao.get(userId.intValue());
+            courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+        }
         return courseHomeworkStudentDetail;
     }
 

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

@@ -45,7 +45,7 @@ public class StudentServeServiceImpl implements StudentServeService {
     @Autowired
     private StudentServeService studentServeService;
     @Autowired
-    private SysConfigService sysConfigService;
+    private SysConfigDao sysConfigDao;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
     @Autowired
@@ -311,9 +311,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         Date nextMonday = Date.from(sunDayDate.plusDays(1).atStartOfDay(DateUtil.zoneId).toInstant());
 
         Set<String> holidayDays = new HashSet<>();
-        SysConfig holidaySetting = sysConfigService.findByParamName(SysConfigService.HOLIDAY_SETTING);
-        if(Objects.nonNull(holidaySetting)&&StringUtils.isNotBlank(holidaySetting.getParanValue())){
-            holidayDays = new HashSet<>(JSON.parseArray(holidaySetting.getParanValue(), String.class));
+        String holidaySetting = sysConfigDao.findConfigValue(SysConfigService.HOLIDAY_SETTING);
+        if(StringUtils.isNotEmpty(holidaySetting)){
+            holidayDays = new HashSet<>(JSON.parseArray(holidaySetting, String.class));
         }
         LocalDate everyDay=monDayDate;
         boolean weekInHoliday = true;
@@ -910,10 +910,18 @@ public class StudentServeServiceImpl implements StudentServeService {
             result.put("isAssignHomework", 0);
             return result;
         }
+        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+        if(StringUtils.isEmpty(configValue)){
+            configValue = "0";
+        }
         List<Integer> studentIds=new ArrayList<>();
         if(StringUtils.isNotBlank(studentIdsStr)){
-            //获取有会员的学员数
-            result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
+            if(configValue.equals("0")){
+                result.put("memberNum",0);
+            }else {
+                //获取有会员的学员数
+                result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
+            }
             studentIds= Arrays.asList(studentIdsStr.split(",")).stream().map(id->Integer.valueOf(id)).collect(Collectors.toList());
         }
 
@@ -925,10 +933,20 @@ public class StudentServeServiceImpl implements StudentServeService {
                 result.put("isAssignHomework", 0);
                 return result;
             }
-            MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-            if(musicGroup != null){
-                result.put("courseViewType", CourseViewTypeEnum.MEMBER_FEE);
+            if(configValue.equals("0")){
+                result.put("memberNum",0);
+                result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
+            }else {
+                MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+                if(musicGroup != null){
+                    result.put("courseViewType", musicGroup.getCourseViewType());
+                }else if(result.get("memberNum") == null){
+                    List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
+                    Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+                    result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
+                }
             }
+
             localDate=LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);
             if(CollectionUtils.isEmpty(courseScheduleStudentPayments)){

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

@@ -1389,7 +1389,7 @@
 	</select>
 
 	<select id="getOtherAmountDataWithTimelyDetails" resultMap="IndexBaseMonthData">
-		SELECT organ_id_,SUM(c.total_num_) total_num_,month_ FROM (
+		SELECT organ_id_,SUM(c.total_num_) total_num_,SUM(c.total_num_) activate_num_,SUM(c.total_num_) percent_,month_ FROM (
 		SELECT spo.organ_id_,SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 							   CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) total_num_
 		   ,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_

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

@@ -14,6 +14,8 @@
 		<result column="is_default_" property="isDefault" javaType="java.lang.Boolean" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="operator_" property="operator" />
+		<result column="operator_name_" property="operatorName" />
 	</resultMap>
 
 	<select id="get" resultMap="MemberRankSetting" >
@@ -27,13 +29,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO member_rank_setting (name_,intro_,icon_,is_default_,create_time_,update_time_)
-		VALUES(#{name},#{intro},#{icon},#{isDefault},NOW(),NOW())
+		INSERT INTO member_rank_setting (name_,intro_,icon_,is_default_,create_time_,update_time_,operator_)
+		VALUES(#{name},#{intro},#{icon},#{isDefault},NOW(),NOW(),#{operator})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting">
 		UPDATE member_rank_setting
 		<set>
+		<if test="operator != null">
+			operator_ = #{operator},
+		</if>
 		<if test="name != null">
 			name_ = #{name},
 		</if>
@@ -52,7 +57,8 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankSetting" parameterType="map">
-		SELECT * FROM member_rank_setting
+		SELECT mrs.*,su.real_name_ operator_name_ FROM member_rank_setting mrs
+		LEFT JOIN sys_user su ON su.id_ = mrs.operator_
 		<include refid="queryPageSql"/>
 		<include refid="global.limit"/>
 	</select>
@@ -60,14 +66,14 @@
 	<sql id="queryPageSql">
 		<where>
 			<if test="search != null and search != ''">
-				AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ = #{search})
+				AND (mrs.name_ LIKE CONCAT('%',#{search},'%') OR mrs.id_ = #{search})
 			</if>
 		</where>
 	</sql>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM member_rank_setting
+		SELECT COUNT(mrs.id_) FROM member_rank_setting mrs
 		<include refid="queryPageSql"/>
 	</select>
 	

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

@@ -232,6 +232,9 @@
             <if test="transactionTeacherId!=null">
                 AND transaction_teacher_id_ = #{transactionTeacherId}
             </if>
+            <if test="courseViewType != null">
+                AND course_view_type_ = #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
             <if test="musicGroupIds!=null and musicGroupIds.size()>0">
                 AND id_ IN
                 <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
@@ -831,7 +834,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
@@ -863,7 +866,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
@@ -879,7 +882,7 @@
     </select>
     <sql id="queryMusicMemberListSql">
         <where>
-            sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 1
+            sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 1
             AND mg.status_ = 'PROGRESS'
             <if test="search != null and search != ''">
                 AND (mg.name_ LIKE CONCAT('%',#{search},'%') OR mg.id_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})

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

@@ -94,6 +94,6 @@
 	</select>
     <select id="queryPushCourseTermMusicIds" resultType="java.lang.String">
 		SELECT music_group_id_ FROM music_group_school_term_course_detail
-		GROUP BY music_group_id_ HAVING DATEDIFF(MAX(end_school_term_),NOW()) = #{remindCourseTime}
+		GROUP BY music_group_id_ HAVING DATEDIFF(NOW(),MAX(end_school_term_)) = #{remindCourseTime}
 	</select>
 </mapper>

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

@@ -735,7 +735,10 @@
         SELECT COUNT(0) FROM student WHERE member_rank_setting_id_ IS NOT NULL AND FIND_IN_SET(user_id_,#{studentIdsStr})
     </select>
     <select id="queryPushMemberRenew" resultType="java.lang.Integer">
-        SELECT user_id_ FROM student WHERE DATEDIFF(membership_end_time_,NOW()) = #{pushMemberRenew};
+        SELECT s.user_id_ FROM student s
+        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ IN (1,2)
+        GROUP BY s.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
+        AND DATEDIFF(MAX(cto.end_time_),NOW()) = #{pushMemberRenew}
     </select>
 
     <update id="updateGrade"><![CDATA[

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

@@ -1540,7 +1540,7 @@
         SELECT sr.music_group_id_,sr.user_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = sr.user_id_ AND cto.status_ IN (1,2)
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 1
+        WHERE sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 1
         AND mg.status_ = 'PROGRESS'
         <if test="educationUserId != null">
             AND mg.educational_teacher_id_ = #{educationUserId}
@@ -1548,7 +1548,7 @@
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="memberEndAutoQuitMusic != null">
             AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
         </if>

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

@@ -1,8 +1,11 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.service.MemberRankSettingService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.QueryInfo;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
@@ -20,12 +23,19 @@ public class MemberRankSettingController extends BaseController {
 
     @Autowired
     private MemberRankSettingService memberRankSettingService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/add')")
     @AuditLogAnnotation(operateName = "新增会员等级")
     public Object add(@RequestBody MemberRankSetting memberRankSetting) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        memberRankSetting.setOperator(sysUser.getId());
         memberRankSettingService.add(memberRankSetting);
         return succeed();
     }
@@ -42,6 +52,11 @@ public class MemberRankSettingController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/update')")
     public Object update(@RequestBody MemberRankSetting memberRankSetting) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        memberRankSetting.setOperator(sysUser.getId());
         memberRankSettingService.updateSetting(memberRankSetting);
         return succeed();
     }

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

@@ -468,7 +468,7 @@ public class TaskController extends BaseController {
 		}
 	}
 
-	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@ApiOperation("每天10点推送排课、续费提醒")
 	@GetMapping(value = "/musicSchoolTermPush")
 	public void musicSchoolTermPush() {
 		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();