Commit 7e5df0df authored by Quxl's avatar Quxl

x

parent ee6548f1
...@@ -8,6 +8,7 @@ import java.util.Map; ...@@ -8,6 +8,7 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.egolm.common.MailUtil; import com.egolm.common.MailUtil;
...@@ -78,7 +79,13 @@ public class EmailServiceImpl implements EmailService { ...@@ -78,7 +79,13 @@ public class EmailServiceImpl implements EmailService {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
Integer adminid = (Integer)adminTokenService.getToken().getId(); Integer adminid = (Integer)adminTokenService.getToken().getId();
Fc_member_film memberFilm = filmService.queryMemberFilmById(member_film_id); Fc_member_film memberFilm = filmService.queryMemberFilmById(member_film_id);
Fc_member member = memberService.getMemberById(memberFilm.getMember_id()); Fc_member member = null;
try {
member = memberService.getMemberById(memberFilm.getMember_id());
} catch (EmptyResultDataAccessException e) {
member = null;
}
if(member != null) {
Locale locale = new Locale("zh", "CN"); Locale locale = new Locale("zh", "CN");
if("en".equals(member.getLang())) { if("en".equals(member.getLang())) {
locale = new Locale("en", "US"); locale = new Locale("en", "US");
...@@ -106,6 +113,9 @@ public class EmailServiceImpl implements EmailService { ...@@ -106,6 +113,9 @@ public class EmailServiceImpl implements EmailService {
map.put("email", member.getEmail()); map.put("email", member.getEmail());
map.put("film_no", film_no); map.put("film_no", film_no);
return map; return map;
} else {
return null;
}
} }
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -128,7 +128,9 @@ public class AdminFirstController { ...@@ -128,7 +128,9 @@ public class AdminFirstController {
reviewService.toFirstRound(member_film_id); reviewService.toFirstRound(member_film_id);
Map<String, Object> map = emailService.sendByTemplate_01(member_film_id, "doc/first_pass"); Map<String, Object> map = emailService.sendByTemplate_01(member_film_id, "doc/first_pass");
Rjx rjx = Rjx.jsonOk(); Rjx rjx = Rjx.jsonOk();
if(map != null) {
rjx.putAll(map); rjx.putAll(map);
}
return rjx; return rjx;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment