Merge remote-tracking branch 'origin/master'

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/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

@@ -36,13 +36,12 @@ public class SysTenantAccountController extends BaseController {
     @ApiOperation(value = "获取账户信息")
     @GetMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
-    public Object get() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
+    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 = "获取账户明细")