diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index d2c31e04..2a8012c5 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -200,6 +200,11 @@ public class MjonMsgVO extends ComDefaultVO{ private String searchDelayMsgYn; + private int succSendCnt; + private int failSendCnt; + private double succSendPrice; + private double failSendPrice; + public String getSearchDelayMsgYn() { return searchDelayMsgYn; } @@ -1595,4 +1600,28 @@ public class MjonMsgVO extends ComDefaultVO{ public void setFtSendCount(int ftSendCount) { this.ftSendCount = ftSendCount; } + public int getSuccSendCnt() { + return succSendCnt; + } + public void setSuccSendCnt(int succSendCnt) { + this.succSendCnt = succSendCnt; + } + public int getFailSendCnt() { + return failSendCnt; + } + public void setFailSendCnt(int failSendCnt) { + this.failSendCnt = failSendCnt; + } + public double getSuccSendPrice() { + return succSendPrice; + } + public void setSuccSendPrice(double succSendPrice) { + this.succSendPrice = succSendPrice; + } + public double getFailSendPrice() { + return failSendPrice; + } + public void setFailSendPrice(double failSendPrice) { + this.failSendPrice = failSendPrice; + } } diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java index f85c0057..e7be2267 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java @@ -79,6 +79,8 @@ public interface MjonMsgDataService { public List selectPayUserList(MjonMsgVO mjonMsgVO) throws Exception; + public List selectPayUserSWList(MjonMsgVO mjonMsgVO) throws Exception; + public List selectPayUserSumList(MjonMsgVO mjonMsgVO) throws Exception; // 중계사 시스템 발송 문자 내용 입력 diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java index e7291b58..2074193b 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java @@ -151,6 +151,11 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { return (List) list("mjonMsgDAO.selectPayUserList",mjonMsgVO); } + @SuppressWarnings("unchecked") + public List selectPayUserSWList(MjonMsgVO mjonMsgVO) throws Exception{ + return (List) list("mjonMsgDAO.selectPayUserSWList",mjonMsgVO); + } + @SuppressWarnings("unchecked") public List selectPayUserSumList(MjonMsgVO mjonMsgVO) throws Exception{ return (List) list("mjonMsgDAO.selectPayUserSumList",mjonMsgVO); diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index a56c069d..1f664607 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -1774,6 +1774,11 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M return mjonMsgDataDAO.selectPayUserList(mjonMsgVO); } + @Override + public List selectPayUserSWList(MjonMsgVO mjonMsgVO) throws Exception { + return mjonMsgDataDAO.selectPayUserSWList(mjonMsgVO); + } + @Override public List selectPayUserSumList(MjonMsgVO mjonMsgVO) throws Exception { return mjonMsgDataDAO.selectPayUserSumList(mjonMsgVO); 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 eca2dbcc..fd56d6c6 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2514,7 +2514,7 @@ public class MjonPayController { return "/web/pay/PayUserWithKakaoList"; } /** - * 요금사용내역 + * 요금사용내역 하단 리스트 영역 * @param mjonMsgVO * @param model * @return "/web/member/pay/PayUserListAjax.do" @@ -2557,6 +2557,129 @@ public class MjonPayController { return "/web/pay/PayUserListAjax"; } + + + + /** + * 요금사용내역 신규 화면 + * 2023.12.22 우영두 + * @param mjonMsgVO + * @param model + * @return "/web/member/pay/PayUserSWList.do" + * @throws Exception + */ + @RequestMapping(value= {"/web/member/pay/PayUserSWList.do"}) + public String PayUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO, + MjonPayVO mjonPayVO, + MberManageVO mberManageVO, RedirectAttributes redirectAttributes, + HttpServletRequest request, + ModelMap model) throws Exception{ + + /*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();*/ + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + + if(loginVO == null) { + //redirectAttributes.addFlashAttribute("message", "문자온 서비스는 로그인 후 이용 가능합니다."); + return "redirect:/web/user/login/login.do"; + } + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + mjonMsgVO.setUserId(userId); + + { // 충전캐시 + String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); + model.addAttribute("sumPayMoney", sumPayMoney); + } + + { // 충전포인트 + String sumPoint = mjonPayService.selectSumPoint(userId); + model.addAttribute("sumPoint", sumPoint); + } + + { // 총 사용금액 + mjonPayVO.setUserId(userId); + List usedCashTotList = mjonPayService.selectUsedCashWithKakaoTotCnt(mjonPayVO); + model.addAttribute("usedCashTotList", usedCashTotList); + } + { // 사용가능한 금액 + mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); + model.addAttribute("mberManageVO", mberManageVO); + } + + { // 발송건수 + mjonMsgVO.setReserveYn("N"); + List sendTotList = mjonMsgService.selectWithKakaoSendTotCnt(mjonMsgVO); + model.addAttribute("sendTotList", sendTotList); + } + + { // 예약건수 + mjonMsgVO.setReserveYn("Y"); + List reservToList = mjonMsgService.selectWithKakaoSendTotCnt(mjonMsgVO); + model.addAttribute("reservToList", reservToList); + } + + { + MjonCandidateVO mjonCandidateVO = new MjonCandidateVO(); + if("p".equals(mberManageVO.getDept())) { //개인회원 선거 후보자 정보 불러오기 + mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId); + if(mjonCandidateVO != null) { + mjonCandidateVO.setRegidentNo1(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo1())); + mjonCandidateVO.setRegidentNo2(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo2())); + } + } + model.addAttribute("mjonCandidateVO", mjonCandidateVO); + } + return "/web/pay/PayUserSWList"; + } + + + /** + * 요금사용내역 하단 리스트 영역 신규 화면 + * 2023.12.22 우영두 + * @param mjonMsgVO + * @param model + * @return "/web/member/pay/PayUserSWListAjax.do" + * @throws Exception + */ + @RequestMapping(value= {"/web/member/pay/PayUserSWListAjax.do"}) + public String PayUserSWListAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO, + HttpServletRequest request, + ModelMap model) throws Exception{ + + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + mjonMsgVO.setUserId(userId); + + if(mjonMsgVO.getPageUnit() != 10) { + mjonMsgVO.setPageUnit(mjonMsgVO.getPageUnit()); + } + + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(mjonMsgVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(mjonMsgVO.getPageUnit()); + paginationInfo.setPageSize(mjonMsgVO.getPageSize()); + + mjonMsgVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + mjonMsgVO.setLastIndex(paginationInfo.getLastRecordIndex()); + mjonMsgVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + mjonMsgVO.setSearchSortCnd("regDate"); + mjonMsgVO.setSearchSortOrd("desc"); + } + + + List payUserSWList = mjonMsgDataService.selectPayUserSWList(mjonMsgVO); + + paginationInfo.setTotalRecordCount(payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("payUserSWList", payUserSWList); + + return "/web/pay/PayUserSWListAjax"; + } + + + /** * 요금사용내역 - 카카오 테스트용 * @param mjonMsgVO diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 974c6425..fe5325c8 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3135,6 +3135,194 @@ LIMIT #recordCountPerPage# OFFSET #firstIndex# + + + + + +
+
+
+ 기간선택 +
+ + ~ + +
+ + + + + + * 조회기간의 사용내역만 보여집니다. + +
+
+
+
+
+ +
    +
    • +
    • +
    • +
    • +
    • +
    • + +
    • +
+ +
+
+ +
+ + + + + + +
+ +
+
+ + +
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp new file mode 100644 index 00000000..fbd6f933 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp @@ -0,0 +1,432 @@ +<%-- + Class Name : SendNumberList.jsp + Description : 발신번호 리스트 조회 페이지 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.03.31 신명섭 최초 생성 + + Copyright (C) 2009 by ITN All right reserved. +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> + + + + + +
+ " /> + " /> +
+

총 ${paginationInfo.totalRecordCount}건

+
+ + + +
+
+
+ + + <%-- --%> + + + + + + + <%-- + + + --%> + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + <%-- --%> + + + <%-- + + + --%> + <%-- + --%> + + + + + + + + + + +
+ + + + 발송일시 +
+ +
+ 		+ 문자유형 +
+ +
+ 		내용발송건수
성공 / 실패		사용반환(실패)
캐시캐시
+ + + +

+ 		+ + +

장문

+ + +

그림

+ + +

알림톡

+ + +

친구톡

+ + +

팩스

+ + +

단문

+ + + 		+

+ + + + + + + + + + + + + + +

+ 		+

+ + + + (매) + + / + <%-- + + () + --%> +

+ 		+

+ + +

+ 		+

+ + +

+ 		+

+ + +

+ 		+

+ + +

+ 		+

+ + +

+ 		+

+ + +

+ 		+

+ 0 +

+ 		+

+ + +

+ 		+

+ + +

+
+ 검색 결과가 없습니다. +
+
+
+
+ + + + +
+
+ + + + + + + + +
+
+ + + +
    + +
+ + +