zouxuan 5 年之前
父節點
當前提交
0e3b706ef5
共有 38 個文件被更改,包括 409 次插入1709 次删除
  1. 19 19
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java
  2. 0 59
      mec-web/src/main/java/com/ym/mec/web/controller/CourseGroupController.java
  3. 0 67
      mec-web/src/main/java/com/ym/mec/web/controller/CourseGroupDetailController.java
  4. 0 61
      mec-web/src/main/java/com/ym/mec/web/controller/CourseTypeController.java
  5. 0 59
      mec-web/src/main/java/com/ym/mec/web/controller/StudentAttendanceController.java
  6. 0 18
      mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseGroupDao.java
  7. 0 9
      mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseGroupDetailDao.java
  8. 0 9
      mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseTypeDao.java
  9. 9 0
      mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupPaymentCalenderDao.java
  10. 9 0
      mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupStudentFeeDao.java
  11. 0 94
      mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseGroup.java
  12. 0 121
      mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseGroupDetail.java
  13. 0 109
      mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseType.java
  14. 81 0
      mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroupPaymentCalender.java
  15. 81 0
      mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroupStudentFee.java
  16. 0 53
      mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/CourseGroupUtilEntity.java
  17. 0 15
      mec-web/src/main/java/com/ym/mec/web/service/CourseGroupDetailService.java
  18. 0 17
      mec-web/src/main/java/com/ym/mec/web/service/CourseGroupService.java
  19. 0 8
      mec-web/src/main/java/com/ym/mec/web/service/CourseTypeService.java
  20. 8 0
      mec-web/src/main/java/com/ym/mec/web/service/MusicGroupPaymentCalenderService.java
  21. 8 0
      mec-web/src/main/java/com/ym/mec/web/service/MusicGroupStudentFeeService.java
  22. 0 34
      mec-web/src/main/java/com/ym/mec/web/service/impl/CourseGroupDetailServiceImpl.java
  23. 0 30
      mec-web/src/main/java/com/ym/mec/web/service/impl/CourseGroupServiceImpl.java
  24. 0 23
      mec-web/src/main/java/com/ym/mec/web/service/impl/CourseTypeServiceImpl.java
  25. 22 0
      mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupPaymentCalenderServiceImpl.java
  26. 20 0
      mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupStudentFeeServiceImpl.java
  27. 0 96
      mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountDetailMapper.xml
  28. 0 84
      mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountMapper.xml
  29. 0 88
      mec-web/src/main/java/com/ym/mec/web/service/impl/StudentApplyRefundsMapper.xml
  30. 0 80
      mec-web/src/main/java/com/ym/mec/web/service/impl/StudentPaymentOrderDetailMapper.xml
  31. 0 116
      mec-web/src/main/java/com/ym/mec/web/service/impl/StudentPaymentOrderMapper.xml
  32. 0 96
      mec-web/src/main/java/com/ym/mec/web/service/impl/SysUserCashAccountDetailMapper.xml
  33. 0 84
      mec-web/src/main/java/com/ym/mec/web/service/impl/SysUserCashAccountMapper.xml
  34. 0 88
      mec-web/src/main/resources/config/mybatis/CourseGroupDetailMapper.xml
  35. 0 89
      mec-web/src/main/resources/config/mybatis/CourseGroupMapper.xml
  36. 0 83
      mec-web/src/main/resources/config/mybatis/CourseTypeMapper.xml
  37. 76 0
      mec-web/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml
  38. 76 0
      mec-web/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

