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

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

@@ -48,7 +48,7 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @param musicGroupId
      * @param subjectId
      */
-    void addApplyStudentNum(String musicGroupId, Integer subjectId,int num);
+    void addApplyStudentNum(String musicGroupId, Integer subjectId,int num) throws Exception;
 
     /**
      * 批量修改声部规划费用

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

@@ -73,7 +73,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param studentRegistration
 	 * @return
 	 */
-	StudentRegistration addStudent(StudentRegistration studentRegistration) throws IOException;
+	StudentRegistration addStudent(StudentRegistration studentRegistration) throws Exception;
 
 	/**
 	 * 查询学生信息

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

@@ -24,7 +24,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @param vipGroup: VIP课申请信息
      * @return void
      */
-    void createVipGroup(VipGroupApplyDto vipGroup,Integer systemId);
+    void createVipGroup(VipGroupApplyDto vipGroup);
 
     /**
      * @describe 更新vip课程信息

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

@@ -166,7 +166,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     @Transactional(rollbackFor = Exception.class)
     public void teacherSalarySettlement() {
 
-        int days = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.VIP_SETTLEMENT_CYCLE).getParanValue());
+        int days = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.VIP_APPEAL_DAYS_RANGE).getParanValue());
 
         //获取教师未结算课程记录
         List<CourseScheduleTeacherSalary> someDayAgoTeacherCourseSalaryNoSettlement = courseScheduleTeacherSalaryDao.findSomeDayAgoTeacherCourseSalaryNoSettlement(days);

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.collection.MapUtil;
 import org.snaker.engine.core.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,12 +122,22 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) {
-        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
-        int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
-        musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);
-        musicOneSubjectClassPlan.setUpdateTime(new Date());
-        musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
+    public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) throws Exception {
+        boolean flag = false;
+        for (int i = 10; i >= 1; i--) {
+            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+            int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
+            musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);
+            musicOneSubjectClassPlan.setUpdateTime(new Date());
+            int updateCount = musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
+            if (updateCount >= 0) {
+                flag = true;
+                break;
+            }
+        }
+        if (!flag) {
+            throw new BizException("系统繁忙，请重试");
+        }
     }
 
     @Override
@@ -150,7 +161,8 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 
         List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
         for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-            if (orderDetail == null || orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty()) continue;
+            if (orderDetail == null || orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty())
+                continue;
             MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
             if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
                 musicGroupSubjectGoodsGroup.setName("乐器");

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

@@ -192,12 +192,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public StudentRegistration addStudent(StudentRegistration studentRegistration) throws IOException {
-    	String key = "_student_registration";
-    	long threadId = Thread.currentThread().getId();
-    	if(!redisCache.getLocked(key, threadId, 10)){
-    		throw new BizException("系统繁忙，请稍后再试");
-    	}
+    public StudentRegistration addStudent(StudentRegistration studentRegistration) throws Exception {
+        String key = "_student_registration";
+        long threadId = Thread.currentThread().getId();
+        if (!redisCache.getLocked(key, threadId, 10)) {
+            throw new BizException("系统繁忙，请稍后再试");
+        }
         Date date = new Date();
         Integer userId = 0;
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
@@ -248,7 +248,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "",
                 studentRegistration.getParentsName(), subject.getName(), HttpUtil.getSortUrl(studentApplyUrl),
                 DateUtil.format(musicGroup.getApplyExpireDate(), DateUtil.DATE_FORMAT_MIN), serverPhone);
-        
+
         redisCache.releaseLocked(key, threadId);
         return studentRegistration;
     }
@@ -335,16 +335,24 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetailList);
 
         //增加缴费学生数
-        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
-        int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
-        musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
-        if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
-            throw new BizException("乐团人数已满");
+        boolean updateFlag = false;
+        for (int i = 0; i < 10; i++) {
+            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
+            int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
+            musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
+            if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
+                throw new BizException("乐团人数已满");
+            }
+            int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+            if (count >= 1) {
+                updateFlag = true;
+                break;
+            }
         }
-        int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
-        if (count <= 0) {
-            throw new BizException("系统繁忙请重新");
+        if (!updateFlag) {
+            throw new BizException("系统繁忙，更新缴费人数失败");
         }
+
         return studentPaymentOrder;
     }
 
@@ -788,7 +796,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
             musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
             int updateCount = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
-            if(updateCount <= 0){
+            if (updateCount <= 0) {
                 throw new BizException("减去缴费人数失败");
             }
             //发送缴费成功通知（短信 + push）

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

@@ -114,7 +114,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void createVipGroup(VipGroupApplyDto vipGroup,Integer systemId) {
+	public void createVipGroup(VipGroupApplyDto vipGroup) {
 
 		if (Objects.isNull(vipGroup.getVipGroupApplyBaseInfo().getUserId())){
 			throw new BizException("请选择指导老师");
@@ -317,14 +317,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
 		Map<String,Long> memo = new HashMap<>(1);
 		memo.put("vipGroupId",vipGroupApplyBaseInfoDto.getId());
-		SysUser systemUser = sysUserFeignService.queryUserById(systemId);
+
 		String[] organIds = null;
-		if(StringUtils.isNotEmpty(systemUser.getOrganId())){
-			organIds = systemUser.getOrganId().split(",");
+		if(StringUtils.isNotEmpty(sysUser.getOrganId())){
+			organIds = sysUser.getOrganId().split(",");
 		}
 		Set<Integer> userIds = musicGroupDao.queryUserIdByRoleId(roleIds,organIds);
-		if (systemId != null){
-			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_VIP_COURSE_APPLY, JSONObject.toJSONString(memo),systemUser.getUsername(),sysUser.getUsername());
+		if (vipGroup.getVipGroupApplyBaseInfo().getUserId() != null){
+			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_VIP_COURSE_APPLY, JSONObject.toJSONString(memo),sysUser.getUsername(),sysUser.getUsername());
 		}else {
 			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_TEACHER_APPLY_VIP, JSONObject.toJSONString(memo),sysUser.getUsername());
 		}

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

@@ -867,7 +867,7 @@
         WHERE su.id_ IS NOT NULL
     </select>
 
-	<update id="batchUpdateStudentNumMinusOne">
+	<update id="batchUpdateStudentNumMinusOne" parameterType="java.util.List">
 		update class_group set student_num_ = (student_num_ - 1),update_time_ = now() where id_ IN
       <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
           #{classGroupId}

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

@@ -35,7 +35,7 @@ public class MusicGroupRegisterController extends BaseController {
 
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
-    public HttpResponseResult add(@RequestBody StudentRegistration studentRegistration) throws IOException {
+    public HttpResponseResult add(@RequestBody StudentRegistration studentRegistration) throws Exception {
         Date date = new Date();
         MusicGroup musicGroup = musicGroupService.get(studentRegistration.getMusicGroupId());
         if (musicGroup == null) {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -4,14 +4,16 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.dto.VipGroupCostCountParamsDto;
-import com.ym.mec.biz.service.SchoolService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
 
@@ -41,7 +43,7 @@ public class TeacherVipGroupController extends BaseController {
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setTeacherId(Long.valueOf(user.getId()));
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(user.getOrganId().toString());
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(user.getOrganId()));
-		vipGroupService.createVipGroup(vipGroupApplyDto,null);
+		vipGroupService.createVipGroup(vipGroupApplyDto);
 		return succeed();
 	}
 

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

@@ -1,5 +1,7 @@
 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.dto.ClassGroup4MixDto;
 import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.dto.TestDto;
@@ -32,6 +34,8 @@ public class ClassGroupController extends BaseController {
     private ClassGroupService classGroupService;
     @Autowired
     private ClassGroupTeacherMapperService classGroupTeacherMapperService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增单技班班级")
     @PostMapping("/add")
@@ -250,4 +254,10 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult enumTest(@RequestBody TestDto testDto){
         return succeed(testDto.getDelFlag().getMsg());
     }
+
+    @GetMapping("queryUserInfo")
+    public HttpResponseResult queryUserInfo(Integer userId){
+        SysUser sysUser = sysUserFeignService.queryUserById(userId);
+        return succeed(sysUser.getUsername());
+    }
 }

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

@@ -68,7 +68,7 @@ public class VipGroupManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        vipGroupService.createVipGroup(vipGroupApplyDto,sysUser.getId());
+        vipGroupService.createVipGroup(vipGroupApplyDto);
         return succeed();
     }