删除学生，退出群组

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.common.dal.BaseDAO;
 
 import org.apache.ibatis.annotations.Param;
@@ -176,4 +177,10 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     List<StudentRegistration> findStudentListByUserIdList(@Param("musicGroupId") String musicGroupId, @Param("userIdList") List<Integer> userIdList);
+
+    /**
+     * @param ids
+     * @return
+     */
+    int batchOpenPay(@Param("ids") String ids, @Param("paymentStatus") PaymentStatusEnum paymentStatus);
 }

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

@@ -203,6 +203,6 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param ids
 	 * @return
 	 */
-	int openPayment(Set<Long> ids);
+	int openPayment(String ids);
 
 }

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

@@ -157,7 +157,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             teacherDao.addSysUser(sysUser);
             userId = sysUser.getId();
             //添加用户现金账户
-            sysUserCashAccountDao.insert(new SysUserCashAccount(userId,"CNY"));
+            sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
             //添加用户电子签章账户
             contractService.register(userId);
             //注册到融云
@@ -258,7 +258,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //增加缴费学生数
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
         int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
-        musicOneSubjectClassPlan.setPaidStudentNum(paidNum+1);
+        musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
         return studentPaymentOrder;
     }
 
@@ -371,7 +371,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 teacherDao.addSysUser(sysUser);
                 userId = sysUser.getId();
                 //添加用户现金账户
-                sysUserCashAccountDao.insert(new SysUserCashAccount(userId,"CNY"));
+                sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
                 contractService.register(userId);
                 //注册到融云
@@ -501,22 +501,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public List<StudentRegistration> findMusicGroupStudent(String musicGroupId, Integer actualSubjectId) {
-        return studentRegistrationDao.findMusicGroupStudent(musicGroupId,actualSubjectId);
+        return studentRegistrationDao.findMusicGroupStudent(musicGroupId, actualSubjectId);
     }
 
     @Override
     public List<StudentRegistration> findStudentListByUserIdList(String musicGroupId, List<Integer> userIdList) {
-        return studentRegistrationDao.findStudentListByUserIdList(musicGroupId,userIdList);
+        return studentRegistrationDao.findStudentListByUserIdList(musicGroupId, userIdList);
     }
 
     @Override
-    public int openPayment(Set<Long> ids) {
-        List<Long> idsList = new ArrayList<>(ids);
-        List<StudentRegistration> studentList = studentRegistrationDao.findStudentListByIdList(idsList);
-        for (StudentRegistration studentRegistration : studentList) {
-            studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
-            studentRegistrationDao.update(studentRegistration);
-        }
-        return ids.size();
+    public int openPayment(String ids) {
+        return studentRegistrationDao.batchOpenPay(ids, PaymentStatusEnum.OPEN);
     }
 }

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

@@ -367,5 +367,8 @@
         </foreach>
     </select>
 
-    <update id="batchUpdate">
-</mapper>
+    <!-- 批量开启缴费 -->
+    <update id="batchOpenPay">
+        UPDATE student_registration SET payment_status_ = #{paymentStatus},update_time_ = now()
+        WHERE FIND_IN_SET(id_,#{ids}) AND payment_status_ = 0
+    </update></mapper>

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

@@ -112,11 +112,11 @@ public class StudentRegistrationController extends BaseController {
         return succeed(studentRegistrationService.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId));
     }
 
-    @ApiOperation(value = "开启缴费")
+    @ApiOperation(value = "开启缴费(单独学生)")
     @PostMapping("/openPayment")
     @PreAuthorize("@pcs.hasPermissions('studentRegistration/openPayment')")
-    @ApiImplicitParams({@ApiImplicitParam(name = "ids", value = "报名id（不是userId）", required = true, dataType = "array")})
-    public HttpResponseResult openPayment(@RequestBody Set<Long> ids) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "ids", value = "报名id（不是userId）,逗号分隔", required = true, dataType = "String")})
+    public HttpResponseResult openPayment(String ids) {
         return succeed(studentRegistrationService.openPayment(ids));
     }