活动邀请详情修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/activity/ActivityController.java

@@ -18,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @description: 当前时间只能有一个活动有效，活动requireNum为0时，不限制发放积分人数，人人可以获得积分
  * @author: zj
@@ -72,4 +74,11 @@ public class ActivityController extends BaseController {
         return activityService.inviteDetail(activityQO);
     }
 
+    @ApiOperation(value = "小程序活动详情页-当前正在进行的活动")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("currentActivity")
+    public ResultBody<ActivityDTO> currentActivity(@RequestParam Integer activityType, HttpServletRequest request) {
+        return activityService.currentActivity(activityType, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/ActivityService.java

 package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.activity.ActivityDTO;
 import com.mmc.iuav.user.model.qo.ActivityQO;
 import com.mmc.iuav.user.model.vo.activity.ActivityVO;
 
@@ -28,4 +29,6 @@ public interface ActivityService {
     ResultBody delete(Integer id);
 
     ResultBody inviteDetail(ActivityQO activityQO);
+
+    ResultBody<ActivityDTO> currentActivity(Integer activityType, Integer userAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/ActivityServiceImpl.java

@@ -138,6 +138,29 @@ public class ActivityServiceImpl implements ActivityService {
         Integer pageNo = activityQO.getPageNo();
         activityQO.buildCurrentPage();
         List<ActivityPartDO> activityPartDOS = activityDao.activityPartDetail(activityQO);
+        List<ActivityPartDTO> activityPartDTOS = this.buildActivityPartDTOS(activityPartDOS);
+        return ResultBody.success(PageResult.buildPage(pageNo, activityQO.getPageSize(), count, activityPartDTOS));
+    }
+
+    @Override
+    public ResultBody<ActivityDTO> currentActivity(Integer activityType, Integer userAccountId) {
+        ActivityDO activityDO = activityDao.currentActivity(activityType);
+        if (activityDO == null) {
+            return ResultBody.success();
+        }
+        ActivityDTO activityDTO = activityDO.buildActivityDTO();
+        ActivityQO activityQO = new ActivityQO();
+        activityQO.setActivityId(activityDO.getId());
+        activityQO.setUserAccountId(userAccountId);
+        activityQO.setPageNo(0);
+        activityQO.setPageSize(999999);
+        List<ActivityPartDO> activityPartDOS = activityDao.activityPartDetail(activityQO);
+        List<ActivityPartDTO> activityPartDTOList = this.buildActivityPartDTOS(activityPartDOS);
+        activityDTO.setActivityPartDTOS(activityPartDTOList);
+        return ResultBody.success(activityDTO);
+    }
+
+    public List<ActivityPartDTO> buildActivityPartDTOS(List<ActivityPartDO> activityPartDOS) {
         List<ActivityPartDTO> activityPartDTOS = activityPartDOS.stream().map(ActivityPartDO::buildActivityPartDTO).collect(Collectors.toList());
         // 邀请人id
         List<Integer> userIds = activityPartDTOS.stream().map(ActivityPartDTO::getUserAccountId).collect(Collectors.toList());
@@ -157,6 +180,6 @@ public class ActivityServiceImpl implements ActivityService {
                 activityPartDTO.setPAccountSimpleDTO(pUserMap.get(activityPartDTO.getPUserAccountId()));
             }
         }
-        return ResultBody.success(PageResult.buildPage(pageNo, activityQO.getPageSize(), count, activityPartDTOS));
+        return activityPartDTOS;
     }
 }

csm-service/cms-service-user/src/main/resources/mapper/activity.xml

@@ -120,10 +120,8 @@
             and ac.id != #{id}
         </if>
         <if test="startTime != null">
-            and ( #{startTime} >= ac.start_time and ac.end_time >= #{startTime} )
-        </if>
-        <if test="endTime != null">
-            and ( #{endTime} >= ac.start_time and ac.end_time >= #{endTime} )
+            and ( ( #{startTime} >= ac.start_time and ac.end_time >= #{startTime} ) or ( #{endTime} >= ac.start_time and
+            ac.end_time >= #{endTime} ) )
         </if>
     </select>