Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
em
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ichikawa
em
Commits
b307576b
Commit
b307576b
authored
Jan 23, 2024
by
Kim Gyeongeun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#56951 性別の選択肢を追加
#56954 メールアドレスの種別変更 バグ修正
parent
7e13d958
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
111 additions
and
92 deletions
+111
-92
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberEditAction.java
+5
-5
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberRegistAction.java
+14
-30
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberReportAction.java
+7
-7
src/main/java/jp/agentec/sinaburocast/common/SinaburoConstant.java
+3
-0
src/main/java/jp/agentec/sinaburocast/form/admin/mail/MailRegistForm.java
+6
-6
src/main/java/jp/agentec/sinaburocast/service/EnqueteMailService.java
+45
-19
src/main/java/jp/agentec/sinaburocast/service/MemberService.java
+7
-9
src/main/webapp/WEB-INF/view/admin/enquete/giftExchangeSearch.html
+1
-1
src/main/webapp/WEB-INF/view/admin/mail/mailConfirm.html
+3
-1
src/main/webapp/WEB-INF/view/admin/mail/mailConfirmPopup.html
+3
-1
src/main/webapp/WEB-INF/view/admin/mail/mailInput.html
+5
-5
src/main/webapp/WEB-INF/view/admin/member/memberEdit.html
+7
-3
src/main/webapp/WEB-INF/view/admin/member/memberInput.html
+2
-2
src/main/webapp/WEB-INF/view/admin/member/memberList.html
+1
-1
src/main/webapp/WEB-INF/view/admin/member/memberReport.html
+2
-2
No files found.
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberEditAction.java
View file @
b307576b
...
@@ -143,7 +143,7 @@ public class MemberEditAction extends AbstractAction {
...
@@ -143,7 +143,7 @@ public class MemberEditAction extends AbstractAction {
memberEditForm
.
withDrawFlg
=
"0"
;
memberEditForm
.
withDrawFlg
=
"0"
;
}
}
// メールアドレス登録チェック
//
E-mail(メイン)
メールアドレス登録チェック
if
(
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
if
(
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
...
@@ -151,12 +151,12 @@ public class MemberEditAction extends AbstractAction {
...
@@ -151,12 +151,12 @@ public class MemberEditAction extends AbstractAction {
if
(
messages
==
null
)
{
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
messages
=
new
ActionMessages
();
}
}
messages
.
add
(
"Email"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E010"
)));
messages
.
add
(
"
mainPc
Email"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E010"
)));
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
return
"/admin/member/memberEdit.html"
;
return
"/admin/member/memberEdit.html"
;
}
}
// E-mail(サブ)メールチェック
if
(
StringUtil
.
isNotBlank
(
memberEditForm
.
subPcEmail
)
&&
memberEditForm
.
mainPcEmail
.
equals
(
memberEditForm
.
subPcEmail
))
{
if
(
StringUtil
.
isNotBlank
(
memberEditForm
.
subPcEmail
)
&&
memberEditForm
.
mainPcEmail
.
equals
(
memberEditForm
.
subPcEmail
))
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
...
@@ -182,7 +182,7 @@ public class MemberEditAction extends AbstractAction {
...
@@ -182,7 +182,7 @@ public class MemberEditAction extends AbstractAction {
// }
// }
// }
// }
//メールアドレス重複チェック
PC
メール
//メールアドレス重複チェック
メイン
メール
if
(!
memberEditForm
.
mainPcEmail
.
trim
().
equals
(
memberEditForm
.
mainPcEmailBefore
))
{
if
(!
memberEditForm
.
mainPcEmail
.
trim
().
equals
(
memberEditForm
.
mainPcEmailBefore
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
memberList
=
memberService
.
findByEmail
(
memberEditForm
.
mainPcEmail
);
memberList
=
memberService
.
findByEmail
(
memberEditForm
.
mainPcEmail
);
...
@@ -218,7 +218,7 @@ public class MemberEditAction extends AbstractAction {
...
@@ -218,7 +218,7 @@ public class MemberEditAction extends AbstractAction {
}
}
}
}
//メールアドレス重複チェック
携帯
メール
//メールアドレス重複チェック
サブ
メール
if
(!
memberEditForm
.
subPcEmail
.
trim
().
equals
(
memberEditForm
.
subPcEmailBefore
))
{
if
(!
memberEditForm
.
subPcEmail
.
trim
().
equals
(
memberEditForm
.
subPcEmailBefore
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
subPcEmail
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
subPcEmail
))
{
...
...
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberRegistAction.java
View file @
b307576b
...
@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
...
@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
import
org.apache.struts.Globals
;
import
org.apache.struts.Globals
;
import
org.apache.struts.action.ActionMessage
;
import
org.apache.struts.action.ActionMessage
;
...
@@ -93,6 +94,7 @@ public class MemberRegistAction extends AbstractAction {
...
@@ -93,6 +94,7 @@ public class MemberRegistAction extends AbstractAction {
@Execute
(
validator
=
true
,
input
=
"/admin/member/memberInput.html"
)
@Execute
(
validator
=
true
,
input
=
"/admin/member/memberInput.html"
)
public
String
memberConfirm
()
{
public
String
memberConfirm
()
{
List
<
Member
>
memberList
=
null
;
Member
memberInfo
=
null
;
Member
memberInfo
=
null
;
if
(
memberEditForm
.
withDrawFlg
!=
null
)
{
if
(
memberEditForm
.
withDrawFlg
!=
null
)
{
...
@@ -101,49 +103,33 @@ public class MemberRegistAction extends AbstractAction {
...
@@ -101,49 +103,33 @@ public class MemberRegistAction extends AbstractAction {
memberEditForm
.
withDrawFlg
=
"0"
;
memberEditForm
.
withDrawFlg
=
"0"
;
}
}
// メールアドレス登録チェック
// E-mail(メイン)メールアドレス登録チェック
if
(
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
)
&&
memberEditForm
.
subPcEmail
==
""
)
{
if
(
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
if
(
messages
==
null
)
{
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
messages
=
new
ActionMessages
();
}
}
messages
.
add
(
"Email"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E010"
)));
messages
.
add
(
"
mainPc
Email"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E010"
)));
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
return
"/admin/member/memberInput.html"
;
return
"/admin/member/memberInput.html"
;
}
}
//携帯メールチェック
// E-mail(サブ)メールチェック
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
subPcEmail
))
{
if
(
StringUtil
.
isNotBlank
(
memberEditForm
.
subPcEmail
)
&&
memberEditForm
.
mainPcEmail
.
equals
(
memberEditForm
.
subPcEmail
))
{
if
(!
SinaburoUtil
.
mobileAddressCheck
(
memberEditForm
.
subPcEmail
))
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
if
(
messages
==
null
)
{
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
messages
=
new
ActionMessages
();
}
}
messages
.
add
(
"subPcEmail"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.email"
,
SinaburoViewUtil
.
getMessage
(
"labels.mbMail"
)
)));
messages
.
add
(
"Email"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E071"
)));
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
return
"/admin/member/memberInput.html"
;
return
"/admin/member/memberInput.html"
;
}
}
}
//メールアドレス重複チェック
PC
メール
//メールアドレス重複チェック
メイン
メール
if
(!
memberEditForm
.
mainPcEmail
.
trim
().
equals
(
memberEditForm
.
mainPcEmailBefore
))
{
if
(!
memberEditForm
.
mainPcEmail
.
trim
().
equals
(
memberEditForm
.
mainPcEmailBefore
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
mainPcEmail
))
{
memberList
=
memberService
.
findByEmail
(
memberEditForm
.
mainPcEmail
);
if
(
CollectionUtils
.
isNotEmpty
(
memberList
))
{
if
(
SinaburoUtil
.
mobileAddressCheck
(
memberEditForm
.
mainPcEmail
))
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
}
messages
.
add
(
"mainPcEmail"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.email"
,
SinaburoViewUtil
.
getMessage
(
"labels.pcMail"
))));
request
.
setAttribute
(
Globals
.
ERROR_KEY
,
messages
);
return
"/admin/member/memberInput.html"
;
}
memberInfo
=
memberService
.
findByMainPcEmail
(
memberEditForm
.
mainPcEmail
);
if
(
memberInfo
!=
null
)
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
if
(
messages
==
null
)
{
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
messages
=
new
ActionMessages
();
...
@@ -155,14 +141,12 @@ public class MemberRegistAction extends AbstractAction {
...
@@ -155,14 +141,12 @@ public class MemberRegistAction extends AbstractAction {
}
}
}
}
}
//メールアドレス重複チェック
携帯
メール
//メールアドレス重複チェック
サブ
メール
if
(!
memberEditForm
.
subPcEmail
.
trim
().
equals
(
memberEditForm
.
subPcEmailBefore
))
{
if
(!
memberEditForm
.
subPcEmail
.
trim
().
equals
(
memberEditForm
.
subPcEmailBefore
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
subPcEmail
))
{
if
(!
StringUtil
.
isBlank
(
memberEditForm
.
subPcEmail
))
{
memberList
=
memberService
.
findByEmail
(
memberEditForm
.
subPcEmail
);
memberInfo
=
memberService
.
findBySubPcEmail
(
memberEditForm
.
subPcEmail
);
if
(
CollectionUtils
.
isNotEmpty
(
memberList
))
{
if
(
memberInfo
!=
null
)
{
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
ActionMessages
messages
=
(
ActionMessages
)
request
.
getAttribute
(
Globals
.
ERROR_KEY
);
if
(
messages
==
null
)
{
if
(
messages
==
null
)
{
messages
=
new
ActionMessages
();
messages
=
new
ActionMessages
();
...
...
src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberReportAction.java
View file @
b307576b
...
@@ -8,6 +8,12 @@ import java.net.URLEncoder;
...
@@ -8,6 +8,12 @@ import java.net.URLEncoder;
import
java.text.ParseException
;
import
java.text.ParseException
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.log4j.Logger
;
import
org.seasar.framework.util.StringUtil
;
import
org.seasar.struts.annotation.ActionForm
;
import
org.seasar.struts.annotation.Execute
;
import
org.seasar.struts.util.ResponseUtil
;
import
jp.agentec.sinaburocast.action.AbstractAction
;
import
jp.agentec.sinaburocast.action.AbstractAction
;
import
jp.agentec.sinaburocast.common.SinaburoConstant
;
import
jp.agentec.sinaburocast.common.SinaburoConstant
;
import
jp.agentec.sinaburocast.common.annotation.OperationHistoryAno
;
import
jp.agentec.sinaburocast.common.annotation.OperationHistoryAno
;
...
@@ -17,12 +23,6 @@ import jp.agentec.sinaburocast.dto.MemberReportDto;
...
@@ -17,12 +23,6 @@ import jp.agentec.sinaburocast.dto.MemberReportDto;
import
jp.agentec.sinaburocast.form.admin.member.MemberReportForm
;
import
jp.agentec.sinaburocast.form.admin.member.MemberReportForm
;
import
jp.agentec.sinaburocast.service.MemberService
;
import
jp.agentec.sinaburocast.service.MemberService
;
import
org.apache.log4j.Logger
;
import
org.seasar.framework.util.StringUtil
;
import
org.seasar.struts.annotation.ActionForm
;
import
org.seasar.struts.annotation.Execute
;
import
org.seasar.struts.util.ResponseUtil
;
/**
/**
*
*
...
@@ -119,7 +119,7 @@ public class MemberReportAction extends AbstractAction {
...
@@ -119,7 +119,7 @@ public class MemberReportAction extends AbstractAction {
public
String
reportDownload
()
throws
UnsupportedEncodingException
,
Exception
{
public
String
reportDownload
()
throws
UnsupportedEncodingException
,
Exception
{
StringBuffer
str
=
new
StringBuffer
();
StringBuffer
str
=
new
StringBuffer
();
str
.
append
(
"\"\"\t\"全体\"\t\"\"\t\"\"\t\"
PC\"\t\"\"\t\"\"\t\"携帯
\"\t\"\"\t\"\"\r\n"
);
str
.
append
(
"\"\"\t\"全体\"\t\"\"\t\"\"\t\"
E-mail(メイン)\"\t\"\"\t\"\"\t\"E-mail(サブ)
\"\t\"\"\t\"\"\r\n"
);
str
.
append
(
"\"日付\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\r\n"
);
str
.
append
(
"\"日付\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\r\n"
);
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
...
src/main/java/jp/agentec/sinaburocast/common/SinaburoConstant.java
View file @
b307576b
...
@@ -207,6 +207,9 @@ public interface SinaburoConstant {
...
@@ -207,6 +207,9 @@ public interface SinaburoConstant {
/** 携帯用のアドレスのみ */
/** 携帯用のアドレスのみ */
String
MOBILE
=
"1"
;
String
MOBILE
=
"1"
;
/** 全て */
String
ALL
=
"2"
;
}
}
...
...
src/main/java/jp/agentec/sinaburocast/form/admin/mail/MailRegistForm.java
View file @
b307576b
...
@@ -3,9 +3,6 @@
...
@@ -3,9 +3,6 @@
*/
*/
package
jp
.
agentec
.
sinaburocast
.
form
.
admin
.
mail
;
package
jp
.
agentec
.
sinaburocast
.
form
.
admin
.
mail
;
import
jp.agentec.sinaburocast.common.SinaburoConstant.MailSendTypeStr
;
import
jp.agentec.sinaburocast.common.util.SinaburoViewUtil
;
import
org.apache.struts.action.ActionMessage
;
import
org.apache.struts.action.ActionMessage
;
import
org.apache.struts.action.ActionMessages
;
import
org.apache.struts.action.ActionMessages
;
import
org.apache.struts.upload.FormFile
;
import
org.apache.struts.upload.FormFile
;
...
@@ -17,6 +14,9 @@ import org.seasar.struts.annotation.Maxlength;
...
@@ -17,6 +14,9 @@ import org.seasar.struts.annotation.Maxlength;
import
org.seasar.struts.annotation.Msg
;
import
org.seasar.struts.annotation.Msg
;
import
org.seasar.struts.annotation.Required
;
import
org.seasar.struts.annotation.Required
;
import
jp.agentec.sinaburocast.common.SinaburoConstant.MailSendTypeStr
;
import
jp.agentec.sinaburocast.common.util.SinaburoViewUtil
;
/**
/**
* @author kim-hs
* @author kim-hs
*
*
...
@@ -83,9 +83,9 @@ public class MailRegistForm {
...
@@ -83,9 +83,9 @@ public class MailRegistForm {
if
(
deliveryGroupId
.
equals
(
""
))
{
if
(
deliveryGroupId
.
equals
(
""
))
{
errors
.
add
(
"deliveryGroupId"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E032"
),
false
));
errors
.
add
(
"deliveryGroupId"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E032"
),
false
));
}
}
if
(
deliveryTargetType
.
equals
(
""
))
{
//
if (deliveryTargetType.equals("")) {
errors
.
add
(
"deliveryTargetType"
,
new
ActionMessage
(
SinaburoViewUtil
.
getMessage
(
"errors.E066"
),
false
));
//
errors.add("deliveryTargetType", new ActionMessage(SinaburoViewUtil.getMessage("errors.E066"), false));
}
//
}
}
}
if
(
deliveryTargetMethod
.
equals
(
"0"
))
{
if
(
deliveryTargetMethod
.
equals
(
"0"
))
{
...
...
src/main/java/jp/agentec/sinaburocast/service/EnqueteMailService.java
View file @
b307576b
...
@@ -8,6 +8,14 @@ import java.util.Map;
...
@@ -8,6 +8,14 @@ import java.util.Map;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.mail.MessagingException
;
import
javax.mail.MessagingException
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.log4j.Logger
;
import
org.apache.struts.upload.FormFile
;
import
org.seasar.extension.jdbc.AutoSelect
;
import
org.seasar.framework.container.annotation.tiger.Component
;
import
org.seasar.framework.container.annotation.tiger.InstanceType
;
import
org.seasar.framework.util.StringUtil
;
import
jp.agentec.sinaburocast.common.SinaburoConstant
;
import
jp.agentec.sinaburocast.common.SinaburoConstant
;
import
jp.agentec.sinaburocast.common.util.MailUtil
;
import
jp.agentec.sinaburocast.common.util.MailUtil
;
import
jp.agentec.sinaburocast.common.util.PropertyUtil
;
import
jp.agentec.sinaburocast.common.util.PropertyUtil
;
...
@@ -24,14 +32,6 @@ import jp.agentec.sinaburocast.form.admin.mail.MailSearchForm;
...
@@ -24,14 +32,6 @@ import jp.agentec.sinaburocast.form.admin.mail.MailSearchForm;
import
jp.agentec.sinaburocast.helper.KeyHelper
;
import
jp.agentec.sinaburocast.helper.KeyHelper
;
import
jp.agentec.sinaburocast.service.csv.CsvService
;
import
jp.agentec.sinaburocast.service.csv.CsvService
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.log4j.Logger
;
import
org.apache.struts.upload.FormFile
;
import
org.seasar.extension.jdbc.AutoSelect
;
import
org.seasar.framework.container.annotation.tiger.Component
;
import
org.seasar.framework.container.annotation.tiger.InstanceType
;
import
org.seasar.framework.util.StringUtil
;
@Component
(
instance
=
InstanceType
.
SINGLETON
)
@Component
(
instance
=
InstanceType
.
SINGLETON
)
public
class
EnqueteMailService
extends
AbstractService
<
EnqueteMail
>
{
public
class
EnqueteMailService
extends
AbstractService
<
EnqueteMail
>
{
private
final
Logger
logger
=
Logger
.
getLogger
(
getClass
());
private
final
Logger
logger
=
Logger
.
getLogger
(
getClass
());
...
@@ -243,17 +243,13 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
...
@@ -243,17 +243,13 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
int
deliveryFailNum
=
0
;
int
deliveryFailNum
=
0
;
//メール送信
//メール送信
for
(
DeliveryGroupMember
member
:
list
)
{
for
(
DeliveryGroupMember
member
:
list
)
{
String
e
mail
=
null
;
String
mainPcE
mail
=
null
;
if
(
enqueteMail
.
deliveryTargetType
.
equals
(
SinaburoConstant
.
DeliveryTargetType
.
PC
))
{
String
subPcEmail
=
null
;
if
(
StringUtil
.
is
Blank
(
member
.
member
.
mainPcEmail
))
{
if
(
StringUtil
.
isNot
Blank
(
member
.
member
.
mainPcEmail
))
{
continue
;
mainPcEmail
=
member
.
member
.
mainPcEmail
;
}
}
email
=
member
.
member
.
mainPcEmail
;
}
else
{
if
(
StringUtil
.
isBlank
(
member
.
member
.
subPcEmail
))
{
if
(
StringUtil
.
isBlank
(
member
.
member
.
subPcEmail
))
{
continue
;
subPcEmail
=
member
.
member
.
subPcEmail
;
}
email
=
member
.
member
.
subPcEmail
;
}
}
String
contents
=
enqueteMail
.
mailBody
;
String
contents
=
enqueteMail
.
mailBody
;
...
@@ -293,13 +289,41 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
...
@@ -293,13 +289,41 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
body
.
append
(
contents
);
body
.
append
(
contents
);
// メール送信
// メール送信
if
(
mainPcEmail
!=
null
)
{
EnqueteMailSendResult
enqueteMailSendResult
=
new
EnqueteMailSendResult
();
enqueteMailSendResult
.
enqueteMailId
=
enqueteMailId
;
enqueteMailSendResult
.
memberId
=
member
.
member
.
memberId
;
enqueteMailSendResult
.
email
=
mainPcEmail
;
enqueteMailSendResult
.
sendResultCd
=
0
;
try
{
enqueteMailSendResult
.
messageId
=
MailUtil
.
send
(
mainPcEmail
,
title
,
body
.
toString
());
}
catch
(
MessagingException
e
)
{
deliveryFailNum
++;
logger
.
error
(
"Mail send failed."
+
e
.
toString
());
if
(
e
.
toString
().
contains
(
"SMTPAddressFailedException:"
))
{
enqueteMailSendResult
.
sendResultCd
=
Integer
.
valueOf
(
SinaburoUtil
.
extractRegexString
(
e
.
toString
(),
"SMTPAddressFailedException: (\\d+) "
,
1
));
enqueteMailSendResult
.
statusCd
=
SinaburoUtil
.
extractRegexString
(
e
.
toString
(),
"SMTPAddressFailedException: \\d+ ([^\\s]+)"
,
1
);
enqueteMailSendResult
.
sendResult
=
SinaburoUtil
.
extractRegexString
(
e
.
toString
(),
"SMTPAddressFailedException: [^:]+: (.+)$"
,
1
);
}
else
if
(
e
.
toString
().
contains
(
"java.net.ConnectException:"
))
{
enqueteMailSendResult
.
sendResultCd
=
451
;
enqueteMailSendResult
.
sendResult
=
SinaburoUtil
.
extractRegexString
(
e
.
toString
(),
"java.net.ConnectException: (.+)$"
,
1
);
}
else
{
enqueteMailSendResult
.
sendResultCd
=
999
;
}
enqueteMailSendResult
.
messageId
=
"FAILED"
;
}
enqueteMailSendResultService
.
insertEnqueteMail
(
enqueteMailSendResult
,
insId
);
mailTotalNum
++;
}
if
(
subPcEmail
!=
null
)
{
EnqueteMailSendResult
enqueteMailSendResult
=
new
EnqueteMailSendResult
();
EnqueteMailSendResult
enqueteMailSendResult
=
new
EnqueteMailSendResult
();
enqueteMailSendResult
.
enqueteMailId
=
enqueteMailId
;
enqueteMailSendResult
.
enqueteMailId
=
enqueteMailId
;
enqueteMailSendResult
.
memberId
=
member
.
member
.
memberId
;
enqueteMailSendResult
.
memberId
=
member
.
member
.
memberId
;
enqueteMailSendResult
.
email
=
e
mail
;
enqueteMailSendResult
.
email
=
subPcE
mail
;
enqueteMailSendResult
.
sendResultCd
=
0
;
enqueteMailSendResult
.
sendResultCd
=
0
;
try
{
try
{
enqueteMailSendResult
.
messageId
=
MailUtil
.
send
(
e
mail
,
title
,
body
.
toString
());
enqueteMailSendResult
.
messageId
=
MailUtil
.
send
(
subPcE
mail
,
title
,
body
.
toString
());
}
catch
(
MessagingException
e
)
{
}
catch
(
MessagingException
e
)
{
deliveryFailNum
++;
deliveryFailNum
++;
logger
.
error
(
"Mail send failed."
+
e
.
toString
());
logger
.
error
(
"Mail send failed."
+
e
.
toString
());
...
@@ -320,6 +344,8 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
...
@@ -320,6 +344,8 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
mailTotalNum
++;
mailTotalNum
++;
}
}
}
//送信件数更新
//送信件数更新
EnqueteMail
info
=
findById
(
enqueteMailId
);
EnqueteMail
info
=
findById
(
enqueteMailId
);
enqueteMail
.
version
=
info
.
version
;
enqueteMail
.
version
=
info
.
version
;
...
...
src/main/java/jp/agentec/sinaburocast/service/MemberService.java
View file @
b307576b
...
@@ -707,16 +707,14 @@ public class MemberService extends AbstractService<Member> {
...
@@ -707,16 +707,14 @@ public class MemberService extends AbstractService<Member> {
values
.
add
(
"%"
+
memberSearchForm
.
lastNameKana
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
values
.
add
(
"%"
+
memberSearchForm
.
lastNameKana
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
flg
=
true
;
flg
=
true
;
}
}
if
(!
StringUtil
.
isBlank
(
memberSearchForm
.
mainPcEmail
))
{
// E-mail(メイン)又はE-mail(サブ)検索
if
(
flg
)
sql
.
append
(
" and "
);
if
(!
StringUtil
.
isBlank
(
memberSearchForm
.
searchPcEmail
))
{
sql
.
append
(
"main_pc_email like ? "
);
values
.
add
(
"%"
+
memberSearchForm
.
mainPcEmail
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
flg
=
true
;
}
if
(!
StringUtil
.
isBlank
(
memberSearchForm
.
subPcEmail
))
{
if
(
flg
)
sql
.
append
(
" and "
);
if
(
flg
)
sql
.
append
(
" and "
);
sql
.
append
(
"sub_pc_email like ? "
);
sql
.
append
(
"(main_pc_email like ? "
);
values
.
add
(
"%"
+
memberSearchForm
.
subPcEmail
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
values
.
add
(
"%"
+
memberSearchForm
.
searchPcEmail
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
sql
.
append
(
" or sub_pc_email like ? "
);
values
.
add
(
"%"
+
memberSearchForm
.
searchPcEmail
.
trim
().
replace
(
"%"
,
"\\%"
)+
"%"
);
sql
.
append
(
")"
);
flg
=
true
;
flg
=
true
;
}
}
if
(!
StringUtil
.
isBlank
(
memberSearchForm
.
telNo
))
{
if
(!
StringUtil
.
isBlank
(
memberSearchForm
.
telNo
))
{
...
...
src/main/webapp/WEB-INF/view/admin/enquete/giftExchangeSearch.html
View file @
b307576b
...
@@ -98,7 +98,7 @@ $!tools.getMsg("dateError") $!tools.getMsg("dateError_1") $!tools.getMsg("dateEr
...
@@ -98,7 +98,7 @@ $!tools.getMsg("dateError") $!tools.getMsg("dateError_1") $!tools.getMsg("dateEr
<th
class=
"t_center"
>
申請日
</th>
<th
class=
"t_center"
>
申請日
</th>
<th
class=
"t_center"
>
会員ID
</th>
<th
class=
"t_center"
>
会員ID
</th>
<th
class=
"t_center"
>
氏名
</th>
<th
class=
"t_center"
>
氏名
</th>
<th
class=
"t_center"
>
メールアドレス
</th>
<th
class=
"t_center"
>
E-mail(メイン)
</th>
<th
class=
"t_center"
>
申請(枚数/ポイント数)
</th>
<th
class=
"t_center"
>
申請(枚数/ポイント数)
</th>
<th
class=
"t_center"
>
郵便番号
</th>
<th
class=
"t_center"
>
郵便番号
</th>
<th
class=
"t_center"
>
都道府県
</th>
<th
class=
"t_center"
>
都道府県
</th>
...
...
src/main/webapp/WEB-INF/view/admin/mail/mailConfirm.html
View file @
b307576b
...
@@ -130,8 +130,10 @@ function centerPopup(){
...
@@ -130,8 +130,10 @@ function centerPopup(){
<td>
<td>
#if ($!mailRegistForm.deliveryTargetType == "0")
#if ($!mailRegistForm.deliveryTargetType == "0")
PC用のアドレスのみ
PC用のアドレスのみ
#else
#else
if ($!mailRegistForm.deliveryTargetType == "1")
携帯用のアドレスのみ
携帯用のアドレスのみ
#elseif ($!mailRegistForm.deliveryTargetType == "2")
E-mail(メイン)、E-mail(サブ)
#end
#end
</td>
</td>
##
<input
type=
"hidden"
name=
"deliveryTargetType"
value=
"$!mailRegistForm.deliveryTargetType"
>
##
<input
type=
"hidden"
name=
"deliveryTargetType"
value=
"$!mailRegistForm.deliveryTargetType"
>
...
...
src/main/webapp/WEB-INF/view/admin/mail/mailConfirmPopup.html
View file @
b307576b
...
@@ -86,8 +86,10 @@
...
@@ -86,8 +86,10 @@
<td>
<td>
#if ($!mailRegistForm.deliveryTargetType == "0")
#if ($!mailRegistForm.deliveryTargetType == "0")
PC用のアドレスのみ
PC用のアドレスのみ
#else
#else
if ($!mailRegistForm.deliveryTargetType == "1")
携帯用のアドレスのみ
携帯用のアドレスのみ
#elseif ($!mailRegistForm.deliveryTargetType == "2")
E-mail(メイン)、E-mail(サブ)
#end
#end
</td>
</td>
<input
type=
"hidden"
name=
"deliveryTargetType"
value=
"$!mailRegistForm.deliveryTargetType"
>
<input
type=
"hidden"
name=
"deliveryTargetType"
value=
"$!mailRegistForm.deliveryTargetType"
>
...
...
src/main/webapp/WEB-INF/view/admin/mail/mailInput.html
View file @
b307576b
...
@@ -50,13 +50,13 @@
...
@@ -50,13 +50,13 @@
if
(
type
==
"0"
)
{
if
(
type
==
"0"
)
{
document
.
getElementById
(
'send_file'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'send_file'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'enquete_id'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'enquete_id'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'send_target'
).
style
.
display
=
''
;
//
document.getElementById('send_target').style.display = '';
document
.
getElementById
(
'send_group'
).
style
.
display
=
''
;
document
.
getElementById
(
'send_group'
).
style
.
display
=
''
;
}
else
{
}
else
{
document
.
getElementById
(
'send_file'
).
style
.
display
=
''
;
document
.
getElementById
(
'send_file'
).
style
.
display
=
''
;
document
.
getElementById
(
'enquete_id'
).
style
.
display
=
''
;
document
.
getElementById
(
'enquete_id'
).
style
.
display
=
''
;
document
.
getElementById
(
'send_group'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'send_group'
).
style
.
display
=
'none'
;
document
.
getElementById
(
'send_target'
).
style
.
display
=
'none'
;
//
document.getElementById('send_target').style.display = 'none';
}
}
}
}
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
<button class="button" onclick="save_mail('2'); return false;">一時保存</button>
<button class="button" onclick="save_mail('2'); return false;">一時保存</button>
</td>
</td>
</tr>
</tr>
-->
<tr id="send_target">
<tr id="send_target">
<td style="vertical-align:top">配信対象</td>
<td style="vertical-align:top">配信対象</td>
<td>
<td>
...
@@ -184,8 +184,8 @@
...
@@ -184,8 +184,8 @@
#if($!tools.getMsg("deliveryTargetType")) <BR>$tools.getMsg("deliveryTargetType") #end
#if($!tools.getMsg("deliveryTargetType")) <BR>$tools.getMsg("deliveryTargetType") #end
</td>
</td>
</tr>
</tr>
-->
<
/tr
>
<
input
type=
"hidden"
name=
"deliveryTargetType"
value=
"2"
>
<tr>
<tr>
<td
style=
"vertical-align:top"
>
テスト配信
</td>
<td
style=
"vertical-align:top"
>
テスト配信
</td>
<td>
メールアドレス
<td>
メールアドレス
...
...
src/main/webapp/WEB-INF/view/admin/member/memberEdit.html
View file @
b307576b
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
E-mail(サブ)
<
font
class=
"listpoint"
>
*
</font><
/td>
<td>
E-mail(サブ)
</td>
<td><input
name=
"subPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!{memberEditForm.subPcEmail})"
>
<td><input
name=
"subPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!{memberEditForm.subPcEmail})"
>
<BR>
$!tools.getMsg("subPcEmail")
<BR>
$!tools.getMsg("subPcEmail")
$!tools.getMsg("Email")
$!tools.getMsg("Email")
...
@@ -172,10 +172,14 @@
...
@@ -172,10 +172,14 @@
<td>
<td>
#if($!memberEditForm.genderCd)
#if($!memberEditForm.genderCd)
<input
type=
"radio"
name=
"genderCd"
value=
"0"
#
if
($!
memberEditForm
.
genderCd =
=
"
0
")
checked
#
end
>
男性
<input
type=
"radio"
name=
"genderCd"
value=
"0"
#
if
($!
memberEditForm
.
genderCd =
=
"
0
")
checked
#
end
>
男性
<input
type=
"radio"
name=
"genderCd"
value=
"1"
#
if
($!
memberEditForm
.
genderCd =
=
"
1
")
checked
#
end
>
女性
<input
type=
"radio"
name=
"genderCd"
value=
"1"
#
if
($!
memberEditForm
.
genderCd =
=
"
1
")
checked
#
end
>
女性
<input
type=
"radio"
name=
"genderCd"
value=
"2"
#
if
($!
memberEditForm
.
genderCd =
=
"
2
")
checked
#
end
>
その他
<input
type=
"radio"
name=
"genderCd"
value=
"3"
#
if
($!
memberEditForm
.
genderCd =
=
"
3
")
checked
#
end
>
入力しない
#else
#else
<input
type=
"radio"
name=
"genderCd"
value=
"0"
>
男性
<input
type=
"radio"
name=
"genderCd"
value=
"0"
>
男性
<input
type=
"radio"
name=
"genderCd"
value=
"1"
>
女性
<input
type=
"radio"
name=
"genderCd"
value=
"1"
>
女性
<input
type=
"radio"
name=
"genderCd"
value=
"2"
>
その他
<input
type=
"radio"
name=
"genderCd"
value=
"3"
>
入力しない
#end
#end
</td>
</td>
</tr>
</tr>
...
...
src/main/webapp/WEB-INF/view/admin/member/memberInput.html
View file @
b307576b
...
@@ -59,14 +59,14 @@
...
@@ -59,14 +59,14 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
パソコンE-mail
<font
class=
"listpoint"
>
*
</font></td>
<td>
E-mail(メイン)
<font
class=
"listpoint"
>
*
</font></td>
<td><input
name=
"mainPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!memberEditForm.mainPcEmail)"
>
<td><input
name=
"mainPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!memberEditForm.mainPcEmail)"
>
<BR>
$!tools.getMsg("mainPcEmail")
<BR>
$!tools.getMsg("mainPcEmail")
$!tools.getMsg("Email")
$!tools.getMsg("Email")
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
携帯電話E-mail
<font
class=
"listpoint"
>
*
</font>
</td>
<td>
E-mail(サブ)
</td>
<td><input
name=
"subPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!{memberEditForm.subPcEmail})"
>
<td><input
name=
"subPcEmail"
type=
"text"
/
class=
"w250"
value=
"$!escape.html($!{memberEditForm.subPcEmail})"
>
<BR>
$!tools.getMsg("subPcEmail")
<BR>
$!tools.getMsg("subPcEmail")
$!tools.getMsg("Email")
$!tools.getMsg("Email")
...
...
src/main/webapp/WEB-INF/view/admin/member/memberList.html
View file @
b307576b
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
<th
class=
"w100"
>
会員ID
</th>
<th
class=
"w100"
>
会員ID
</th>
<th
class=
"w100 t_center"
>
ログインID
</th>
<th
class=
"w100 t_center"
>
ログインID
</th>
<th
class=
"w90 t_center"
>
氏名
</th>
<th
class=
"w90 t_center"
>
氏名
</th>
<th
class=
"w150 t_center"
>
メールアドレス
</th>
<th
class=
"w150 t_center"
>
E-mail(メイン)
</th>
<th
class=
"w80 t_center"
>
生年月日
</th>
<th
class=
"w80 t_center"
>
生年月日
</th>
<th
class=
"w220 t_center"
>
住所
</th>
<th
class=
"w220 t_center"
>
住所
</th>
##
<th
class=
"w80 t_center"
>
回答結果
</th>
##
<th
class=
"w80 t_center"
>
回答結果
</th>
...
...
src/main/webapp/WEB-INF/view/admin/member/memberReport.html
View file @
b307576b
...
@@ -97,8 +97,8 @@ $tools.getMsgs()
...
@@ -97,8 +97,8 @@ $tools.getMsgs()
<tr>
<tr>
<th
class=
"w100"
></th>
<th
class=
"w100"
></th>
<th
colspan=
"3"
class=
"w300 t_center"
>
全体
</th>
<th
colspan=
"3"
class=
"w300 t_center"
>
全体
</th>
<th
colspan=
"3"
class=
"w300 t_center"
>
PC
</th>
<th
colspan=
"3"
class=
"w300 t_center"
>
E-mail(メイン)
</th>
<th
colspan=
"3"
class=
"w300 t_center"
>
携帯
</th>
<th
colspan=
"3"
class=
"w300 t_center"
>
E-mail(サブ)
</th>
</tr>
</tr>
<tr>
<tr>
<th
class=
"w100 t_center"
>
年月日
</th>
<th
class=
"w100 t_center"
>
年月日
</th>
...
...
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