From f4faea96f6dbfd87c57224025c33fb613f51303f Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 22 Aug 2023 14:39:27 +0900 Subject: [PATCH] =?UTF-8?q?=EB=88=84=EC=A0=81=EA=B2=B0=EC=A0=9C=EC=95=A1?= =?UTF-8?q?=20=EC=84=B8=EB=B6=80=EB=82=B4=EC=97=AD=20=ED=99=98=EB=B6=88?= =?UTF-8?q?=EA=B8=88=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/mjo/pay/web/MjonPayController.java | 2 ++ .../let/sym/grd/service/MberGrdService.java | 5 +++- .../let/sym/grd/service/impl/MberGrdDAO.java | 9 +++++-- .../grd/service/impl/MberGrdServiceImpl.java | 13 ++++++++-- .../let/sym/grd/web/MberGrdController.java | 6 ++++- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 24 +++++++++++++++---- .../jsp/web/grd/MberGrdHistListAjax.jsp | 10 ++++---- 7 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index d967b1c4..e7e13472 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1906,6 +1906,7 @@ public class MjonPayController { model.addAttribute("mjonCandidateVO", mjonCandidateVO); + /* if(pattern.equals("/web/member/pay/PayListAllAjax.do")) { // 등급제 Start // 회원별 등급 적용 @@ -1916,6 +1917,7 @@ public class MjonPayController { mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO); // End } + */ if(pattern.equals("/web/member/pay/PayListAllAjax.do") || pattern.equals("/web/member/pay/PayListMobileAjax.do") 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 92351db3..c7f6c9d7 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java @@ -110,7 +110,10 @@ public interface MberGrdService { int selectMberGrdSaveCnt(String mberId) throws Exception; // 회원별 등급제 기간내, 최종결제이후 환불총금액 - int selectMberGrdRefundSum(String mberId) throws Exception; + int selectMberGrdRefundSumAfterLastPay(String mberId) throws Exception; + + // 회원별 등급제 기간내, 최종결제이전 환불총금액 + int selectMberGrdRefundSumBeforeLastPay(String mberId) throws Exception; // 회원별 등급 히스토리 등록 public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception; 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 8eda6f47..9ea3449f 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 @@ -159,10 +159,15 @@ public class MberGrdDAO extends EgovAbstractDAO { } // 회원별 등급제 기간내, 최종결제이후 환불총금액 - public int selectMberGrdRefundSum(String mberId) throws Exception{ - return (int) select("mberGrdDAO.selectMberGrdRefundSum", mberId); + public int selectMberGrdRefundSumAfterLastPay(String mberId) throws Exception{ + return (int) select("mberGrdDAO.selectMberGrdRefundSumAfterLastPay", mberId); } + // 회원별 등급제 기간내, 최종결제이전 환불총금액 + public int selectMberGrdRefundSumBeforeLastPay(String mberId) throws Exception{ + return (int) select("mberGrdDAO.selectMberGrdRefundSumBeforeLastPay", mberId); + } + // 회원별 등급 히스토리 등록 public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception{ insert("mberGrdDAO.insertMberGrdHist", 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 39b4ae06..4c47aca2 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 @@ -518,13 +518,22 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG // 회원별 등급제 기간내, 최종결제이후 환불총금액 @Override - public int selectMberGrdRefundSum(String mberId) throws Exception{ + public int selectMberGrdRefundSumAfterLastPay(String mberId) throws Exception{ // 공백제거 mberId = mberId.trim(); - return mberGrdDAO.selectMberGrdRefundSum(mberId); + return mberGrdDAO.selectMberGrdRefundSumAfterLastPay(mberId); } + // 회원별 등급제 기간내, 최종결제이전 환불총금액 + @Override + public int selectMberGrdRefundSumBeforeLastPay(String mberId) throws Exception{ + // 공백제거 + mberId = mberId.trim(); + + return mberGrdDAO.selectMberGrdRefundSumBeforeLastPay(mberId); + } + // 회원별 등급 히스토리 등록 @Override public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception { 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 218957a9..1211bafb 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -67,7 +67,10 @@ public class MberGrdController { } // 회원별 등급제 기간내, 최종결제이후 환불총금액 - int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSum(mberGrdVO.getMberId()); + int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSumAfterLastPay(mberGrdVO.getMberId()); + + // 회원별 등급제 기간내, 최종결제이전 환불총금액 + int refundSumBeforeLastPay = mberGrdService.selectMberGrdRefundSumBeforeLastPay(mberGrdVO.getMberId()); List mberGrdHistList = mberGrdService.selectMberGrdHistByGrdDateList(mberGrdVO); @@ -78,6 +81,7 @@ public class MberGrdController { model.addAttribute("grdSetNm", mberGrdVO.getGrdSetNm()); model.addAttribute("totAmt", mberGrdVO.getTotAmt()); model.addAttribute("refundSumAfterLastPay", refundSumAfterLastPay); + model.addAttribute("refundSumBeforeLastPay", refundSumBeforeLastPay); return "/web/grd/MberGrdHistListAjax"; } 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 6b52f2d1..a39c6262 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 @@ -439,7 +439,7 @@ ) S2 ) M WHERE M.GRD_SET_NO IS NOT NULL - AND M.AMT_SUM > 0 + /*AND M.AMT_SUM > 0*/ LIMIT 1 ]]> @@ -665,7 +665,7 @@ ) S2 ) M WHERE M.GRD_SET_NO IS NOT NULL - AND M.AMT_SUM > 0 + /*AND M.AMT_SUM > 0*/ ) B ON A.MBER_ID = B.USER_ID INNER JOIN MJ_MBER_GRD_SETTING C @@ -734,7 +734,7 @@ ) S2 ) M WHERE M.GRD_SET_NO IS NOT NULL - AND M.AMT_SUM > 0 + /*AND M.AMT_SUM > 0*/ ) B ON A.MBER_ID = B.USER_ID INNER JOIN MJ_MBER_GRD_SETTING C @@ -951,7 +951,8 @@ - + = (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#) AND R.REFUND_HANDLE_PNTTM >= (SELECT MAX(S.REG_DATE) FROM MJ_PG S WHERE S.USER_ID = #mberId# AND S.PG_STATUS = '1') + ]]> + + + INSERT INTO MJ_MBER_GRD_HIST diff --git a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp index c0ce3b2d..8a4835a5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp @@ -63,17 +63,17 @@ $(document).ready(function(){ - - - - + + + + - +
구분 결제일시 결제금액누적금액누적금액(환불차감) 등급