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

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

@@ -254,6 +254,18 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> findGroupNotStartCourses(@Param("groupId") String groupId,
                                                   @Param("groupType") GroupType groupType);
 
+
+    /**
+     * @describe 获取团体下未结束的课程
+     * @author Joburgess
+     * @date 2020/3/4
+     * @param groupId:
+     * @param groupType:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+     */
+    List<CourseSchedule> findGroupNotFinishCourses(@Param("groupId") String groupId,
+                                                  @Param("groupType") GroupType groupType);
+
     /**
      * @describe 更新课程组下课程的名字
      * @author Joburgess

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

@@ -358,7 +358,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         result.put("introduction", teacher.getIntroduction());
         result.put("lectureNum", courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
         result.put("subjectNames", StringUtils.join(subjectNames,","));
-        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(groupId.toString(), GroupType.COMM);
+        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotFinishCourses(groupId.toString(), GroupType.COMM);
         result.put("courseSchedules",groupNotStartCourses);
         Map<TeachModeEnum, Long> collect = groupNotStartCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode, Collectors.counting()));
         result.put("totalClassesTimes", groupNotStartCourses.size());
@@ -599,7 +599,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         }
 
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
-        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(order.getMusicGroupId(), GroupType.COMM);
+        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotFinishCourses(order.getMusicGroupId(), GroupType.COMM);
         if(CollectionUtils.isEmpty(groupNotStartCourses)){
             throw new BizException("课程已关闭，请联系老师了解详细情况。");
         }

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

@@ -118,6 +118,7 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 		detail.setTransType(type);
 		detail.setUpdateTime(date);
 		detail.setUserId(teacherId);
+		detail.setTransCashAmount(BigDecimal.ZERO);
 		detail.setOperatorId(operatorId);
 
 		sysTenantAccountDetailDao.insert(detail);

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

@@ -2761,6 +2761,30 @@
             schoole_id_
         FROM course_schedule WHERE group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND music_group_id_ = #{groupId} AND CONCAT(class_date_, ' ', start_class_time_)>NOW()
     </select>
+
+    <select id="findGroupNotFinishCourses" resultMap="CourseSchedule">
+        SELECT
+            id_,
+            group_type_,
+            music_group_id_,
+            class_group_id_,
+            status_,
+            subsidy_,
+            class_date_,
+            CONCAT(class_date_, ' ', start_class_time_) start_class_time_,
+            CONCAT(class_date_, ' ', end_class_time_)   end_class_time_,
+            teacher_id_,
+            actual_teacher_id_,
+            create_time_,
+            update_time_,
+            teach_mode_,
+            type_,
+            name_,
+            student_num_,
+            leave_student_num_,
+            schoole_id_
+        FROM course_schedule WHERE group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND music_group_id_ = #{groupId} AND CONCAT(class_date_, ' ', end_class_time_)&gt;NOW()
+    </select>
     <select id="getSubjectNameById" resultType="java.lang.String">
         SELECT GROUP_CONCAT(DISTINCT s.name_) FROM course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_

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

@@ -59,8 +59,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_tenant_account_detail
-		(id_,user_id_,order_no_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{orderNo},#{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
+		(id_,user_id_,order_no_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,operator_id_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{orderNo},#{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{operatorId},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -35,32 +35,33 @@ public class SysTenantAccountController extends BaseController {
 
     @ApiOperation(value = "获取账户信息")
     @GetMapping("/get")
-    @PreAuthorize("@pcs.hasPermissions('userCashAccount/get')")
-    public Object get() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
+    @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
+    public Object get(Integer teacherId) {
+        if (teacherId == null || teacherId <=0) {
+            return failed(HttpStatus.FORBIDDEN, "用户id必须大于0");
         }
 
-        return succeed(sysTenantAccountService.get(sysUser.getId()));
+        return succeed(sysTenantAccountService.get(teacherId));
     }
 
     @ApiOperation(value = "获取账户明细")
     @GetMapping("/queryTenantAccountDetail")
-    @PreAuthorize("@pcs.hasPermissions('userCashAccount/queryTenantAccountDetail')")
+    @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/queryTenantAccountDetail')")
     public Object queryTenantAccountDetail(TenantAccountDetailQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        queryInfo.setUserId(sysUser.getId());
+        if (queryInfo.getUserId() == null || queryInfo.getUserId() <= 0) {
+            return failed("用户id不能为空");
+        }
 
         return succeed(sysTenantAccountDetailService.getPageList(queryInfo));
     }
 
     @ApiOperation(value = "增加分钟数")
     @PostMapping("/addMinutes")
-    @PreAuthorize("@pcs.hasPermissions('userCashAccount/addMinutes')")
+    @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/addMinutes')")
     public Object addMinutes(Integer teacherId, Integer minutes, String memo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -81,7 +82,7 @@ public class SysTenantAccountController extends BaseController {
 
     @ApiOperation(value = "减分钟数")
     @PostMapping("/subtractMinutes")
-    @PreAuthorize("@pcs.hasPermissions('userCashAccount/subtractMinutes')")
+    @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/subtractMinutes')")
     public Object subtractMinutes(Integer teacherId, Integer minutes, String memo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -97,7 +98,7 @@ public class SysTenantAccountController extends BaseController {
         if (!updateRes) {
             return failed("充值失败，请重试");
         }
-        return succeed("充值成功");
+        return succeed("扣除成功");
     }
 
 }