feat：12月活动

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

@@ -4,12 +4,15 @@ package com.ym.mec.student.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
+import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.dto.SporadicPayDto;
 import com.ym.mec.biz.dal.entity.DegreeRegistration;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
@@ -29,10 +32,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @RequestMapping("degree")
 @Api(tags = "考级报名服务")
@@ -57,6 +57,12 @@ public class DegreeController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
+    @Autowired
+    private StudentDao studentDao;
+
+    @Autowired
+    private OrganizationDao organizationDao;
+
     @ApiOperation(value = "考级报名支付")
     @PostMapping("/pay")
     public HttpResponseResult pay(DegreeRegistrationActivityDto degreeRegistration) throws Exception {
@@ -111,4 +117,29 @@ public class DegreeController extends BaseController {
         return succeed(sporadicChargeInfoService.queryDetailPage(queryInfo));
     }
 
+    @ApiOperation(value = "获取活动参数")
+    @GetMapping("/getParams")
+    public HttpResponseResult getParams(){
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(user)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+
+        SporadicChargeInfoQueryInfo queryInfo = new SporadicChargeInfoQueryInfo();
+        queryInfo.setOrganId("42");
+        queryInfo.setChargeType(SporadicChargeTypeEnum.LEVEL);
+        queryInfo.setRows(99);
+        queryInfo.setOpenFlag(0);
+        queryInfo.setSort("amount_");
+        queryInfo.setOrder("ASC");
+
+        Map<String, Object> result = new HashMap<>();
+
+        Student student = studentDao.get(user.getId());
+        result.put("userInfo", user);
+        result.put("isNewUser", student.getIsNewUser());
+        result.put("organs", organizationDao.findAllOrgans());
+        result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));
+        return succeed(result);
+    }
 }