diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendEmailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendEmailVO.java index 51466b1..d952811 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendEmailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendEmailVO.java @@ -20,7 +20,7 @@ import java.util.List; public class BizSendEmailVO { - @ApiModelProperty(value = "发送人标识") + @ApiModelProperty(value = "发送人标识(用户id)") @NotEmpty(message = "发送人标识不能为空") private String sendUid; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSmsEmailServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSmsEmailServiceImpl.java index e4aea76..e7aad03 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSmsEmailServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSmsEmailServiceImpl.java @@ -1,9 +1,12 @@ package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.impl; +import java.time.LocalDateTime; +import org.springframework.web.multipart.MultipartFile; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.client.NotificationFeignClient; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.BizSendEmailVO; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.BizSendMsgVO; +import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopMailPendingPO; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopSmsPendingPO; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.enums.ExceptionEnum; import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizSmsEmailService; @@ -28,7 +31,6 @@ public class BizSmsEmailServiceImpl implements BizSmsEmailService { @Override public Boolean sendMsg(BizSendMsgVO msgVO) { EshopSmsPendingPO po = new EshopSmsPendingPO(); - po.setSendCenter("ebtp"); po.setSendModule("biz-service-ebtp-extend"); po.setSendUid(msgVO.getSendUid()); @@ -39,16 +41,39 @@ public class BizSmsEmailServiceImpl implements BizSmsEmailService { po.setStrMobileNumber(msgVO.getStrMobileNumberr()); } po.setStrContent(msgVO.getStrContent()); - logger.info("调用短信接口入参:[{}]", po); + logger.info("调用短信发送接口入参:[{}]", po); BaseResponse baseResponse = notificationFeignClient.saveMsg(po); ExceptionEnum.FRAME_EXCEPTION_SEND_MSG_FAIL.customValid(!baseResponse.isSuccess()); - logger.info("调用短信接口返回:[{}]", baseResponse.isSuccess()); + logger.info("调用短信发送接口返回:[{}]", baseResponse.isSuccess()); return baseResponse.isSuccess(); } @Override public Boolean sendEmail(BizSendEmailVO emailVO) { - return null; + EshopMailPendingPO po = new EshopMailPendingPO(); + + po.setSendCenter("ebtp"); + po.setSendModule("biz-service-ebtp-extend"); + po.setSendUid(emailVO.getSendUid()); + po.setSendUname(emailVO.getSendUName()); + if (emailVO.getSendToList() != null && !emailVO.getSendToList().isEmpty()) { + po.setSendTo(StringUtils.join(emailVO.getSendToList().toArray(), ",")); + } else { + po.setSendTo(emailVO.getSendTo()); + } + //邮件内容 + po.setSubject(emailVO.getSubject()); + po.setMsg(emailVO.getMsg()); + po.setFileUrl(""); + + po.setFileType(emailVO.getFileType()); + + logger.info("调用邮件发送接口入参:[{}]", po); + BaseResponse baseResponse = notificationFeignClient.sendMail(po); + ExceptionEnum.FRAME_EXCEPTION_SEND_MSG_FAIL.customValid(!baseResponse.isSuccess()); + logger.info("调用邮件发送接口返回:[{}]", baseResponse.isSuccess()); + + return baseResponse.isSuccess(); } }