Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
member-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
member-api
Commits
7e5df0df
Commit
7e5df0df
authored
Jan 08, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
ee6548f1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
27 deletions
+39
-27
EmailServiceImpl.java
...ava/com/egolm/film/api/service/impl/EmailServiceImpl.java
+36
-26
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+3
-1
No files found.
src/main/java/com/egolm/film/api/service/impl/EmailServiceImpl.java
View file @
7e5df0df
...
@@ -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
)
{
...
...
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
7e5df0df
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment