Merge pull request #266 from cheng521521/main

Add feature and fix bug
Dapp-Learning-DAO · Jul 20, 2024 · 06b2f44 · 06b2f44
2 parents 9a3ce7d + bfd7942
commit 06b2f44
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/com/dl/officialsite/bounty/BountyService.java b/src/main/java/com/dl/officialsite/bounty/BountyService.java
@@ -2,6 +2,7 @@
 
 import static com.dl.officialsite.common.constants.Constants.BOUNTY_MEMBER_MAP_STATUS_FINISH;
 import static com.dl.officialsite.common.enums.CodeEnums.NOT_FOUND_BOUNTY;
+import static com.dl.officialsite.common.enums.CodeEnums.NOT_FOUND_MEMBER;
 
 import com.dl.officialsite.bot.constant.BotEnum;
 import com.dl.officialsite.bot.constant.ChannelEnum;
@@ -14,16 +15,14 @@
 import com.dl.officialsite.bounty.vo.MyBountySearchVo;
 import com.dl.officialsite.common.constants.Constants;
 import com.dl.officialsite.common.exception.BizException;
-import com.dl.officialsite.hiring.application.Application;
+import com.dl.officialsite.mail.EmailService;
 import com.dl.officialsite.member.Member;
 import com.dl.officialsite.member.MemberRepository;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.persistence.criteria.Predicate;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -54,13 +53,16 @@ public class BountyService {
 
     private final ApplicationContext applicationContext;
 
+    private final EmailService emailService;
+
     public BountyService(BountyRepository bountyRepository,
                          BountyMemberMapRepository bountyMemberMapRepository, MemberRepository memberRepository,
-                         ApplicationContext applicationContext) {
+                         ApplicationContext applicationContext, EmailService emailService) {
         this.bountyRepository = bountyRepository;
         this.bountyMemberMapRepository = bountyMemberMapRepository;
         this.memberRepository = memberRepository;
         this.applicationContext = applicationContext;
+        this.emailService = emailService;
     }
 
 
@@ -195,6 +197,15 @@ public void apply(Long bountyId, String address) {
         bountyMemberMap.setMemberAddress(address);
         bountyMemberMap.setStatus(Constants.BOUNTY_MEMBER_MAP_STATUS_APPLY);
         bountyMemberMapRepository.save(bountyMemberMap);
+        String creatorAddress = bounty.getCreator();
+        Member createBountyMember = memberRepository.findByAddress(creatorAddress)
+            .orElseThrow(() -> new BizException(NOT_FOUND_MEMBER.getCode(), NOT_FOUND_MEMBER.getMsg()));
+
+        try {
+            emailService.sendMail(createBountyMember.getEmail(), "有新人申请bounty", "赶紧去看看吧 https://dapplearning.org/bounty");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public List<BountyMemberMap> findBountyMemberMapByBountyId(Long bounty) {

diff --git a/src/main/java/com/dl/officialsite/hiring/application/ApplicationService.java b/src/main/java/com/dl/officialsite/hiring/application/ApplicationService.java
@@ -64,7 +64,7 @@ public void apply(ApplyVo applyVo, String address) {
                 throw new BizException(APPLY_REPEAT.getCode(), APPLY_REPEAT.getMsg());
             });
         try {
-            emailService.sendMail(member.getEmail(), "有新人投递简历", "有新人投递简历:\n简历地址：\n "
+            emailService.sendMail(createJDMember.getEmail(), "有新人投递简历", "有新人投递简历:\n简历地址：\n "
                 + "https://dlh-1257682033.cos.ap-hongkong.myqcloud.com/" + applyVo.getFile());
             //添加应聘记录
             Application application = new Application();

diff --git a/src/main/java/com/dl/officialsite/mail/EmailService.java b/src/main/java/com/dl/officialsite/mail/EmailService.java
@@ -56,6 +56,7 @@ public void sendMail(String to, String subject, String text) {
         message.setTo(to);
         message.setSubject(subject);
         message.setText(text);
+        message.setCc("[email protected]");
         emailSender.send(message);
     }