|
@@ -74,7 +74,15 @@ public class ActivityController extends BaseController {
|
|
|
return failed("用户信息有误,没有分部信息");
|
|
|
}
|
|
|
Map<String,Object> resultMap = new HashMap<>(1);
|
|
|
- resultMap.put("activityDetailList",marketActivityService.queryActivity(2,sysUser.getOrganId()));
|
|
|
+ List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(2, sysUser.getOrganId());
|
|
|
+ resultMap.put("activityDetailList",activityDetailDtos);
|
|
|
+ resultMap.put("startTime",null);
|
|
|
+ resultMap.put("endTime",null);
|
|
|
+ if(activityDetailDtos != null && activityDetailDtos.size() > 0){
|
|
|
+ ActivityDetailDto activityDetailDto = activityDetailDtos.get(0);
|
|
|
+ resultMap.put("startTime",activityDetailDto.getStartTime());
|
|
|
+ resultMap.put("endTime",activityDetailDto.getEndTime());
|
|
|
+ }
|
|
|
// resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(2));
|
|
|
// LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),2);
|
|
|
// if(luckDrawCount != null){
|