diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java index 79237af2..79eda090 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -3905,7 +3905,7 @@ public class MjonMsgController { catch(Exception e) { isSuccess = false; msg = e.getMessage(); - } + } modelAndView.addObject("memPayStatInfo", memPayStatInfo); modelAndView.addObject("isSuccess", isSuccess); diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index a4feee45..5d1fea70 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -100,60 +100,81 @@ , E.CONFIRM_YN AS confirmYn , E.RCPT_TYPE AS rcptType , IFNULL(MP.POINT, '0') AS point - , EMI.EVENT_PG_MOID AS eventMoid - , mber.SMISHING_YN AS smishingYn - , mber.VIP_YN AS vipYn - , IFNULL(mber.BLINE_CODE, 'N') AS blineCode - , (SELECT COUNT(0) FROM MJ_PG SP - WHERE SP.PG_STATUS = 1 - AND SP.USER_ID = A.USER_ID - AND SP.REG_DATE >= DATE_ADD(NOW(), INTERVAL -1 YEAR)) AS oneYearPayCnt - , KGM.SVC_ID AS svcId - , KGM.TRADE_ID AS mrctTrdNo - , KGM.MOBILE_ID AS trdNo + , EMI.EVENT_PG_MOID AS eventMoid + , mber.SMISHING_YN AS smishingYn + , mber.VIP_YN AS vipYn + , IFNULL(mber.BLINE_CODE, 'N') AS blineCode + , (SELECT + COUNT(0) FROM MJ_PG SP + WHERE 1=1 + AND SP.PG_STATUS = 1 + AND SP.USER_ID = A.USER_ID + AND SP.REG_DATE >= DATE_ADD(NOW(), INTERVAL -1 YEAR) + ) AS oneYearPayCnt + , KGM.SVC_ID AS svcId + , KGM.TRADE_ID AS mrctTrdNo + , KGM.MOBILE_ID AS trdNo FROM MJ_PG A LEFT JOIN ( - SELECT CODE_NM - , CODE - , CODE_DC + SELECT + CODE_NM + , CODE + , CODE_DC FROM LETTCCMMNDETAILCODE WHERE 1=1 AND USE_AT = 'Y' AND CODE_ID = 'ITN036' ) B ON A.PAY_METHOD = B.CODE - LEFT JOIN - ( SELECT CODE_NM ,CODE ,CODE_DC - FROM LETTCCMMNDETAILCODE - WHERE USE_AT = 'Y' - AND CODE_ID = 'ITN037' - ) C ON A.PG_STATUS = C.CODE - LEFT JOIN - ( SELECT MOID, CONFIRM_YN, RCPT_TYPE - FROM MJ_TAX - WHERE RCPT_TYPE != '3' - ) E ON A.MOID = E.MOID - LEFT JOIN - ( SELECT CODE_NM ,CODE ,CODE_DC - FROM LETTCCMMNDETAILCODE - WHERE USE_AT = 'Y' - AND CODE_ID = 'ITN038' - ) D ON E.RCPT_TYPE = D.CODE - LEFT JOIN MJ_POINT MP - ON A.MOID = MP.ORDER_ID - - LEFT JOIN lettngnrlmber mber - ON A.USER_ID = mber.MBER_ID - - LEFT OUTER JOIN MJ_EVENT_MBER_INFO EMI - ON A.USER_ID = EMI.MBER_ID - AND A.MOID = EMI.EVENT_PG_MOID - - LEFT OUTER JOIN KGM_PG KGM - ON A.MOID = KGM.MOID - + LEFT JOIN + ( + SELECT + CODE_NM + , CODE + , CODE_DC + FROM + LETTCCMMNDETAILCODE + WHERE 1=1 + AND USE_AT = 'Y' + AND CODE_ID = 'ITN037' + ) C ON A.PG_STATUS = C.CODE + LEFT JOIN + ( + SELECT + MOID + , CONFIRM_YN + , RCPT_TYPE + FROM + MJ_TAX + WHERE 1=1 + + ) E ON A.MOID = E.MOID + LEFT JOIN + ( + SELECT + CODE_NM + , CODE + , CODE_DC + FROM + LETTCCMMNDETAILCODE + WHERE 1=1 + AND USE_AT = 'Y' + AND CODE_ID = 'ITN038' + ) D ON E.RCPT_TYPE = D.CODE + LEFT JOIN MJ_POINT MP + ON A.MOID = MP.ORDER_ID + + LEFT JOIN lettngnrlmber mber + ON A.USER_ID = mber.MBER_ID + + LEFT OUTER JOIN MJ_EVENT_MBER_INFO EMI + ON A.USER_ID = EMI.MBER_ID + AND A.MOID = EMI.EVENT_PG_MOID + + LEFT OUTER JOIN KGM_PG KGM + ON A.MOID = KGM.MOID WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp index 3f7095f6..3b4769d1 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp @@ -169,109 +169,30 @@ function sendMsgExcelDownload(){
-

''의 결제 리스트

-
- - <%--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
단문장문그림문자종합
정상수신(건)정상수신(금액)실패대기(건)실패대기(금액)정상수신(건)정상수신(금액)실패대기(건)실패대기(금액)정상수신(건)정상수신(금액)실패대기(건)실패대기(금액)정상수신(건)정상수신(금액)실패대기(건)실패대기(금액)
-
--%> -
- - - + + - - - " > - - -   ~ - - " - > - - + + " > + + +   ~ + + "> + + 타임아웃 아이콘 @@ -279,8 +200,6 @@ function sendMsgExcelDownload(){

총 건

- - 아이디 이름 할인 결제금액 - 결제수단 주문번호(PG사) - 결제폰번호 결제상태 - 영수증 + 의무발행 완료 여부 결제시간 - <%-- - - --%> - - - - - + + + + + + + + + + + - - 첫 결제 @@ -351,26 +268,43 @@ function sendMsgExcelDownload(){ }">(오류) - <%-- (오류) --%> - - + + + - - - <%-- --%> - - - + + + + + + + + + + + + + + + ○ + + + - + + + + + + - - - + +
@@ -380,13 +314,13 @@ function sendMsgExcelDownload(){
-
-
    - -
-
- - +
+
    + +
+
+ +