Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
hylee
commit
23b8de15e5
@ -34,6 +34,9 @@ public interface MberGrdService {
|
||||
// 회원 등급제 대상여부 정보(사용자화면용)
|
||||
public MberGrdVO selectMberGrdInfo(String mberId) throws Exception;
|
||||
|
||||
// 회원 등급 예외 정보
|
||||
public MberGrdVO selectMberEtcInfo(String mberId) throws Exception;
|
||||
|
||||
// 회원별 등급 누적결제액 상세
|
||||
public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception;
|
||||
|
||||
|
||||
@ -48,6 +48,9 @@ public class MberGrdVO extends UserDefaultVO {
|
||||
private String grdPeriod; // 회원등급제 누적결제 계산기간
|
||||
private String tempYn;
|
||||
private String moid; // 결제번호
|
||||
private String isSalePrice; // 협의회원
|
||||
private String blineCode; // B선회원
|
||||
private String spamYn; // 스팸회원
|
||||
|
||||
// 검색필터
|
||||
private String searchGrdStatus;
|
||||
@ -287,5 +290,23 @@ public class MberGrdVO extends UserDefaultVO {
|
||||
}
|
||||
public void setSearchGrdStatus(String searchGrdStatus) {
|
||||
this.searchGrdStatus = searchGrdStatus;
|
||||
}
|
||||
public String getIsSalePrice() {
|
||||
return isSalePrice;
|
||||
}
|
||||
public void setIsSalePrice(String isSalePrice) {
|
||||
this.isSalePrice = isSalePrice;
|
||||
}
|
||||
public String getBlineCode() {
|
||||
return blineCode;
|
||||
}
|
||||
public void setBlineCode(String blineCode) {
|
||||
this.blineCode = blineCode;
|
||||
}
|
||||
public String getSpamYn() {
|
||||
return spamYn;
|
||||
}
|
||||
public void setSpamYn(String spamYn) {
|
||||
this.spamYn = spamYn;
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,6 +53,11 @@ public class MberGrdDAO extends EgovAbstractDAO {
|
||||
return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", mberId);
|
||||
}
|
||||
|
||||
// 회원 등급 예외 정보
|
||||
public MberGrdVO selectMberEtcInfo(String mberId) throws Exception{
|
||||
return (MberGrdVO) select("mberGrdDAO.selectMberEtcInfo", mberId);
|
||||
}
|
||||
|
||||
// 회원별 등급 누적결제액 상세
|
||||
public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception{
|
||||
return (MberGrdVO) select("mberGrdDAO.selectMberGrdAmtDetail", mberGrdVO);
|
||||
|
||||
@ -130,6 +130,15 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
|
||||
return mberGrdDAO.selectMberGrdInfo(mberId);
|
||||
}
|
||||
|
||||
// 회원 등급 예외 정보
|
||||
@Override
|
||||
public MberGrdVO selectMberEtcInfo(String mberId) throws Exception {
|
||||
// 공백제거
|
||||
mberId = mberId.trim();
|
||||
|
||||
return mberGrdDAO.selectMberEtcInfo(mberId);
|
||||
}
|
||||
|
||||
// 회원별 등급 누적결제액 상세
|
||||
@Override
|
||||
public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception {
|
||||
|
||||
@ -43,7 +43,7 @@ public class MberGrdController {
|
||||
HttpServletRequest request,
|
||||
ModelMap model) throws Exception{
|
||||
|
||||
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
|
||||
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
|
||||
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
|
||||
mberGrdVO.setMberId(userId);
|
||||
|
||||
@ -78,7 +78,7 @@ public class MberGrdController {
|
||||
return "/web/grd/MberGrdHistListAjax";
|
||||
}
|
||||
|
||||
// 등급제 시행 ON/OFF 체크
|
||||
// 등급제 시행 ON/OFF 체크(로그인 상태에서만 조회)
|
||||
@RequestMapping(value = "/web/grd/mberSettDetailAjax.do")
|
||||
public ModelAndView mberSettingDetailAjax(
|
||||
@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
|
||||
@ -90,11 +90,67 @@ public class MberGrdController {
|
||||
String msg = "";
|
||||
|
||||
try{
|
||||
MberGrdVO mberGrdVO1 = new MberGrdVO();
|
||||
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
|
||||
if (mberGrdVO1.getGrdNoti().equals("Y")) {
|
||||
isSuccess = true;
|
||||
}
|
||||
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
|
||||
if (null != loginVO) {
|
||||
MberGrdVO mberGrdVO1 = new MberGrdVO();
|
||||
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
|
||||
if (mberGrdVO1.getGrdNoti().equals("Y")) {
|
||||
isSuccess = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(Exception e) {
|
||||
msg = e.getMessage();
|
||||
}
|
||||
|
||||
modelAndView.addObject("isSuccess", isSuccess);
|
||||
modelAndView.addObject("msg", msg);
|
||||
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
// 등급제 시행 ON/OFF 체크(비로그인 상태에서 조회)
|
||||
@RequestMapping(value = "/web/grd/mberSettDetailByNotLoginAjax.do")
|
||||
public ModelAndView mberSettDetailByNotLoginAjax(
|
||||
@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
|
||||
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
modelAndView.setViewName("jsonView");
|
||||
|
||||
boolean isSuccess = false;
|
||||
String msg = "";
|
||||
MberGrdVO rtnMberGrdVO = new MberGrdVO();
|
||||
|
||||
try{
|
||||
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
|
||||
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
|
||||
if (null != loginVO) {
|
||||
mberGrdVO.setMberId(userId);
|
||||
|
||||
// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
|
||||
MberGrdVO mberGrdVO1 = new MberGrdVO();
|
||||
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
|
||||
if (mberGrdVO1.getGrdNoti().equals("Y")) {
|
||||
// Step 2. 회원별 이벤트 진행여부
|
||||
int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
|
||||
if (mberEventPrgCnt == 0) {
|
||||
rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
|
||||
if (null != rtnMberGrdVO) {
|
||||
isSuccess = true;
|
||||
}
|
||||
else {
|
||||
msg = "종료";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
MberGrdVO mberGrdVO1 = new MberGrdVO();
|
||||
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
|
||||
if (mberGrdVO1.getGrdNoti().equals("Y")) {
|
||||
isSuccess = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(Exception e) {
|
||||
msg = e.getMessage();
|
||||
@ -115,7 +171,7 @@ public class MberGrdController {
|
||||
modelAndView.setViewName("jsonView");
|
||||
|
||||
// 로그인VO에서 사용자 정보 가져오기
|
||||
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
|
||||
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
|
||||
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
|
||||
|
||||
|
||||
|
||||
@ -353,6 +353,56 @@ public class MberGrdMngController {
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
// 회원 등급 예외 정보
|
||||
@RequestMapping(value = "/sym/grd/mberGrdEtcChkAjax.do")
|
||||
public ModelAndView mberGrdEtcChkAjax(
|
||||
@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
|
||||
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
modelAndView.setViewName("jsonView");
|
||||
|
||||
boolean isSuccess = false;
|
||||
boolean isEvent = false;
|
||||
String msg = "";
|
||||
MberGrdVO rtnMberGrdVO = new MberGrdVO();
|
||||
|
||||
// 로그인VO에서 사용자 정보 가져오기
|
||||
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
|
||||
String frstRegisterId = loginVO == null ? "" : loginVO.getId();
|
||||
mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
|
||||
|
||||
try{
|
||||
if (StringUtils.isNotEmpty(mberGrdVO.getMberId())) {
|
||||
|
||||
// Step 2. 회원별 이벤트 진행여부
|
||||
int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
|
||||
if (mberEventPrgCnt == 0) {
|
||||
rtnMberGrdVO = mberGrdService.selectMberEtcInfo(mberGrdVO.getMberId());
|
||||
if (null != rtnMberGrdVO) {
|
||||
isSuccess = true;
|
||||
}
|
||||
else {
|
||||
msg = "종료";
|
||||
}
|
||||
}
|
||||
else {
|
||||
isEvent = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
catch(Exception e) {
|
||||
msg = e.getMessage();
|
||||
}
|
||||
|
||||
modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
|
||||
modelAndView.addObject("isSuccess", isSuccess);
|
||||
modelAndView.addObject("isEvent", isEvent);
|
||||
modelAndView.addObject("msg", msg);
|
||||
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
// 회원 등급제 종료
|
||||
@RequestMapping(value = "/sym/grd/mberGrdEndByUserAjax.do")
|
||||
public ModelAndView mberGrdEndByUserAjax(
|
||||
|
||||
@ -303,6 +303,41 @@
|
||||
]]>
|
||||
</select>
|
||||
|
||||
<!-- 회원 등급 예외 정보 -->
|
||||
<select id="mberGrdDAO.selectMberEtcInfo" parameterClass="String" resultClass="mberGrdVO">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
M.mberId
|
||||
, M.isSalePrice
|
||||
, M.blineCode
|
||||
, M.spamYn
|
||||
FROM (
|
||||
SELECT
|
||||
A.MBER_ID AS mberId
|
||||
, IFNULL(A.BLINE_CODE, 'N') AS blineCode
|
||||
, IFNULL(A.SPAM_YN, 'N') AS spamYn
|
||||
, CASE
|
||||
WHEN
|
||||
(A.SHORT_PRICE > 0
|
||||
AND (B.SHORT_PRICE > A.SHORT_PRICE
|
||||
OR B.LONG_PRICE > A.LONG_PRICE
|
||||
OR B.PICTURE_PRICE > A.PICTURE_PRICE
|
||||
OR B.PICTURE2_PRICE > A.PICTURE2_PRICE
|
||||
OR B.PICTURE3_PRICE > A.PICTURE3_PRICE)
|
||||
)
|
||||
THEN 'Y'
|
||||
ELSE 'N'
|
||||
END isSalePrice
|
||||
FROM LETTNGNRLMBER A
|
||||
JOIN MJ_MBER_SETTING B
|
||||
WHERE 1=1
|
||||
AND A.MBER_STTUS = 'Y'
|
||||
AND A.MBER_ID = #mberId#
|
||||
) M
|
||||
LIMIT 1
|
||||
]]>
|
||||
</select>
|
||||
|
||||
<!-- 회원별 등급 누적결제액 상세 -->
|
||||
<select id="mberGrdDAO.selectMberGrdAmtDetail" parameterClass="mberGrdVO" resultClass="mberGrdVO">
|
||||
<
Binary file not shown.
|
After Width: | Height: | Size: 298 KiB |
BIN
src/main/webapp/publish/images/main/f_visual_03_20230808.jpg
Normal file
BIN
src/main/webapp/publish/images/main/f_visual_03_20230808.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 350 KiB |
Loading…
Reference in New Issue
Block a user