x

src/main/java/com/egolm/film/api/service/impl/EmailServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;
 
 import com.egolm.common.MailUtil;
@@ -78,34 +79,43 @@ public class EmailServiceImpl implements EmailService {
 		Map<String, Object> map = new HashMap<String, Object>();
 		Integer adminid = (Integer)adminTokenService.getToken().getId();
 		Fc_member_film memberFilm = filmService.queryMemberFilmById(member_film_id);
-		Fc_member member = memberService.getMemberById(memberFilm.getMember_id());
-		Locale locale = new Locale("zh", "CN");
-		if("en".equals(member.getLang())) {
-			locale = new Locale("en", "US");
+		Fc_member member = null;
+		try {
+			member = memberService.getMemberById(memberFilm.getMember_id());
+		} catch (EmptyResultDataAccessException e) {
+			member = null;
 		}
-		String subject = messages.get("email.getPassword.subject", locale);
-		String content = Common.getStringAsStream(prefix + "_" + locale.getLanguage().toLowerCase() + "_" + locale.getCountry().toUpperCase() + ".txt");
-		String filmName = null;
-		if(locale.getLanguage().toLowerCase().equals("zh")) {
-			filmName = memberFilm.getCn_name();
-		} else if(locale.getLanguage().toLowerCase().equals("en")) {
-			filmName = memberFilm.getEn_name();
-		}
-		if(filmName == null || filmName.trim().length() == 0) {
-			filmName = memberFilm.getOrigion_name();
-		}
-		if(filmName == null || filmName.trim().length() == 0) {
-			filmName = memberFilm.getEn_name();
-		}
-		if(filmName == null || filmName.trim().length() == 0) {
-			filmName = memberFilm.getCn_name();
+		if(member != null) {
+			Locale locale = new Locale("zh", "CN");
+			if("en".equals(member.getLang())) {
+				locale = new Locale("en", "US");
+			}
+			String subject = messages.get("email.getPassword.subject", locale);
+			String content = Common.getStringAsStream(prefix + "_" + locale.getLanguage().toLowerCase() + "_" + locale.getCountry().toUpperCase() + ".txt");
+			String filmName = null;
+			if(locale.getLanguage().toLowerCase().equals("zh")) {
+				filmName = memberFilm.getCn_name();
+			} else if(locale.getLanguage().toLowerCase().equals("en")) {
+				filmName = memberFilm.getEn_name();
+			}
+			if(filmName == null || filmName.trim().length() == 0) {
+				filmName = memberFilm.getOrigion_name();
+			}
+			if(filmName == null || filmName.trim().length() == 0) {
+				filmName = memberFilm.getEn_name();
+			}
+			if(filmName == null || filmName.trim().length() == 0) {
+				filmName = memberFilm.getCn_name();
+			}
+			String film_no = StringUtil.formatLength(memberFilm.getFilm_no(), "0000");
+			content = MessageFormat.format(content, member.getUsername(), film_no, filmName == null ? "" : filmName);
+			this.send(2, adminid, subject, content, member.getEmail());
+			map.put("email", member.getEmail());
+			map.put("film_no", film_no);
+			return map;
+		} else {
+			return null;
 		}
-		String film_no = StringUtil.formatLength(memberFilm.getFilm_no(), "0000");
-		content = MessageFormat.format(content, member.getUsername(), film_no, filmName == null ? "" : filmName);
-		this.send(2, adminid, subject, content, member.getEmail());
-		map.put("email", member.getEmail());
-		map.put("film_no", film_no);
-		return map;
 	}
 	
 	public static void main(String[] args) {

src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java

@@ -128,7 +128,9 @@ public class AdminFirstController {
 		reviewService.toFirstRound(member_film_id);
 		Map<String, Object> map = emailService.sendByTemplate_01(member_film_id, "doc/first_pass");
 		Rjx rjx = Rjx.jsonOk();
-		rjx.putAll(map);
+		if(map != null) {
+			rjx.putAll(map);
+		}
 		return rjx;
 	}