From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/sms/SmsTaskService.java | 2 ++
src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java | 3 +++
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | 16 +++++++++++++++-
src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java | 9 +++++++++
4 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java b/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
index f25909a..8872777 100644
--- a/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class SmsTaskVO extends AbstractTransDTO {
@@ -45,4 +46,6 @@
@ApiModelProperty("手机号")
private String phones;
+ private List<SmsSelectVO> smsUserDTOS;
+
}
diff --git a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
index 69cb41c..130df05 100644
--- a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
@@ -35,6 +35,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.io.File;
@@ -358,7 +359,7 @@
});
}
- @Override
+ @Override
public List<SmsSelectVO> getSelectList(Long id) {
List<SmsSelectVO> smsSelectVOList = null;
SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
@@ -372,6 +373,19 @@
}
}
+ @Override
+ public SmsTaskVO getDetailById(Long id) {
+ SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
+ SmsTaskVO smsTaskVO=new SmsTaskVO();
+ BeanUtils.copyProperties(smsTaskDO,smsTaskVO);
+ if(!ObjectUtils.isEmpty(smsTaskDO)){
+ List<SmsSelectVO> selectList = getSelectList(id);
+ smsTaskVO.setSmsUserDTOS(selectList);
+ return smsTaskVO;
+ }
+ return null;
+ }
+
private List<SmsTaskDetailDO> createSmsTaskDetails(SmsTaskDO smsTaskDO, List<String> phoneNumbers) {
return phoneNumbers.stream().map(phone -> {
SmsTaskDetailDO detail = new SmsTaskDetailDO();
diff --git a/src/main/java/com/mzl/flower/service/sms/SmsTaskService.java b/src/main/java/com/mzl/flower/service/sms/SmsTaskService.java
index 74cfaa7..2b455c3 100644
--- a/src/main/java/com/mzl/flower/service/sms/SmsTaskService.java
+++ b/src/main/java/com/mzl/flower/service/sms/SmsTaskService.java
@@ -31,4 +31,6 @@
void publishSmsTask(SmsTaskDTO smsTaskDTO);
List<SmsSelectVO> getSelectList(Long id);
+
+ SmsTaskVO getDetailById(Long id);
}
diff --git a/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java b/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
index 68f1d74..7ae694c 100644
--- a/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
+++ b/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
@@ -6,9 +6,12 @@
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
+import com.mzl.flower.dto.response.coupon.CouponTemplateUserVO;
+import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
import com.mzl.flower.service.sms.SmsTaskService;
+import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -71,5 +74,11 @@
}
+ @GetMapping("/{id}")
+ @ApiOperation(value = "详情", notes = "详情")
+ public ResponseEntity<ReturnDataDTO> get(@PathVariable Long id) {
+ SmsTaskVO smsTaskVO = smsTaskService.getDetailById(id);
+ return returnData(R.SUCCESS.getCode(), smsTaskVO);
+ }
}
--
Gitblit v1.9.3