提交 08acbebc authored 作者: 000516's avatar 000516 提交者: Coding

根据计划ID查询多个促销任务,每个促销任务查询促销任务推广照片

Merge Request: 根据计划ID查询多个促销任务,每个促销任务查询促销任务推广照片 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/248?initial=true
package com.wangxiaolu.promotion.controller.activityplanv2;
import cn.hutool.core.collection.CollectionUtil;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
import com.wangxiaolu.promotion.pojo.PageInfo;
import com.wangxiaolu.promotion.pojo.activity.planv2.response.ActivityResponse;
......@@ -8,6 +9,7 @@ import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityRep
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
import com.wangxiaolu.promotion.result.basedata.R;
import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService;
import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityQueryService;
import com.wangxiaolu.promotion.service.activityplanv2.PromPlanQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -30,6 +32,8 @@ public class PromPlanQueryController {
private PromPlanQueryService promPlanQueryService;
@Autowired
private TemporaryActivityClockQueryService temporaryActivityClockQueryService;
@Autowired
private TemporaryActivityQueryService temporaryActivityQueryService;
@PostMapping("/page")
public R queryPage(@RequestBody PageInfo pageInfo){
......@@ -43,8 +47,7 @@ public class PromPlanQueryController {
@GetMapping("/{id}")
public R queryPlanById(@PathParam("id") @PathVariable Long id){
ActivityResponse activityResponse = promPlanQueryService.queryPlanById(id);
List<TemporaryActivityReportedDto> reportedDtos = activityResponse.getReportedDtos();
List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityQueryService.findListByPlan(id);
if (CollectionUtil.isEmpty(reportedDtos)){
return R.success(activityResponse);
}
......
......@@ -29,4 +29,6 @@ public interface TemporaryActivityQueryService {
JSONArray findActivityMarketCell(Integer temporaryId);
List<TemporaryActivityMarketCellDto> findActivityMarketCellByDb(Long activityId);
List<TemporaryActivityReportedDto> findListByPlan(Long planId);
}
......@@ -87,6 +87,16 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
return dtos;
}
@Override
public List<TemporaryActivityReportedDto> findListByPlan(Long planId) {
TemporaryActivityWrapper taw = new TemporaryActivityWrapper().setPlanId(planId);
List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityReportedDao.findList(taw);
for (TemporaryActivityReportedDto reportedDto : reportedDtos) {
findActivityReportedPhotoInfo(reportedDto);
}
return reportedDtos;
}
private void findActivityReportedPhoto(TemporaryActivityReportedDto dto) {
if (Objects.isNull(dto)) {
return;
......
package com.wangxiaolu.promotion.service.activityplanv2.impl;
import com.alibaba.fastjson.JSONObject;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityReportedDao;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper;
import com.wangxiaolu.promotion.domain.activityplanv2.dao.ActivityPlanInfoDao;
import com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanInfoWrapper;
import com.wangxiaolu.promotion.enums.plan.PlanStatus;
import com.wangxiaolu.promotion.pojo.PageInfo;
import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto;
import com.wangxiaolu.promotion.pojo.activity.planv2.response.ActivityResponse;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.vo.TemporaryActivityPlanVo;
import com.wangxiaolu.promotion.service.activityplanv2.PromPlanQueryService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -18,7 +14,6 @@ import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -32,10 +27,6 @@ public class PromPlanQueryServiceImpl implements PromPlanQueryService {
@Autowired
private ActivityPlanInfoDao activityPlanInfoDao;
@Autowired
private TemporaryActivityReportedDao temporaryActivityReportedDao;
@Autowired
private TemporaryActivityClockDao temporaryActivityClockDao;
@Override
public void queryPage(PageInfo pageInfo) {
......@@ -63,10 +54,6 @@ public class PromPlanQueryServiceImpl implements PromPlanQueryService {
@Override
public ActivityResponse queryPlanById(Long id) {
ActivityPlanInfoDto planInfoDto = activityPlanInfoDao.selectById(id);
TemporaryActivityWrapper taw = new TemporaryActivityWrapper().setPlanId(id);
List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityReportedDao.findList(taw);
ActivityResponse response = new ActivityResponse().setPlanInfo(planInfoDto).setReportedDtos(reportedDtos);
return response;
return new ActivityResponse().setPlanInfo(planInfoDto);
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论