Merge remote-tracking branch 'origin/master'

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

@@ -294,7 +294,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT) {
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.SECTION_MANAGER);
-            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(),musicGroup.getName());
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(), musicGroup.getName());
         }
         // 保存乐团付费主体列表
         //批量新增
@@ -1140,7 +1140,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
 
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(),musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(), musicGroup.getName());
 
     }
 
@@ -1246,7 +1246,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
 
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(),musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getRealName(), musicGroup.getName());
 
     }
 
@@ -1305,9 +1305,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()),
-                MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS, "",musicGroup.getName());
+                MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS, "", musicGroup.getName());
         Map<Integer, String> map = new HashMap<>(1);
-        map.put(musicGroup.getEducationalTeacherId(),musicGroup.getEducationalTeacherId().toString());
+        map.put(musicGroup.getEducationalTeacherId(), musicGroup.getEducationalTeacherId().toString());
         if (map != null && map.size() > 0) {
             sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS,
                     map, null, 0, null, "SYSTEM", musicGroup.getName());
@@ -2169,7 +2169,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (oldStudentPaymentOrder != null) {
                 if (oldStudentPaymentOrder.getStatus() == SUCCESS) {
                     throw new BizException("您已支付请勿重复提交");
-                }else if(oldStudentPaymentOrder.getStatus() == ING){
+                } else if (oldStudentPaymentOrder.getStatus() == ING) {
                     oldStudentPaymentOrder.setStatus(CLOSE);
                     studentPaymentOrderService.update(oldStudentPaymentOrder);
                     if (oldStudentPaymentOrder.getBalancePaymentAmount() != null && oldStudentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
@@ -2897,11 +2897,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             studentRegistrationDao.batchInsert(studentRegistrationList);
         }
         //0元的和学校缴费的默认缴费
+        boolean autoPay = false;
         MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroupId);
-        if (regCalender == null || regCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.SCHOOL) ||
-                regCalender.getPaymentAmount().compareTo(BigDecimal.ZERO) == 0) {
-            List<MusicGroupPaymentCalenderCourseSettings> musicGroupRegCalenderCourseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
-            List<Integer> courseSettings = musicGroupRegCalenderCourseSettings.stream().filter(e -> !e.getIsStudentOptional()).map(MusicGroupPaymentCalenderCourseSettings::getId).collect(Collectors.toList());
+        List<MusicGroupPaymentCalenderCourseSettings> musicGroupRegCalenderCourseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
+        BigDecimal courseSettingsPrice = musicGroupRegCalenderCourseSettings.stream().map(MusicGroupPaymentCalenderCourseSettings::getCourseCurrentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (regCalender == null || courseSettingsPrice.compareTo(BigDecimal.ZERO) == 0) {
+            autoPay = true;
+        }
+        if (autoPay) {
+            List<Integer> courseSettings = musicGroupRegCalenderCourseSettings.stream().map(MusicGroupPaymentCalenderCourseSettings::getId).collect(Collectors.toList());
             RegisterPayDto registerPayDto = new RegisterPayDto();
             registerPayDto.setAmount(BigDecimal.ZERO);
             registerPayDto.setNewCourse(courseSettings);
@@ -2909,7 +2913,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 registerPayDto.setRegisterId(studentRegistration.getId().intValue());
                 Map payMap = this.pay(registerPayDto);
             }
-
         }
 
         //修改乐团信息

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

@@ -0,0 +1,41 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("sysMusicScoreCategories")
+@Api(tags = "曲库分类服务")
+@RestController
+public class SysMusicScoreCategoriesController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
+
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
+    @ApiOperation(value = "获取分类详情")
+    @GetMapping("/get")
+    public Object get(Integer id) {
+        return succeed(sysMusicScoreCategoriesService.get(id));
+    }
+}

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

@@ -1,47 +1,41 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@RequestMapping("sysMusicScoreCategorie")
-@Api(tags = "曲库服务")
+@RequestMapping("sysMusicScoreCategories")
+@Api(tags = "曲库分类服务")
 @RestController
 public class SysMusicScoreCategoriesController extends BaseController {
 
     @Autowired
     private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public Object add(SysMusicScoreCategories sysMusicScoreCategories) {
-        sysMusicScoreCategoriesService.insert(sysMusicScoreCategories);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(SysMusicScoreCategories sysMusicScoreCategories) {
-        sysMusicScoreCategoriesService.update(sysMusicScoreCategories);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/del")
-    public Object del(Integer id) {
-        sysMusicScoreCategoriesService.delete(id);
-        return succeed();
-    }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
         return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
+    @ApiOperation(value = "获取分类详情")
+    @GetMapping("/get")
+    public Object get(Integer id) {
+        return succeed(sysMusicScoreCategoriesService.get(id));
+    }
 }

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

@@ -33,4 +33,10 @@ public class SysMusicScoreCategoriesController extends BaseController {
         return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
     }
 
+    @ApiOperation(value = "获取分类详情")
+    @GetMapping("/get")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/get')")
+    public Object get(Integer id) {
+        return succeed(sysMusicScoreCategoriesService.get(id));
+    }
 }