老师考勤

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -5,10 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
-import com.ym.mec.biz.service.CloudTeacherOrderService;
-import com.ym.mec.biz.service.MemberFeeSettingService;
-import com.ym.mec.biz.service.MemberRankPrivilegesService;
-import com.ym.mec.biz.service.MemberRankSettingService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -37,16 +34,12 @@ public class MemberRankController extends BaseController {
     private CloudTeacherOrderService cloudTeacherOrderService;
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @ApiOperation(value = "获取所有的收费标准")
     @GetMapping("/queryList")
     public Object getMemberDefaultFee() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
+        SysUser sysUser = sysUserService.getUser();
         List<MemberRankSetting> result = memberRankSettingService.queryListByIsDefault(false);
 
         for (MemberRankSetting mrs : result) {
@@ -126,22 +119,14 @@ public class MemberRankController extends BaseController {
     @ApiOperation(value = "查询订单列表")
     @GetMapping("/queryOrderPage")
     public Object queryOrderPage(CloudTeacherOrderQueryInfo queryInfo) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setStudentId(user.getId());
+        queryInfo.setStudentId(sysUserService.getUserId());
         return succeed(cloudTeacherOrderService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "获取学员购买的云教练活动订单")
     @GetMapping("/queryActiveOrderPage")
     public Object queryActiveOrderPage() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return succeed(cloudTeacherOrderService.queryActiveOrderPage(user.getId(), 202203, null));
+        return succeed(cloudTeacherOrderService.queryActiveOrderPage(sysUserService.getUserId(), 202203, null));
     }
 
 }