+ 19 - 19
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -84,7 +84,7 @@ public class RoomServiceImpl implements RoomService {
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 //        String userId = getUser().getUserId().toString();
-        String userId = sysUserFeignService.queryUserInfo(token).getId().toString();
+        String userId = sysUserFeignService.queryUserInfo().getId().toString();
 
         String display = "";
         Date curTime = DateTimeUtils.currentUTC();
@@ -221,7 +221,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     public Boolean leaveRoom(String roomId) throws Exception {
         String token = SecurityUtils.getToken();
-        SysUser user = sysUserFeignService.queryUserInfo(token);
+        SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
         
         CheckUtils.checkArgument(user != null, "user must't be null");
@@ -328,7 +328,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(users.size() > 0, "the changed user list must't be null");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         List<Room> roomList = roomDao.findByRid(roomId);
         if (roomList.isEmpty()) {
@@ -378,7 +378,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     public Boolean kickMember(String roomId) throws ApiException, Exception {
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         CheckUtils.checkArgument(userId != null, "userId must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
@@ -418,7 +418,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     public Boolean display(String roomId, int type, String uri) throws ApiException, Exception {
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
@@ -483,7 +483,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, userId), "room member not exist");
 
@@ -527,7 +527,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(whiteBoardId != null, "whiteBoardId must't be null");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
         List<Whiteboard> whiteboardList = whiteboardDao.findByRidAndWbid(roomId, whiteBoardId);
@@ -584,7 +584,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(whiteBoardId != null, "whiteBoardId must't be null");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         List<Room> roomList = roomDao.findByRid(roomId);
         CheckUtils.checkArgument(!roomList.isEmpty(), "room not exist");
@@ -604,7 +604,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, userId), "room member not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
 
         log.info("controlDevice: userId={}, typeEnum={}, onOff={}", userId, typeEnum, enable);
 
@@ -645,7 +645,7 @@ public class RoomServiceImpl implements RoomService {
     public Boolean approveControlDevice(String roomId, String ticket) throws ApiException, Exception {
         CheckUtils.checkArgument(ticket != null, "ticket must't be null");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         log.info("approveControlDevice: ticket={}", ticket);
         ControlDeviceTaskInfo taskInfo = (ControlDeviceTaskInfo) scheduleManager.executeTask(ticket);
@@ -670,7 +670,7 @@ public class RoomServiceImpl implements RoomService {
     public Boolean rejectControlDevice(String roomId, String ticket) throws ApiException, Exception {
         CheckUtils.checkArgument(ticket != null, "ticket must't be null");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
         log.info("rejectControlDevice: ticket={}", ticket);
@@ -688,7 +688,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
         int result;
@@ -721,7 +721,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         List<RoomMember> assistants = roomMemberDao.findByRidAndRole(roomId, RoleEnum.RoleAssistant.getValue());
         if (assistants.isEmpty()) {
@@ -756,7 +756,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
         int count = roomMemberDao.countByRidAndExcludeRole(roomId, RoleEnum.RoleAudience.getValue());
@@ -801,7 +801,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         ScheduledTaskInfo taskInfo = scheduleManager.executeTask(ticket);
 
@@ -875,7 +875,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(targetUserId != null, "userId must't be null");
         CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, targetUserId), "room member not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         log.info("inviteUpgradeRole roomId = {}, targetUserId = {}, targetRole = {}", roomId, targetUserId, targetRole);
 
@@ -915,7 +915,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(ticket != null, "ticket must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         UpgradeRoleTaskInfo taskInfo = (UpgradeRoleTaskInfo) scheduleManager.executeTask(ticket);
         log.info("approveUpgradeRole roomId = {}, task={}", roomId, taskInfo);
@@ -958,7 +958,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(ticket != null, "ticket must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         UpgradeRoleTaskInfo taskInfo = (UpgradeRoleTaskInfo) scheduleManager.executeTask(ticket);
         UpgradeRoleMessage msg = new UpgradeRoleMessage(ActionEnum.Reject.ordinal());
@@ -982,7 +982,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(RoleEnum.getEnumByValue(targetRole).equals(RoleEnum.RoleTeacher), "only set to teacher");
         CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, targetUserId), "room member not exist");
         String token = SecurityUtils.getToken();
-        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
         List<RoomMember> targetUser = roomMemberDao.findByRidAndUid(roomId, targetUserId);

+ 0 - 59
mec-web/src/main/java/com/ym/mec/web/controller/CourseGroupController.java

@@ -1,59 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.CourseGroup;
-import com.ym.mec.web.service.CourseGroupService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RequestMapping("courseGroup")
-@Api(tags = "课程组服务")
-@RestController
-public class CourseGroupController extends BaseController {
-
-    @Autowired
-    private CourseGroupService courseGroupService;
-
-    @ApiOperation(value = "新增课程组")
-    @PostMapping("/add")
-    public Object add(@RequestBody CourseGroup courseGroup){
-        Date date = new Date();
-        courseGroup.setCreateTime(date);
-        courseGroup.setUpdateTime(date);
-        courseGroupService.insert(courseGroup);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除课程组")
-    @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
-        courseGroupService.delete(id);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改课程组")
-    @PutMapping("/update")
-    public Object update(@RequestBody CourseGroup courseGroup){
-        courseGroup.setUpdateTime(new Date());
-        courseGroupService.update(courseGroup);
-        return succeed();
-    }
-
-    @ApiOperation(value = "根据课程组编号查询课程组")
-    @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
-        return succeed(courseGroupService.findDetailById(id));
-    }
-
-    @ApiOperation(value = "分页查询课程组")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
-        return succeed(courseGroupService.queryPage(queryInfo));
-    }
-}

+ 0 - 67
mec-web/src/main/java/com/ym/mec/web/controller/CourseGroupDetailController.java

@@ -1,67 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.CourseGroupDetail;
-import com.ym.mec.web.service.CourseGroupDetailService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-@RequestMapping("courseGroupDetail")
-@Api(tags = "课程组详情服务")
-@RestController
-public class CourseGroupDetailController extends BaseController {
-
-    @Autowired
-    private CourseGroupDetailService courseGroupDetailService;
-
-    @ApiOperation(value = "新增课程组详情")
-    @PostMapping("/add")
-    public Object add(@RequestBody CourseGroupDetail courseGroupDetail){
-        Date date = new Date();
-        courseGroupDetail.setCreateTime(date);
-        courseGroupDetail.setUpdateTime(date);
-        courseGroupDetailService.insert(courseGroupDetail);
-        return succeed();
-    }
-
-    @ApiOperation(value = "批量新增课程组详情")
-    @PostMapping("/batchAdd")
-    public Object batchAdd(@RequestBody List<CourseGroupDetail> courseGroupDetails){
-        courseGroupDetailService.batchInsert(courseGroupDetails);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除课程组详情")
-    @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "课程组详情编号", required = true) @PathVariable("id") Integer id){
-        courseGroupDetailService.delete(id);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改课程组详情")
-    @PutMapping("/update")
-    public Object update(@RequestBody CourseGroupDetail courseGroupDetail){
-        courseGroupDetail.setUpdateTime(new Date());
-        courseGroupDetailService.update(courseGroupDetail);
-        return succeed();
-    }
-
-    @ApiOperation(value = "根据课程组详情编号查询课程组详情")
-    @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "课程组详情编号", required = true) @PathVariable("id") Integer id){
-        return succeed(courseGroupDetailService.get(id));
-    }
-
-    @ApiOperation(value = "分页查询课程组详情")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
-        return succeed(courseGroupDetailService.queryPage(queryInfo));
-    }
-}

+ 0 - 61
mec-web/src/main/java/com/ym/mec/web/controller/CourseTypeController.java

@@ -1,61 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.CourseType;
-import com.ym.mec.web.dal.entity.Goods;
-import com.ym.mec.web.dal.page.GoodsQueryInfo;
-import com.ym.mec.web.service.CourseGroupService;
-import com.ym.mec.web.service.CourseTypeService;
-import com.ym.mec.web.service.GoodsService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RequestMapping("courseType")
-@Api(tags = "课程类型服务")
-@RestController
-public class CourseTypeController extends BaseController {
-
-    @Autowired
-    private CourseTypeService courseTypeService;
-
-    @ApiOperation(value = "新增课程类型")
-    @PostMapping("/add")
-    public Object add(@RequestBody CourseType courseType){
-        Date date = new Date();
-        courseType.setCreateTime(date);
-        courseType.setUpdateTime(date);
-        courseTypeService.insert(courseType);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除课程类型")
-    @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id){
-        courseTypeService.delete(id);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改课程类型")
-    @PutMapping("/update")
-    public Object update(@RequestBody CourseType courseType){
-        courseType.setUpdateTime(new Date());
-        courseTypeService.update(courseType);
-        return succeed();
-    }
-
-    @ApiOperation(value = "根据课程类型编号查询课程类型")
-    @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id){
-        return succeed(courseTypeService.get(id));
-    }
-
-    @ApiOperation(value = "分页查询课程类型")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
-        return succeed(courseTypeService.queryPage(queryInfo));
-    }
-}

+ 0 - 59
mec-web/src/main/java/com/ym/mec/web/controller/StudentAttendanceController.java

@@ -1,59 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.CourseGroup;
-import com.ym.mec.web.service.CourseGroupService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RequestMapping("studentAttendance")
-@Api(tags = "学生考勤服务")
-@RestController
-public class StudentAttendanceController extends BaseController {
-
-    @Autowired
-    private CourseGroupService courseGroupService;
-
-    @ApiOperation(value = "新增课程组")
-    @PostMapping("/add")
-    public Object add(@RequestBody CourseGroup courseGroup){
-        Date date = new Date();
-        courseGroup.setCreateTime(date);
-        courseGroup.setUpdateTime(date);
-        courseGroupService.insert(courseGroup);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除课程组")
-    @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
-        courseGroupService.delete(id);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改课程组")
-    @PutMapping("/update")
-    public Object update(@RequestBody CourseGroup courseGroup){
-        courseGroup.setUpdateTime(new Date());
-        courseGroupService.update(courseGroup);
-        return succeed();
-    }
-
-    @ApiOperation(value = "根据课程组编号查询课程组")
-    @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
-        return succeed(courseGroupService.findDetailById(id));
-    }
-
-    @ApiOperation(value = "分页查询课程组")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
-        return succeed(courseGroupService.queryPage(queryInfo));
-    }
-}

+ 0 - 18
mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseGroupDao.java

@@ -1,18 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
-import com.ym.mec.web.dal.entity.CourseGroup;
-
-import java.util.List;
-
-public interface CourseGroupDao extends BaseDAO<Integer, CourseGroup> {
-
-
-    /**
-     * 根据课程组编号,查询课程详情
-     * @param courseGroupId
-     * @return
-     */
-    List<CourseGroupUtilEntity> findDetailById(Integer courseGroupId);
-}

+ 0 - 9
mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseGroupDetailDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseGroupDetail;
-
-public interface CourseGroupDetailDao extends BaseDAO<Integer, CourseGroupDetail> {
-
-	
-}

+ 0 - 9
mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseTypeDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseType;
-
-public interface CourseTypeDao extends BaseDAO<Integer, CourseType> {
-
-	
-}

+ 9 - 0
mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.web.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.entity.MusicGroupPaymentCalender;
+
+public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPaymentCalender> {
+
+	
+}

+ 9 - 0
mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupStudentFeeDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.web.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.entity.MusicGroupStudentFee;
+
+public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudentFee> {
+
+	
+}

+ 0 - 94
mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseGroup.java

@@ -1,94 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(course_group):
- */
-public class CourseGroup {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	@ApiModelProperty(value = "机构编号",required = false)
-	private Integer organId;
-	
-	/**  */
-	@ApiModelProperty(value = "课程组名称",required = false)
-	private String name;
-	
-	/**  */
-	@ApiModelProperty(value = "是否删除",required = false)
-	private YesOrNoEnum delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-
-	public CourseGroup() {
-	}
-
-	public CourseGroup(Integer organId, String name) {
-		this.organId = organId;
-		this.name = name;
-	}
-
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-
-	public YesOrNoEnum getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(YesOrNoEnum delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

+ 0 - 121
mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseGroupDetail.java

@@ -1,121 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(course_group_detail):
- */
-public class CourseGroupDetail {
-
-	/**  */
-	private Integer id;
-	
-	/** course_type表的id */
-	@ApiModelProperty(value = "课程类型编号",required = false)
-	private Integer courseTypeId;
-	
-	/** course_fee_type表的id */
-	@ApiModelProperty(value = "课程组编号",required = false)
-	private Integer courseGroupId;
-	
-	/** 课时(单位:分钟) */
-	@ApiModelProperty(value = "课时(单位:分钟)",required = false)
-	private Integer classPeriod;
-	
-	/** 单价 */
-	@ApiModelProperty(value = "单价",required = false)
-	private long unitPrice;
-	
-	/** 折扣单价 */
-	@ApiModelProperty(value = "折扣单价",required = false)
-	private long discountUnitPrice;
-	
-	/**  */
-	private YesOrNoEnum delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setCourseTypeId(Integer courseTypeId){
-		this.courseTypeId = courseTypeId;
-	}
-	
-	public Integer getCourseTypeId(){
-		return this.courseTypeId;
-	}
-			
-	public void setCourseGroupId(Integer courseGroupId){
-		this.courseGroupId = courseGroupId;
-	}
-	
-	public Integer getCourseGroupId(){
-		return this.courseGroupId;
-	}
-			
-	public void setClassPeriod(Integer classPeriod){
-		this.classPeriod = classPeriod;
-	}
-	
-	public Integer getClassPeriod(){
-		return this.classPeriod;
-	}
-			
-	public void setUnitPrice(long unitPrice){
-		this.unitPrice = unitPrice;
-	}
-	
-	public long getUnitPrice(){
-		return this.unitPrice;
-	}
-			
-	public void setDiscountUnitPrice(long discountUnitPrice){
-		this.discountUnitPrice = discountUnitPrice;
-	}
-	
-	public long getDiscountUnitPrice(){
-		return this.discountUnitPrice;
-	}
-
-	public YesOrNoEnum getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(YesOrNoEnum delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

+ 0 - 109
mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseType.java

@@ -1,109 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(course_type):
- */
-public class CourseType {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	@ApiModelProperty(value = "机构编号",required = false)
-	private Integer organId;
-	
-	/**  */
-	@ApiModelProperty(value = "课程类型名称",required = false)
-	private String name;
-	
-	/** 支持的课时时间(多个用|分隔) */
-	@ApiModelProperty(value = "支持的课时时间(多个用|分隔)",required = false)
-	private String supportPeriods;
-	
-	/**  */
-	private YesOrNoEnum delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/**  */
-	@ApiModelProperty(value = "描述",required = false)
-	private String description;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setSupportPeriods(String supportPeriods){
-		this.supportPeriods = supportPeriods;
-	}
-	
-	public String getSupportPeriods(){
-		return this.supportPeriods;
-	}
-
-	public YesOrNoEnum getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(YesOrNoEnum delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

+ 81 - 0
mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroupPaymentCalender.java

@@ -0,0 +1,81 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_payment_calender):
+ */
+public class MusicGroupPaymentCalender {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer musicGroupId;
+	
+	/** 缴费月份 */
+	private Integer paymentMonth;
+	
+	/** 开始缴费日期 */
+	private java.util.Date startPaymentDate;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setPaymentMonth(Integer paymentMonth){
+		this.paymentMonth = paymentMonth;
+	}
+	
+	public Integer getPaymentMonth(){
+		return this.paymentMonth;
+	}
+			
+	public void setStartPaymentDate(java.util.Date startPaymentDate){
+		this.startPaymentDate = startPaymentDate;
+	}
+	
+	public java.util.Date getStartPaymentDate(){
+		return this.startPaymentDate;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

+ 81 - 0
mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroupStudentFee.java

@@ -0,0 +1,81 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_student_fee_):
+ */
+public class MusicGroupStudentFee {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer musicGroupId;
+	
+	/**  */
+	private Integer userId;
+	
+	/** 课程费用 */
+	private long courseFee;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setCourseFee(long courseFee){
+		this.courseFee = courseFee;
+	}
+	
+	public long getCourseFee(){
+		return this.courseFee;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

+ 0 - 53
mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/CourseGroupUtilEntity.java

@@ -1,53 +0,0 @@
-package com.ym.mec.web.dal.utilEntity;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-//课程组响应实体类
-public class CourseGroupUtilEntity {
-
-    @ApiModelProperty(value = "课时(单位:分钟)",required = false)
-    private Integer classPeriod;
-
-    @ApiModelProperty(value = "折扣单价",required = false)
-    private BigDecimal discountUnitPrice;
-
-    @ApiModelProperty(value = "支持的课时时间(多个用|分隔)",required = false)
-    private String supportPeriods;
-
-    @ApiModelProperty(value = "课程类型名称",required = false)
-    private String courseTypeName;
-
-    public Integer getClassPeriod() {
-        return classPeriod;
-    }
-
-    public void setClassPeriod(Integer classPeriod) {
-        this.classPeriod = classPeriod;
-    }
-
-    public BigDecimal getDiscountUnitPrice() {
-        return discountUnitPrice;
-    }
-
-    public void setDiscountUnitPrice(BigDecimal discountUnitPrice) {
-        this.discountUnitPrice = discountUnitPrice;
-    }
-
-    public String getSupportPeriods() {
-        return supportPeriods;
-    }
-
-    public void setSupportPeriods(String supportPeriods) {
-        this.supportPeriods = supportPeriods;
-    }
-
-    public String getCourseTypeName() {
-        return courseTypeName;
-    }
-
-    public void setCourseTypeName(String courseTypeName) {
-        this.courseTypeName = courseTypeName;
-    }
-}

+ 0 - 15
mec-web/src/main/java/com/ym/mec/web/service/CourseGroupDetailService.java

@@ -1,15 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.CourseGroupDetail;
-
-import java.util.List;
-
-public interface CourseGroupDetailService extends BaseService<Integer, CourseGroupDetail> {
-
-    /**
-     * 新增课程组,并批量新增课程详情
-     * @param courseGroupDetails
-     */
-    void batchInsert(List<CourseGroupDetail> courseGroupDetails);
-}

+ 0 - 17
mec-web/src/main/java/com/ym/mec/web/service/CourseGroupService.java

@@ -1,17 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
-import com.ym.mec.web.dal.entity.CourseGroup;
-
-import java.util.List;
-
-public interface CourseGroupService extends BaseService<Integer, CourseGroup> {
-
-    /**
-     * 根据课程组编号,查询课程详情
-     * @param id
-     * @return
-     */
-    List<CourseGroupUtilEntity> findDetailById(Integer id);
-}

+ 0 - 8
mec-web/src/main/java/com/ym/mec/web/service/CourseTypeService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.CourseType;
-
-public interface CourseTypeService extends BaseService<Integer, CourseType> {
-
-}

+ 8 - 0
mec-web/src/main/java/com/ym/mec/web/service/MusicGroupPaymentCalenderService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.web.service;
+
+import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.entity.MusicGroupPaymentCalender;
+
+public interface MusicGroupPaymentCalenderService extends BaseService<Long, MusicGroupPaymentCalender> {
+
+}

+ 8 - 0
mec-web/src/main/java/com/ym/mec/web/service/MusicGroupStudentFeeService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.web.service;
+
+import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.entity.MusicGroupStudentFee;
+
+public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGroupStudentFee> {
+
+}

+ 0 - 34
mec-web/src/main/java/com/ym/mec/web/service/impl/CourseGroupDetailServiceImpl.java

@@ -1,34 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.CourseGroupDetailDao;
-import com.ym.mec.web.dal.entity.CourseGroupDetail;
-import com.ym.mec.web.service.CourseGroupDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class CourseGroupDetailServiceImpl extends BaseServiceImpl<Integer, CourseGroupDetail>  implements CourseGroupDetailService {
-	
-	@Autowired
-	private CourseGroupDetailDao courseGroupDetailDao;
-
-	@Override
-	public BaseDAO<Integer, CourseGroupDetail> getDAO() {
-		return courseGroupDetailDao;
-	}
-
-	@Override
-	public void batchInsert(List<CourseGroupDetail> courseGroupDetails) {
-		Date date = new Date();
-		courseGroupDetails.forEach( e -> {
-			e.setCreateTime(date);
-			e.setUpdateTime(date);
-			courseGroupDetailDao.insert(e);
-		} );
-	}
-}

+ 0 - 30
mec-web/src/main/java/com/ym/mec/web/service/impl/CourseGroupServiceImpl.java

@@ -1,30 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.CourseGroupDao;
-import com.ym.mec.web.dal.entity.CourseGroup;
-import com.ym.mec.web.service.CourseGroupService;
-
-import java.util.List;
-
-@Service
-public class CourseGroupServiceImpl extends BaseServiceImpl<Integer, CourseGroup>  implements CourseGroupService {
-	
-	@Autowired
-	private CourseGroupDao courseGroupDao;
-
-	@Override
-	public BaseDAO<Integer, CourseGroup> getDAO() {
-		return courseGroupDao;
-	}
-
-	@Override
-	public List<CourseGroupUtilEntity> findDetailById(Integer id) {
-		return courseGroupDao.findDetailById(id);
-	}
-}

+ 0 - 23
mec-web/src/main/java/com/ym/mec/web/service/impl/CourseTypeServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.CourseTypeDao;
-import com.ym.mec.web.dal.entity.CourseType;
-import com.ym.mec.web.service.CourseTypeService;
-
-@Service
-public class CourseTypeServiceImpl extends BaseServiceImpl<Integer, CourseType>  implements CourseTypeService {
-	
-	@Autowired
-	private CourseTypeDao courseTypeDao;
-
-	@Override
-	public BaseDAO<Integer, CourseType> getDAO() {
-		return courseTypeDao;
-	}
-	
-}

+ 22 - 0
mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.web.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.web.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.web.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.web.service.MusicGroupPaymentCalenderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long, MusicGroupPaymentCalender> implements MusicGroupPaymentCalenderService {
+	
+	@Autowired
+	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupPaymentCalender> getDAO() {
+		return musicGroupPaymentCalenderDao;
+	}
+	
+}

+ 20 - 0
mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupStudentFeeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ym.mec.web.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.auth.api.entity.MusicGroupStudentFee;
+import com.ym.mec.auth.service.MusicGroupStudentFeeService;
+import com.ym.mec.auth.dal.dao.MusicGroupStudentFeeDao;
+
+@Service
+public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, MusicGroupStudentFee>  implements MusicGroupStudentFeeService {
+	
+	@Autowired
+	private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupStudentFee> getDAO() {
+		return musicGroupStudentFeeDao;
+	}
+	
+}

+ 0 - 96
mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountDetailMapper.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" id="PlatformCashAccountDetail">
-		<result column="id_" property="id" />
-		<result column="platform_cash_account_id_" property="platformCashAccountId" />
-		<result column="trans_no_" property="transNo" />
-		<result column="type_" property="type" />
-		<result column="status_" property="status" />
-		<result column="amount_" property="amount" />
-		<result column="balance_" property="balance" />
-		<result column="description_" property="description" />
-		<result column="comment_" property="comment" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="PlatformCashAccountDetail" >
-		SELECT * FROM platform_cash_account_detail WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="PlatformCashAccountDetail">
-		SELECT * FROM platform_cash_account_detail ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO platform_cash_account_detail (id_,platform_cash_account_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_) VALUES(#{id},#{platformCashAccountId},#{transNo},#{type},#{status},#{amount},#{balance},#{description},#{comment},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail">
-		UPDATE platform_cash_account_detail <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="comment != null">
-comment_ = #{comment},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="amount != null">
-amount_ = #{amount},
-</if>
-<if test="platformCashAccountId != null">
-platform_cash_account_id_ = #{platformCashAccountId},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM platform_cash_account_detail WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="PlatformCashAccountDetail" parameterType="map">
-		SELECT * FROM platform_cash_account_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM platform_cash_account_detail
-	</select>
-</mapper>

+ 0 - 84
mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountMapper.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccount" id="PlatformCashAccount">
-		<result column="id_" property="id" />
-		<result column="currency_" property="currency" />
-		<result column="balance_" property="balance" />
-		<result column="frozen_amount_" property="frozenAmount" />
-		<result column="margin_balance_" property="marginBalance" />
-		<result column="status_" property="status" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="PlatformCashAccount" >
-		SELECT * FROM platform_cash_account WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="PlatformCashAccount">
-		SELECT * FROM platform_cash_account ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO platform_cash_account (id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time) VALUES(#{id},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount">
-		UPDATE platform_cash_account <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="updateTime != null">
-update_time = #{updateTime},
-</if>
-<if test="frozenAmount != null">
-frozen_amount_ = #{frozenAmount},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="marginBalance != null">
-margin_balance_ = #{marginBalance},
-</if>
-<if test="currency != null">
-currency_ = #{currency},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM platform_cash_account WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="PlatformCashAccount" parameterType="map">
-		SELECT * FROM platform_cash_account ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM platform_cash_account
-	</select>
-</mapper>

+ 0 - 88
mec-web/src/main/java/com/ym/mec/web/service/impl/StudentApplyRefundsMapper.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.StudentApplyRefundsDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentApplyRefunds" id="StudentApplyRefunds">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="order_no_" property="orderNo" />
-		<result column="status_" property="status" />
-		<result column="expect_amount_" property="expectAmount" />
-		<result column="actual_amount_" property="actualAmount" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="orig_payment_order_id_" property="origPaymentOrderId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentApplyRefunds" >
-		SELECT * FROM student_apply_refunds WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentApplyRefunds">
-		SELECT * FROM student_apply_refunds ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_apply_refunds (id_,user_id_,order_no_,status_,expect_amount_,actual_amount_,create_time_,update_time_,orig_payment_order_id_) VALUES(#{id},#{userId},#{orderNo},#{status},#{expectAmount},#{actualAmount},#{createTime},#{updateTime},#{origPaymentOrderId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds">
-		UPDATE student_apply_refunds <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="expectAmount != null">
-expect_amount_ = #{expectAmount},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="origPaymentOrderId != null">
-orig_payment_order_id_ = #{origPaymentOrderId},
-</if>
-<if test="actualAmount != null">
-actual_amount_ = #{actualAmount},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_apply_refunds WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentApplyRefunds" parameterType="map">
-		SELECT * FROM student_apply_refunds ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_apply_refunds
-	</select>
-</mapper>

+ 0 - 80
mec-web/src/main/java/com/ym/mec/web/service/impl/StudentPaymentOrderDetailMapper.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.StudentPaymentOrderDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" id="StudentPaymentOrderDetail">
-		<result column="id_" property="id" />
-		<result column="type_" property="type" />
-		<result column="goods_id_list_" property="goodsIdList" />
-		<result column="price_" property="price" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="payment_order_id_" property="paymentOrderId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentPaymentOrderDetail" >
-		SELECT * FROM student_payment_order_detail WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentPaymentOrderDetail">
-		SELECT * FROM student_payment_order_detail ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_payment_order_detail (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_) VALUES(#{id},#{type},#{goodsIdList},#{price},#{createTime},#{updateTime},#{paymentOrderId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail">
-		UPDATE student_payment_order_detail <set>
-<if test="price != null">
-price_ = #{price},
-</if>
-<if test="goodsIdList != null">
-goods_id_list_ = #{goodsIdList},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="paymentOrderId != null">
-payment_order_id_ = #{paymentOrderId},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_payment_order_detail WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentPaymentOrderDetail" parameterType="map">
-		SELECT * FROM student_payment_order_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_payment_order_detail
-	</select>
-</mapper>

+ 0 - 116
mec-web/src/main/java/com/ym/mec/web/service/impl/StudentPaymentOrderMapper.xml

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.StudentPaymentOrderDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrder" id="StudentPaymentOrder">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="type_" property="type" />
-		<result column="expect_amount_" property="expectAmount" />
-		<result column="actual_amount_" property="actualAmount" />
-		<result column="trans_no_" property="transNo" />
-		<result column="status_" property="status" />
-		<result column="memo_" property="memo" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="payment_channel_" property="paymentChannel" />
-		<result column="payment_business_channel_" property="paymentBusinessChannel" />
-		<result column="payment_account_no_" property="paymentAccountNo" />
-		<result column="order_no_" property="orderNo" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="class_group_id_" property="classGroupId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentPaymentOrder" >
-		SELECT * FROM student_payment_order WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentPaymentOrder">
-		SELECT * FROM student_payment_order ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_payment_order (id_,user_id_,type_,expect_amount_,actual_amount_,trans_no_,status_,memo_,create_time_,update_time_,payment_channel_,payment_business_channel_,payment_account_no_,order_no_,music_group_id_,class_group_id_) VALUES(#{id},#{userId},#{type},#{expectAmount},#{actualAmount},#{transNo},#{status},#{memo},#{createTime},#{updateTime},#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{orderNo},#{musicGroupId},#{classGroupId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder">
-		UPDATE student_payment_order <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="classGroupId != null">
-class_group_id_ = #{classGroupId},
-</if>
-<if test="expectAmount != null">
-expect_amount_ = #{expectAmount},
-</if>
-<if test="memo != null">
-memo_ = #{memo},
-</if>
-<if test="paymentChannel != null">
-payment_channel_ = #{paymentChannel},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="paymentAccountNo != null">
-payment_account_no_ = #{paymentAccountNo},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="paymentBusinessChannel != null">
-payment_business_channel_ = #{paymentBusinessChannel},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="actualAmount != null">
-actual_amount_ = #{actualAmount},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_payment_order WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentPaymentOrder" parameterType="map">
-		SELECT * FROM student_payment_order ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_payment_order
-	</select>
-</mapper>

+ 0 - 96
mec-web/src/main/java/com/ym/mec/web/service/impl/SysUserCashAccountDetailMapper.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.SysUserCashAccountDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" id="SysUserCashAccountDetail">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="trans_no_" property="transNo" />
-		<result column="type_" property="type" />
-		<result column="status_" property="status" />
-		<result column="amount_" property="amount" />
-		<result column="balance_" property="balance" />
-		<result column="description_" property="description" />
-		<result column="comment_" property="comment" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserCashAccountDetail" >
-		SELECT * FROM sys_user_cash_account_detail WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user_cash_account_detail (id_,user_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_) VALUES(#{id},#{userId},#{transNo},#{type},#{status},#{amount},#{balance},#{description},#{comment},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail">
-		UPDATE sys_user_cash_account_detail <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="comment != null">
-comment_ = #{comment},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="amount != null">
-amount_ = #{amount},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM sys_user_cash_account_detail WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
-		SELECT * FROM sys_user_cash_account_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account_detail
-	</select>
-</mapper>

+ 0 - 84
mec-web/src/main/java/com/ym/mec/web/service/impl/SysUserCashAccountMapper.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.SysUserCashAccountDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccount" id="SysUserCashAccount">
-		<result column="user_id_" property="userId" />
-		<result column="currency_" property="currency" />
-		<result column="balance_" property="balance" />
-		<result column="frozen_amount_" property="frozenAmount" />
-		<result column="margin_balance_" property="marginBalance" />
-		<result column="status_" property="status" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserCashAccount" >
-		SELECT * FROM sys_user_cash_account WHERE user_id_ = #{userId} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserCashAccount">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user_cash_account (user_id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time) VALUES(#{userId},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount">
-		UPDATE sys_user_cash_account <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="updateTime != null">
-update_time = #{updateTime},
-</if>
-<if test="frozenAmount != null">
-frozen_amount_ = #{frozenAmount},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="marginBalance != null">
-margin_balance_ = #{marginBalance},
-</if>
-<if test="currency != null">
-currency_ = #{currency},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE user_id_ = #{userId} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM sys_user_cash_account WHERE user_id_ = #{userId} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account
-	</select>
-</mapper>

+ 0 - 88
mec-web/src/main/resources/config/mybatis/CourseGroupDetailMapper.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.CourseGroupDetailDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.CourseGroupDetail" id="CourseGroupDetail">
-        <result column="id_" property="id"/>
-        <result column="course_type_id_" property="courseTypeId"/>
-        <result column="course_group_id_" property="courseGroupId"/>
-        <result column="class_period_" property="classPeriod"/>
-        <result column="unit_price_" property="unitPrice"/>
-        <result column="discount_unit_price_" property="discountUnitPrice"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="CourseGroupDetail">
-		SELECT * FROM course_group_detail WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="CourseGroupDetail">
-		SELECT * FROM course_group_detail ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO course_group_detail
-        (id_,course_type_id_,course_group_id_,class_period_,unit_price_,discount_unit_price_,del_flag_,create_time_,update_time_)
-        VALUES(#{id},#{courseTypeId},#{courseGroupId},#{classPeriod},#{unitPrice},#{discountUnitPrice},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail">
-        UPDATE course_group_detail
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="courseTypeId != null">
-                course_type_id_ = #{courseTypeId},
-            </if>
-            <if test="unitPrice != null">
-                unit_price_ = #{unitPrice},
-            </if>
-            <if test="discountUnitPrice != null">
-                discount_unit_price_ = #{discountUnitPrice},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="courseGroupId != null">
-                course_group_id_ = #{courseGroupId},
-            </if>
-            <if test="classPeriod != null">
-                class_period_ = #{classPeriod},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM course_group_detail WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="CourseGroupDetail" parameterType="map">
-        SELECT * FROM course_group_detail ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_group_detail
-	</select>
-</mapper>

+ 0 - 89
mec-web/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.CourseGroupDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.CourseGroup" id="CourseGroup">
-        <result column="id_" property="id"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="name_" property="name"/>
-        <result column="del_flag" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="CourseGroup">
-		SELECT * FROM course_group WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="CourseGroup">
-		SELECT * FROM course_group ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroup" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO course_group (id_,organ_id_,name_,del_flag,create_time_,update_time_)
-        VALUES(#{id},#{organId},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroup">
-        UPDATE course_group
-        <set>
-            <if test="delFlag != null">
-                del_flag = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM course_group WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="CourseGroup" parameterType="map">
-        SELECT * FROM course_group ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_group
-	</select>
-
-    <resultMap type="com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity" id="courseGroupUtilEntity">
-        <result column="class_period_" property="classPeriod"/>
-        <result column="course_type_name_" property="courseTypeName"/>
-        <result column="discount_unit_price_" property="discountUnitPrice"/>
-        <result column="support_periods_" property="supportPeriods"/>
-    </resultMap>
-    <select id="findDetailById" resultMap="courseGroupUtilEntity">
-        SELECT cgd.class_period_,cgd.unit_price_,cgd.discount_unit_price_,ct.name_ course_type_name_,ct.description_
-        FROM course_group cg
-        LEFT JOIN course_group_detail cgd ON cg.id_ = cgd.course_group_id_
-        LEFT JOIN course_type ct ON cgd.course_type_id_ = ct.id_
-        WHERE cg.id_ = #{courseGroupId}
-    </select>
-</mapper>

+ 0 - 83
mec-web/src/main/resources/config/mybatis/CourseTypeMapper.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.CourseTypeDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.CourseType" id="CourseType">
-        <result column="id_" property="id"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="name_" property="name"/>
-        <result column="support_periods_" property="supportPeriods"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="description_" property="description"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="CourseType">
-		SELECT * FROM course_type WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="CourseType">
-		SELECT * FROM course_type ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseType" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO course_type (id_,organ_id_,name_,support_periods_,del_flag_,create_time_,update_time_,description_)
-        VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime},#{description})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseType">
-        UPDATE course_type
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="supportPeriods != null">
-                support_periods_ = #{supportPeriods},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM course_type WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="CourseType" parameterType="map">
-        SELECT * FROM course_type ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_type
-	</select>
-</mapper>

+ 76 - 0
mec-web/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.web.dal.dao.MusicGroupPaymentCalenderDao">
+
+    <resultMap type="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender" id="MusicGroupPaymentCalender">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="payment_month_" property="paymentMonth"/>
+        <result column="start_payment_date_" property="startPaymentDate"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="MusicGroupPaymentCalender">
+		SELECT * FROM music_group_payment_calender WHERE id_ = #{id} 
+	</select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="MusicGroupPaymentCalender">
+		SELECT * FROM music_group_payment_calender ORDER BY id_
+	</select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO music_group_payment_calender
+        (id_,music_group_id_,payment_month_,start_payment_date_,create_time_,update_time_)
+        VALUES(#{id},#{musicGroupId},#{paymentMonth},#{startPaymentDate},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender">
+        UPDATE music_group_payment_calender
+        <set>
+            <if test="startPaymentDate != null">
+                start_payment_date_ = #{startPaymentDate},
+            </if>
+            <if test="paymentMonth != null">
+                payment_month_ = #{paymentMonth},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+		DELETE FROM music_group_payment_calender WHERE id_ = #{id} 
+	</delete>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="MusicGroupPaymentCalender" parameterType="map">
+        SELECT * FROM music_group_payment_calender ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_payment_calender
+	</select>
+</mapper>

+ 76 - 0
mec-web/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.auth.dal.dao.MusicGroupStudentFeeDao">
+	
+	<resultMap type="com.ym.mec.auth.api.entity.MusicGroupStudentFee" id="MusicGroupStudentFee">
+		<result column="id_" property="id" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="user_id_" property="userId" />
+		<result column="course_fee_" property="courseFee" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupStudentFee" >
+		SELECT * FROM music_group_student_fee_ WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupStudentFee">
+		SELECT * FROM music_group_student_fee_ ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.MusicGroupStudentFee" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_) VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.auth.api.entity.MusicGroupStudentFee">
+		UPDATE music_group_student_fee_ <set>
+<if test="userId != null">
+user_id_ = #{userId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="courseFee != null">
+course_fee_ = #{courseFee},
+</if>
+<if test="musicGroupId != null">
+music_group_id_ = #{musicGroupId},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_group_student_fee_ WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupStudentFee" parameterType="map">
+		SELECT * FROM music_group_student_fee_ ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_student_fee_
+	</select>
+</mapper>