2022双十一

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

@@ -69,11 +69,11 @@ public class ActivityController extends BaseController {
     }
 
     @ApiOperation(value = "分部双11活动信息")
-    @RequestMapping("/doubleEleven2021")
-    public HttpResponseResult doubleEleven2021(){
+    @RequestMapping("/doubleEleven2022")
+    public HttpResponseResult doubleEleven2022(){
         SysUser sysUser = sysUserService.getUser();
-        Map<String,Object> resultMap = new HashMap<>(1);
-        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(2, sysUser.getOrganId());
+        Map<String,Object> resultMap = new HashMap<>(5);
+        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(3, sysUser.getOrganId());
         resultMap.put("activityDetailList",activityDetailDtos);
         resultMap.put("startTime",null);
         resultMap.put("endTime",null);
@@ -106,10 +106,10 @@ public class ActivityController extends BaseController {
     }
 
     @ApiOperation(value = "学员已购买的双十一活动信息")
-    @GetMapping("/queryStudentDoubleEleven2021Order")
-    public Object queryStudentDoubleEleven2021Order() {
+    @GetMapping("/queryStudentDoubleEleven2022Order")
+    public Object queryStudentDoubleEleven2022Order() {
         SysUser user = sysUserService.getUser();
-        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(2, user.getOrganId());
+        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(3, user.getOrganId());
         String activitys = studentPaymentOrderDao.queryStudentDoubleEleven2021Order(user.getId());
         List<Integer> activityList = new ArrayList<>();
         if(StringUtils.isNotEmpty(activitys)){