fengji 团练宝

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

@@ -415,7 +415,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             throw new BizException("学员信息不存在");
         }
         Date nowDate = new Date();
-        if (student.getMemberRankSettingId() == null || nowDate.after(student.getMembershipEndTime())) {
+        if (student.getMembershipEndTime()  == null || student.getMemberRankSettingId() == null || nowDate.after(student.getMembershipEndTime())) {
             student.setMembershipStartTime(getMembershipEndTime(cloudTeacherOrder.getType(),nowDate, cloudTeacherOrder.getTime()));
         } else {
             student.setMembershipStartTime(getMembershipEndTime(cloudTeacherOrder.getType(),student.getMembershipEndTime(), cloudTeacherOrder.getTime()));

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

@@ -120,7 +120,7 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreCategories" parameterType="map">
-		SELECT sm.*,GROUP_CONCAT(o.name_) organ_name_ FROM sys_music_score_categories sm
+		SELECT sm.*, GROUP_CONCAT(o.name_) AS organ_name_ FROM sys_music_score_categories sm
 		LEFT JOIN organization o ON FIND_IN_SET(o.id_,sm.organ_id_)
 		<where>
 			<if test="organId != null and organId != ''">
@@ -160,9 +160,11 @@
 		</where>
 	</select>
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
-		SELECT sm.* FROM sys_music_score_categories sm
+		SELECT count(score.id_) AS musicScoreNum, sm.* FROM sys_music_score_categories sm
+		LEFT JOIN sys_music_score score ON sm.id_ = score.music_score_categories_id_
 		<include refid="queryTree"/>
 		ORDER BY sm.order_
+		group by score.music_score_categories_id_
 	</select>
 	<select id="findByCategoriesIds" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(id_) FROM sys_music_score_categories

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

@@ -35,7 +35,7 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "手动添加会员")
     @PostMapping("/addStudents")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
     public HttpResponseResult<Boolean> addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
         return succeed(cloudTeacherOrderService.addStudents(cloudTeacherAddQueryInfo));
     }
@@ -62,13 +62,13 @@ public class CloudTeacherOrderController extends BaseController {
     @ApiOperation(value = "激活记录")
     @PostMapping("/queryActiveRecord")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
-    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
+    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActiveRecord(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
         return succeed(cloudTeacherOrderService.queryRecord(cloudTeacherOrderQueryInfo));
     }
 
     @ApiOperation(value = "激活团练宝用户")
     @PostMapping("/pay")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
     public HttpResponseResult<Map<String, Object>> pay(@RequestBody List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
         return succeed(cloudTeacherOrderService.pay(cloudTeacherStudents));
     }