From 80d147a4b2449e4f634e082f80120684c9378bd8 Mon Sep 17 00:00:00 2001
From: itn
Date: Tue, 8 Aug 2023 11:01:39 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1,=20?=
=?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=20=EB=8B=A8=EA=B0=80?=
=?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EB=85=B8=EC=B6=9C=EA=B8=B0=EC=A4=80=20?=
=?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../let/sym/grd/web/MberGrdController.java | 33 ++++++++++++++++++-
.../jsp/web/msgcampain/MsgDataSMLView.jsp | 18 ++++++++--
.../msgcampain/excel/MsgExcelDataSMLView.jsp | 18 ++++++++--
.../jsp/web/msgdata/MsgDataSMLView.jsp | 18 ++++++++--
.../web/msgdata/excel/MsgExcelDataSMLView.jsp | 18 ++++++++--
.../webapp/WEB-INF/jsp/web/pay/PayGuide.jsp | 10 +++---
6 files changed, 97 insertions(+), 18 deletions(-)
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
index f5d632ea..270dc8ec 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
@@ -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 {
@@ -89,6 +89,37 @@ public class MberGrdController {
boolean isSuccess = false;
String msg = "";
+ try{
+ LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+ 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 = "";
+
try{
MberGrdVO mberGrdVO1 = new MberGrdVO();
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 998bc195..8aa04d37 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -297,6 +297,18 @@ function txtExport(event){
$("#txtFile").val("");
}
+//발송금액 단가표시
+function SetPriceWrapOpen() {
+ var loginVO = '${LoginVO}';
+ //로그인 체크
+ if(loginVO == "" || loginVO == null){
+ }
+ else {
+ // 발송금액 가격안내
+ $("#myPriceWrap").show();
+ }
+}
+
//등급제 시행 ON/OFF 체크
function getMberSettingDetail() {
$.ajax({
@@ -307,7 +319,7 @@ function getMberSettingDetail() {
async: false,
success: function (data) {
if (data.isSuccess) {
- // 발송금액 아래 등급별 가격안내 추가
+ // 발송금액 가격안내
$("#myPriceWrap").show();
}
else {
@@ -321,8 +333,8 @@ function getMberSettingDetail() {
}
$(document).ready(function (){
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
+ // 발송금액 단가표시
+ SetPriceWrapOpen();
//미리보기 이미지 영역 숨김 처리
$('.preiew_img').hide();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
index 17ed1cc9..fc68122c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
@@ -442,6 +442,18 @@ function txtExport(event){
$("#txtFile").val("");
}
+//발송금액 단가표시
+function SetPriceWrapOpen() {
+ var loginVO = '${LoginVO}';
+ //로그인 체크
+ if(loginVO == "" || loginVO == null){
+ }
+ else {
+ // 발송금액 가격안내
+ $("#myPriceWrap").show();
+ }
+}
+
//등급제 시행 ON/OFF 체크
function getMberSettingDetail() {
$.ajax({
@@ -452,7 +464,7 @@ function getMberSettingDetail() {
async: false,
success: function (data) {
if (data.isSuccess) {
- // 발송금액 아래 등급별 가격안내 추가
+ // 발송금액 가격안내
$("#myPriceWrap").show();
}
else {
@@ -466,8 +478,8 @@ function getMberSettingDetail() {
}
$(document).ready(function (){
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
+ // 발송금액 단가표시
+ SetPriceWrapOpen();
$('.preiew_img').hide();
$('.prePhoto').hide();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index e4170654..ce78a56c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -449,6 +449,18 @@ function txtExport(event){
$("#txtFile").val("");
}
+// 발송금액 단가표시
+function SetPriceWrapOpen() {
+ var loginVO = '${LoginVO}';
+ //로그인 체크
+ if(loginVO == "" || loginVO == null){
+ }
+ else {
+ // 발송금액 가격안내
+ $("#myPriceWrap").show();
+ }
+}
+
//등급제 시행 ON/OFF 체크
function getMberSettingDetail() {
$.ajax({
@@ -459,7 +471,7 @@ function getMberSettingDetail() {
async: false,
success: function (data) {
if (data.isSuccess) {
- // 발송금액 아래 등급별 가격안내 추가
+ // 발송금액 가격안내
$("#myPriceWrap").show();
}
else {
@@ -473,8 +485,8 @@ function getMberSettingDetail() {
}
$(document).ready(function (){
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
+ // 발송금액 단가표시
+ SetPriceWrapOpen();
// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
var blineCodeYn = $("#blineCode").val();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
index 29125f10..37c08ca7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
@@ -593,6 +593,18 @@ function txtExport(event){
$("#txtFile").val("");
}
+//발송금액 단가표시
+function SetPriceWrapOpen() {
+ var loginVO = '${LoginVO}';
+ //로그인 체크
+ if(loginVO == "" || loginVO == null){
+ }
+ else {
+ // 발송금액 가격안내
+ $("#myPriceWrap").show();
+ }
+}
+
//등급제 시행 ON/OFF 체크
function getMberSettingDetail() {
$.ajax({
@@ -603,7 +615,7 @@ function getMberSettingDetail() {
async: false,
success: function (data) {
if (data.isSuccess) {
- // 발송금액 아래 등급별 가격안내 추가
+ // 발송금액 가격안내
$("#myPriceWrap").show();
}
else {
@@ -617,8 +629,8 @@ function getMberSettingDetail() {
}
$(document).ready(function (){
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
+ // 발송금액 단가표시
+ SetPriceWrapOpen();
// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
var blineCodeYn = $("#blineCode").val();
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
index caa11d9e..8b7d2c26 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
@@ -65,8 +65,8 @@ $(document).ready(function () {
$("#btnEstimate").trigger("click");
}
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
+ //등급제 시행 ON/OFF 체크(비로그인)
+ getMberSettingDetailByNotLogin();
// 등급제 대상 여부
getMberGrdChk();
@@ -341,11 +341,11 @@ function infoPop(pageUrl){
}
-//등급제 시행 ON/OFF 체크
-function getMberSettingDetail() {
+//등급제 시행 ON/OFF 체크(비로그인)
+function getMberSettingDetailByNotLogin() {
$.ajax({
type: "POST",
- url: "/web/grd/mberSettDetailAjax.do",
+ url: "/web/grd/mberSettDetailByNotLoginAjax.do",
data: {},
dataType:'json',
async: false,
From 70ff2a6a4ac98bd6dbe61625032aeec3ecff4269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
Date: Tue, 8 Aug 2023 11:02:00 +0900
Subject: [PATCH 2/6] =?UTF-8?q?2023/08/08=20=EC=98=88=EC=95=BD=EA=B4=80?=
=?UTF-8?q?=EB=A6=AC=20>=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp | 2 +-
.../WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp | 2 +-
.../WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp | 2 +-
.../WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
index 7c4931ec..1b9376b7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
@@ -301,7 +301,7 @@ $(document).ready(function(){
- | 발송 내역이 없습니다. |
+ 발송 내역이 없습니다. |
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
index fb195796..82f0bbc8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
@@ -240,7 +240,7 @@ $(document).ready(function(){
- | 발송 내역이 없습니다. |
+ 발송 내역이 없습니다. |
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
index 69b1f80f..863e0f21 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
@@ -227,7 +227,7 @@ $(document).ready(function(){
- | 발송 내역이 없습니다. |
+ 발송 내역이 없습니다. |
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
index 89ea37bf..968405dd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
@@ -244,7 +244,7 @@ function fnSearch(pageNo){
- | 발송 내역이 없습니다. |
+ 발송 내역이 없습니다. |
From 2b2e065ed736d964ee3b521d58926418cd0be1ce Mon Sep 17 00:00:00 2001
From: itn
Date: Tue, 8 Aug 2023 12:00:02 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?=
=?UTF-8?q?=EB=93=B1=EA=B8=89=20=ED=91=9C=EC=8B=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../let/sym/grd/service/MberGrdService.java | 3 ++
.../itn/let/sym/grd/service/MberGrdVO.java | 21 ++++++++
.../let/sym/grd/service/impl/MberGrdDAO.java | 5 ++
.../grd/service/impl/MberGrdServiceImpl.java | 9 ++++
.../let/sym/grd/web/MberGrdMngController.java | 50 +++++++++++++++++++
.../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 35 +++++++++++++
.../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 42 ++++++++++++++++
.../webapp/WEB-INF/jsp/web/pay/PayView.jsp | 31 ++----------
.../webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp | 32 ++----------
9 files changed, 173 insertions(+), 55 deletions(-)
diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java
index e2ec9adc..61134219 100644
--- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java
+++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java
@@ -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;
diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
index afb0d9fe..85f70561 100644
--- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
+++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
@@ -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;
}
}
diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
index 92b435d6..97b7644f 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
@@ -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);
diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
index 4fb60b84..b0886a26 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
@@ -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 {
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
index 408ecf4d..74474edb 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
@@ -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(
diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
index 60ce46ed..af9ffe33 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
@@ -303,6 +303,41 @@
]]>
+
+
+
";
$("#grdShowArea").html(sHtml);
$("#grdShowArea").show();
- $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)");
+ $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)");
+
+ // 문자(등급별 요금 안내)
+ $("#mberGrdSettingArea").show();
}
else {
//alert("Msg : " + data.msg);
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
index 776b1d14..e7699128 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
@@ -29,9 +29,6 @@ $(document).ready(function(){
$("#btnDdedicatedAccount").trigger("click");
}
- //등급제 시행 ON/OFF 체크
- getMberSettingDetail();
-
// 등급제 대상 여부
getMberGrdChk();
});
@@ -618,30 +615,6 @@ function TabTypePay(obj, tabId) {
setPriceMake();
}
-
-//등급제 시행 ON/OFF 체크
-function getMberSettingDetail() {
- $.ajax({
- type: "POST",
- url: "/web/grd/mberSettDetailAjax.do",
- data: {},
- dataType:'json',
- async: false,
- success: function (data) {
- if (data.isSuccess) {
- // 문자(등급별 요금 안내)
- $("#mberGrdSettingArea").show();
- }
- else {
- //alert("Msg : " + data.msg);
- }
- },
- error: function (e) {
- //alert("ERROR : " + JSON.stringify(e));
- }
- });
-}
-
// 등급제 대상 여부
function getMberGrdChk() {
$.ajax({
@@ -658,7 +631,10 @@ function getMberGrdChk() {
sHtml += "(누적결제액 : " + numberWithCommas(data.rtnMberGrdVO.totAmt) + "원)";
$("#grdShowArea").html(sHtml);
$("#grdShowArea").show();
- $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)");
+ $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)");
+
+ // 문자(등급별 요금 안내)
+ $("#mberGrdSettingArea").show();
}
else {
//alert("Msg : " + data.msg);
From 5e729eaeda551fbe8b969c6526d148bd6112fcdf Mon Sep 17 00:00:00 2001
From: itn
Date: Tue, 8 Aug 2023 12:15:11 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?=
=?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B8=88=EC=95=A1=ED=99=94=EB=A9=B0=EC=97=90?=
=?UTF-8?q?=20=EB=93=B1=EA=B8=89=EB=8B=A8=EA=B0=80=20=EC=BD=A4=EB=B3=B4?=
=?UTF-8?q?=EB=B0=95=EC=8A=A4=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index 4cb0ca52..278b17b7 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -550,7 +550,7 @@ function layerPopOpen(obj){
// 발송 금액 변경
if (obj == "price") {
//등급별 단가 정보
- //getMberGrdSettingList();
+ getMberGrdSettingList();
}
}
@@ -5540,12 +5540,10 @@ function kakaoATDelayCancel(msgGroupId){
-
| 단문 금액 |
|
From e8e0f02a4fc7165b64b53144f78199fd4a7f741d Mon Sep 17 00:00:00 2001
From: itn
Date: Tue, 8 Aug 2023 13:42:35 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?=
=?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=B0=B0=EB=84=88=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../let/sym/grd/web/MberGrdController.java | 43 +++++++++++++++----
.../WEB-INF/jsp/web/com/webCommonHeader.jsp | 39 +++++++++++++++--
2 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
index 270dc8ec..db65176b 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
@@ -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);
@@ -90,7 +90,7 @@ public class MberGrdController {
String msg = "";
try{
- LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
if (null != loginVO) {
MberGrdVO mberGrdVO1 = new MberGrdVO();
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
@@ -119,13 +119,38 @@ public class MberGrdController {
boolean isSuccess = false;
String msg = "";
-
+ MberGrdVO rtnMberGrdVO = new MberGrdVO();
+
try{
- MberGrdVO mberGrdVO1 = new MberGrdVO();
- mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
- if (mberGrdVO1.getGrdNoti().equals("Y")) {
- isSuccess = true;
- }
+ 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();
@@ -146,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());
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index a7e9ea54..63d13e71 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -106,8 +106,43 @@ $(document).ready(function (){
//등급제 대상 여부(헤더)
getMberGrdChk_Header();
}
+
+ var reqURL = "${pageContext.request.requestURL}";
+ var mainURL = "web/main/mainPage.do";
+ if (reqURL.lastIndexOf(mainURL) > -1) {
+ //등급제 시행 ON/OFF 체크(비로그인)
+ getMberSettingDetailByNotLogin();
+ }
+ else {
+ // 문자(등급별 요금 안내)
+ $("#priceTopBanner").hide();
+ }
+
});
+//등급제 시행 ON/OFF 체크(비로그인)
+function getMberSettingDetailByNotLogin() {
+ $.ajax({
+ type: "POST",
+ url: "/web/grd/mberSettDetailByNotLoginAjax.do",
+ data: {},
+ dataType:'json',
+ async: false,
+ success: function (data) {
+ if (data.isSuccess) {
+ // 문자(등급별 요금 안내)
+ $("#priceTopBanner").show();
+ }
+ else {
+ //alert("Msg : " + data.msg);
+ }
+ },
+ error: function (e) {
+ //alert("ERROR : " + JSON.stringify(e));
+ }
+ });
+}
+
//등급제 대상 여부
function getMberGrdChk_Header() {
$.ajax({
@@ -1086,12 +1121,10 @@ function actionLogin() {
-
From f2c9bc30fc9412a86be86080b1c6151023530c02 Mon Sep 17 00:00:00 2001
From: subsub
Date: Tue, 8 Aug 2023 16:41:57 +0900
Subject: [PATCH 6/6] =?UTF-8?q?2023/08/08=20=EB=A9=94=EC=9D=B8=EB=B9=84?=
=?UTF-8?q?=EC=A3=BC=EC=96=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 4 ++--
.../images/main/f_visual_01_20230808.jpg | Bin 0 -> 305351 bytes
.../images/main/f_visual_03_20230808.jpg | Bin 0 -> 358228 bytes
3 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 src/main/webapp/publish/images/main/f_visual_01_20230808.jpg
create mode 100644 src/main/webapp/publish/images/main/f_visual_03_20230808.jpg
diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index e05a8aa6..4e9450a4 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -1176,13 +1176,13 @@ function fn_click_banner_add_stat(bannerMenuCode){