Merge remote-tracking branch 'origin/master'

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition> {
 
@@ -29,5 +30,14 @@ public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition>
      * @return java.util.List<com.ym.mec.biz.dal.dto.StudentCompetitionRankingDto>
      */
     List<StudentCompetition> getWinnerList();
-	
+
+    /**
+     * @describe 获取指定奖项级别的作品编号列表
+     * @author Joburgess
+     * @date 2020.11.10
+     * @param prizeLevel:
+     * @return java.util.Set<java.lang.Long>
+     */
+    Set<Long> getCompetitionsWithPrizeLevel(@Param("prizeLevel") Integer prizeLevel);
+
 }

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

@@ -44,7 +44,7 @@ public class StudentCompetition {
 	private java.math.BigDecimal score;
 
 	@ApiModelProperty(value = "获奖等级")
-	private java.math.BigDecimal prizeLevel;
+	private Integer prizeLevel;
 
 	@ApiModelProperty(value = "是否展示")
 	private boolean isShow;
@@ -159,15 +159,15 @@ public class StudentCompetition {
 	public java.math.BigDecimal getScore(){
 		return this.score;
 	}
-			
-	public void setPrizeLevel(java.math.BigDecimal prizeLevel){
-		this.prizeLevel = prizeLevel;
+
+	public Integer getPrizeLevel() {
+		return prizeLevel;
 	}
-	
-	public java.math.BigDecimal getPrizeLevel(){
-		return this.prizeLevel;
+
+	public void setPrizeLevel(Integer prizeLevel) {
+		this.prizeLevel = prizeLevel;
 	}
-			
+
 	public void setIsShow(boolean isShow){
 		this.isShow = isShow;
 	}

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

@@ -30,4 +30,13 @@ public interface StudentCompetitionService extends BaseService<Long, StudentComp
     List<StudentCompetitionRankingDto> getWinnerList();
 
     StudentCompetition checkIsUpload(Integer userId);
+
+    /**
+     * @describe 更新参赛作品信息
+     * @author Joburgess
+     * @date 2020.11.10
+     * @param studentCompetition:
+     * @return void
+     */
+    void updateCompetition(StudentCompetition studentCompetition);
 }

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

@@ -238,7 +238,9 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		if(musicGroupPaymentCalender == null){
 			throw new BizException("查询缴费信息失败");
 		}
-		
+		if(musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY){
+			throw new BizException("操作失败：报名缴费项不允许添加学员");
+		}
 		if (musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.AUDITING
 				|| musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.REJECT) {
 			throw new BizException("当前缴费状态不能添加学生");
@@ -269,7 +271,6 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetail.setUserId(studentId);
 			musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
 			musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
-			
 			userMap.put(studentId, musicGroupPaymentCalenderDetail);
 			musicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
 		}

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

@@ -250,7 +250,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 		}else {
             Set<Integer> roleIds = new HashSet<>(1);
-            roleIds.add(SysUserRole.SECTION_MANAGER);
+            roleIds.add(SysUserRole.ADMINISTRATOR);
             Organization organization = organizationDao.get(musicGroup.getOrganId());
             sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_PAYMENT_CALENDER_AUDIT, "", organization.getName(),musicGroup.getName());
 		}
@@ -266,9 +266,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
 					// 记录操作日志
 					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
-					Set<Integer> roleIds = new HashSet<>(1);
-					roleIds.add(SysUserRole.ADMINISTRATOR);
-					sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getUsername());
 				}else{
 					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
 					// 记录操作日志

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

@@ -86,4 +86,31 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 		}
 		return winnerSimpleInfoList;
 	}
+
+	@Override
+	public void updateCompetition(StudentCompetition studentCompetition) {
+		if(Objects.nonNull(studentCompetition.getPrizeLevel())){
+			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel());
+			int maxPrizeLevelUserNum = 0;
+			switch (studentCompetition.getPrizeLevel()){
+				case 1:
+					maxPrizeLevelUserNum = 1;
+					break;
+				case 2:
+				case 3:
+					maxPrizeLevelUserNum = 12;
+					break;
+				case 4:
+					maxPrizeLevelUserNum = 24;
+					break;
+				case 5:
+					maxPrizeLevelUserNum = 50;
+					break;
+			}
+			if(competitionsWithPrizeLevel.size()>=maxPrizeLevelUserNum&&!competitionsWithPrizeLevel.contains(studentCompetition.getId())){
+				throw new BizException("该奖项名额已达上线");
+			}
+		}
+		studentCompetitionDao.update(studentCompetition);
+	}
 }

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

@@ -485,7 +485,7 @@
 		LEFT JOIN music_group_payment_calender mgpc ON mgpc.music_group_id_ = mg.id_
         LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
         AND mgpcd.user_id_ = #{userId} AND mgpcd.payment_status_ = 'NON_PAYMENT'
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupId})
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupId}) AND DATE_FORMAT(NOW(),'%Y-%m-%d') > DATE_FORMAT(mgpc.payment_valid_end_date_,'%Y-%m-%d')
         GROUP BY mg.id_
     </select>
 </mapper>

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

@@ -155,4 +155,8 @@
 	<select id="getCompetitionWithUser" resultMap="StudentCompetition">
 		SELECT * FROM student_competition WHERE user_id_ = #{userId}
 	</select>
+
+	<select id="getCompetitionsWithPrizeLevel" resultType="long">
+		SELECT id_ FROM student_competition WHERE prize_level_ = #{prizeLevel} FOR UPDATE
+	</select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.page.StudentCompetitionQueryInfo;
 import com.ym.mec.biz.service.StudentCompetitionService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 /**
  * @Author Joburgess
  * @Date 2020.11.10
@@ -37,7 +40,10 @@ public class StudentCompetitionController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('studentCompetition/update')")
     public HttpResponseResult update(@RequestBody StudentCompetition studentCompetition){
-        studentCompetitionService.update(studentCompetition);
+        if(Objects.isNull(studentCompetition.getId())){
+            throw new BizException("请指定参赛作品");
+        }
+        studentCompetitionService.updateCompetition(studentCompetition);
         return succeed();
     }