이지우 - 마이페이지 및 결제 작업 중
@846780c8c334217e92ac765cd6eb3f0daf00c0f1
--- src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
... | ... | @@ -278,6 +278,8 @@ |
| 278 | 278 |
try {
|
| 279 | 279 |
// 다음 결제시 결제수단 SELECT |
| 280 | 280 |
nextPayMethod = userManageService.selectNextPayMethod(userId); |
| 281 |
+ // 실제 마지막 결제 방식 - |
|
| 282 |
+ |
|
| 281 | 283 |
} |
| 282 | 284 |
catch(Exception e) {
|
| 283 | 285 |
isSuccess = false; |
--- src/main/java/itn/web/MainController.java
+++ src/main/java/itn/web/MainController.java
... | ... | @@ -12,6 +12,9 @@ |
| 12 | 12 |
import java.security.PublicKey; |
| 13 | 13 |
import java.security.spec.RSAPublicKeySpec; |
| 14 | 14 |
import java.text.SimpleDateFormat; |
| 15 |
+import java.time.LocalDate; |
|
| 16 |
+import java.time.format.DateTimeFormatter; |
|
| 17 |
+import java.time.temporal.ChronoUnit; |
|
| 15 | 18 |
import java.util.ArrayList; |
| 16 | 19 |
import java.util.Arrays; |
| 17 | 20 |
import java.util.Collections; |
... | ... | @@ -106,6 +109,7 @@ |
| 106 | 109 |
import itn.let.mjo.addr.service.AddrTransHistService; |
| 107 | 110 |
import itn.let.mjo.addr.service.AddrTransHistVO; |
| 108 | 111 |
import itn.let.mjo.event.service.MjonEventService; |
| 112 |
+import itn.let.mjo.event.service.MjonEventVO; |
|
| 109 | 113 |
import itn.let.mjo.kisa.service.KisaService; |
| 110 | 114 |
import itn.let.mjo.kisa.service.KisaVO; |
| 111 | 115 |
import itn.let.mjo.mjocommon.MjonForienIpChk; |
... | ... | @@ -130,6 +134,7 @@ |
| 130 | 134 |
import itn.let.sym.prm.service.EgovProgrmManageService; |
| 131 | 135 |
import itn.let.sym.prm.service.ProgrmManageVO; |
| 132 | 136 |
import itn.let.sym.site.service.EgovSiteManagerService; |
| 137 |
+import itn.let.sym.site.service.JoinSettingVO; |
|
| 133 | 138 |
import itn.let.sym.site.service.MetaTagVO; |
| 134 | 139 |
import itn.let.sym.site.service.SiteManagerVO; |
| 135 | 140 |
import itn.let.uss.umt.service.EgovMberManageService; |
... | ... | @@ -1256,6 +1261,38 @@ |
| 1256 | 1261 |
model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO));
|
| 1257 | 1262 |
} |
| 1258 | 1263 |
|
| 1264 |
+ /* |
|
| 1265 |
+ * 회원별 정보(단가), 기본 단가, 남은 이벤트 기간 조회 |
|
| 1266 |
+ * 2025.07.25 이지우 추가 |
|
| 1267 |
+ * */ |
|
| 1268 |
+ MberManageVO mberPriceVO = new MberManageVO(); |
|
| 1269 |
+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
|
| 1270 |
+ MjonEventVO mjonEventVO = new MjonEventVO(); |
|
| 1271 |
+ if(loginVO != null) {
|
|
| 1272 |
+ mberPriceVO = mberManageService.selectMber(loginVO.getId()); |
|
| 1273 |
+ if(!(mberPriceVO.getShortPrice() > 0)) mberPriceVO.setShortPrice(sysJoinSetVO.getShortPrice()); |
|
| 1274 |
+ if(!(mberPriceVO.getLongPrice() > 0)) mberPriceVO.setLongPrice(sysJoinSetVO.getLongPrice()); |
|
| 1275 |
+ if(!(mberPriceVO.getPicturePrice() > 0)) mberPriceVO.setPicturePrice(sysJoinSetVO.getPicturePrice()); |
|
| 1276 |
+ if(!(mberPriceVO.getPicture2Price() > 0)) mberPriceVO.setPicture2Price(sysJoinSetVO.getPicture2Price()); |
|
| 1277 |
+ if(!(mberPriceVO.getPicture3Price() > 0)) mberPriceVO.setPicture3Price(sysJoinSetVO.getPicture3Price()); |
|
| 1278 |
+ //카카오, 팩스는 기본단가 고정 |
|
| 1279 |
+ mberPriceVO.setKakaoAtPrice(sysJoinSetVO.getKakaoAtPrice()); |
|
| 1280 |
+ mberPriceVO.setFaxPrice(sysJoinSetVO.getFaxPrice()); |
|
| 1281 |
+ |
|
| 1282 |
+ mjonEventVO.setMberId(loginVO.getId()); |
|
| 1283 |
+ mjonEventVO = mjonEventService.selectEventMsgMberDefaultInfo(mjonEventVO); |
|
| 1284 |
+ String eventEndDateStr = ""; |
|
| 1285 |
+ if(StringUtil.isNotEmpty(mjonEventVO.getEventEndDate())) {
|
|
| 1286 |
+ eventEndDateStr = mjonEventVO.getEventEndDate(); |
|
| 1287 |
+ LocalDate today = LocalDate.now(); |
|
| 1288 |
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
| 1289 |
+ LocalDate eventEndDate = LocalDate.parse(eventEndDateStr, formatter); |
|
| 1290 |
+ long eventLeftDay = ChronoUnit.DAYS.between(today, eventEndDate); |
|
| 1291 |
+ model.addAttribute("eventLeftDay", eventLeftDay);
|
|
| 1292 |
+ } |
|
| 1293 |
+ |
|
| 1294 |
+ } |
|
| 1295 |
+ model.addAttribute("mberPriceVO", mberPriceVO);
|
|
| 1259 | 1296 |
return "web/com/webCommonHeader"; |
| 1260 | 1297 |
} |
| 1261 | 1298 |
|
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -1398,14 +1398,14 @@ |
| 1398 | 1398 |
<div class="inner"> |
| 1399 | 1399 |
<ul class="menu_left"> |
| 1400 | 1400 |
<li><a href="#" id="favorite" ><i class="hdTop_fav"></i>즐겨찾기추가</a></li> |
| 1401 |
- <li><a href="<c:out value='/web/user/mberInfoIndex.do'/>" ><i class="hdTop_mypage"></i>마이페이지</a></li> |
|
| 1402 |
- <li><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" ><i class="hdTop_center"></i>고객센터</a></li> |
|
| 1401 |
+ <li><a href="<c:out value='/web/user/mberInfoChange.do'/>" ><i class="hdTop_mypage"></i>마이페이지</a></li> |
|
| 1402 |
+ <li><a href="<c:out value='/web/cop/bbs/QnaList.do'/>" ><i class="hdTop_center"></i>1:1 문의</a></li> |
|
| 1403 | 1403 |
</ul> |
| 1404 | 1404 |
<ul class="menu_right"> |
| 1405 | 1405 |
<li><a href="#" onclick="location.href='/web/member/pay/PayView.do'" >충전하기</a></li> |
| 1406 | 1406 |
<li class="SortLine"><a href="/web/pay/PayGuide.do" >요금안내</a></li> |
| 1407 | 1407 |
<li class="SortLine"><a href="/web/cop/bbs/FaqList.do" >이용안내</a></li> |
| 1408 |
- <li class="SortLine"><a href="/web/cop/bbs/QnaList.do" >1:1 문의</a></li> |
|
| 1408 |
+ <li class="SortLine"><a href="/web/cop/bbs/NoticeList.do" >고객센터</a></li> |
|
| 1409 | 1409 |
<li class="SortLine"><a href="/web/cop/bbs/SuggestList.do" >불편신고</a></li> |
| 1410 | 1410 |
</ul> |
| 1411 | 1411 |
</div> |
... | ... | @@ -1627,7 +1627,9 @@ |
| 1627 | 1627 |
</li> |
| 1628 | 1628 |
<li> |
| 1629 | 1629 |
<dl> |
| 1630 |
- <dt><a href="<c:out value='/web/user/mberInfoIndex.do'/>" >마이페이지</a></dt> |
|
| 1630 |
+ <%-- 250724 마이페이지 대시보드 삭제 --%> |
|
| 1631 |
+ <%-- <dt><a href="<c:out value='/web/user/mberInfoIndex.do'/>" >마이페이지</a></dt> --%> |
|
| 1632 |
+ <dt><a href="<c:out value='/web/user/mberInfoChange.do'/>" >마이페이지</a></dt> |
|
| 1631 | 1633 |
<dd> |
| 1632 | 1634 |
<ul> |
| 1633 | 1635 |
<li><a href="<c:out value='/web/user/mberInfoChange.do'/>" >회원정보 변경</a></li> |
... | ... | @@ -1744,8 +1746,9 @@ |
| 1744 | 1746 |
<div class="login_left"> |
| 1745 | 1747 |
<div class="login_info"> |
| 1746 | 1748 |
<input type="hidden" id="loginId" name="loginId" value="${LoginVO.id}">
|
| 1747 |
- <i><img src="/publish/images/mypageIcon2.png" id="commonHeaderGradeIcon" /></i> |
|
| 1749 |
+ <!-- <i><img src="/publish/images/mypageIcon2.png" id="commonHeaderGradeIcon" /></i> --> |
|
| 1748 | 1750 |
<div class="login2_name" onclick="location.href='/web/user/mberInfoChange.do'" style="cursor:pointer;"> |
| 1751 |
+ <i class="icon_user"></i> |
|
| 1749 | 1752 |
<p><c:out value="${LoginVO.name}"/></p>
|
| 1750 | 1753 |
<c:choose> |
| 1751 | 1754 |
<c:when test="${LoginVO.dept == 'p'}">
|
... | ... | @@ -1765,8 +1768,8 @@ |
| 1765 | 1768 |
<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘"> |
| 1766 | 1769 |
</a> --> |
| 1767 | 1770 |
</div> |
| 1768 |
- <button type="button" class="btnType btnType3" onclick="location.href='/web/user/mberInfoIndex.do'">마이페이지</button> |
|
| 1769 |
- <button type="button" class="btnType btnType2" onclick="location.href='/web/uat/uia/actionLogout.do'">로그아웃</button> |
|
| 1771 |
+ <!-- <button type="button" class="btnType btnType3" onclick="location.href='/web/user/mberInfoIndex.do'">마이페이지</button> --> |
|
| 1772 |
+ <button type="button" class="btnType btn_36 fill_gray" onclick="location.href='/web/uat/uia/actionLogout.do'">로그아웃</button> |
|
| 1770 | 1773 |
|
| 1771 | 1774 |
|
| 1772 | 1775 |
<div class="security_box"> |
... | ... | @@ -1778,26 +1781,80 @@ |
| 1778 | 1781 |
</div> |
| 1779 | 1782 |
<div class="login_pay"> |
| 1780 | 1783 |
<div class="check_money"> |
| 1781 |
- <div class="holdingsum_box"> |
|
| 1784 |
+ <div class="holdingsum_box"> |
|
| 1782 | 1785 |
<i></i> |
| 1786 |
+ <div class="user_money_wrap"> |
|
| 1787 |
+ 보유잔액 |
|
| 1788 |
+ <div class="hover_content_wrap"> |
|
| 1789 |
+ <i class="qmMark">?</i> |
|
| 1790 |
+ <div class="hover_content"> |
|
| 1791 |
+ <p class="hover_content_title"> |
|
| 1792 |
+ <img src="/publish/images/content/icon_mypage_message.png" alt=""> 나의단가 <span>(발송가능 건수)</span> |
|
| 1793 |
+ </p> |
|
| 1794 |
+ <ul class="send_available_number"> |
|
| 1795 |
+ <li> |
|
| 1796 |
+ <p class="title">· 단문</p> |
|
| 1797 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.shortPrice}" var="shortPrice" />
|
|
| 1798 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${shortPrice}"/></span>원
|
|
| 1799 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.shortPrice)}" var="shotCnt" />
|
|
| 1800 |
+ (<c:out value="${shotCnt}"/>건)</p>
|
|
| 1801 |
+ </li> |
|
| 1802 |
+ <li> |
|
| 1803 |
+ <p class="title">· 장문</p> |
|
| 1804 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.longPrice}" var="longPrice" />
|
|
| 1805 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${longPrice}"/></span>원
|
|
| 1806 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.longPrice)}" var="longCnt" />
|
|
| 1807 |
+ (<c:out value="${longCnt}"/>건)</p>
|
|
| 1808 |
+ </li> |
|
| 1809 |
+ <li> |
|
| 1810 |
+ <p class="title">· 그림(1장)</p> |
|
| 1811 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.picturePrice}" var="picturePrice" />
|
|
| 1812 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${picturePrice}"/></span>원
|
|
| 1813 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.picturePrice)}" var="pictureCnt" />
|
|
| 1814 |
+ (<c:out value="${pictureCnt}"/>건)</p>
|
|
| 1815 |
+ </li> |
|
| 1816 |
+ <li> |
|
| 1817 |
+ <p class="title">· 그림(2장)</p> |
|
| 1818 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.picture2Price}" var="picture2Price" />
|
|
| 1819 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${picture2Price}"/></span>원
|
|
| 1820 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.picture2Price)}" var="picture2Cnt" />
|
|
| 1821 |
+ (<c:out value="${picture2Cnt}"/>건)</p>
|
|
| 1822 |
+ </li> |
|
| 1823 |
+ <li> |
|
| 1824 |
+ <p class="title">· 그림(3장)</p> |
|
| 1825 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.picture3Price}" var="picture3Price" />
|
|
| 1826 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${picture3Price}"/></span>원
|
|
| 1827 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.picture3Price)}" var="picture3Cnt" />
|
|
| 1828 |
+ (<c:out value="${picture3Cnt}"/>건)</p>
|
|
| 1829 |
+ </li> |
|
| 1830 |
+ <li> |
|
| 1831 |
+ <p class="title">· 알림톡</p> |
|
| 1832 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.kakaoAtPrice}" var="kakaoAtPrice" />
|
|
| 1833 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${kakaoAtPrice}"/></span>원
|
|
| 1834 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.kakaoAtPrice)}" var="kakaoAtCnt" />
|
|
| 1835 |
+ (<c:out value="${kakaoAtCnt}"/>건)</p>
|
|
| 1836 |
+ </li> |
|
| 1837 |
+ <li> |
|
| 1838 |
+ <p class="title">· 팩스</p> |
|
| 1839 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${mberPriceVO.faxPrice}" var="faxPrice" />
|
|
| 1840 |
+ <p class="number"><span class="c_002c9a fwBold"><c:out value="${faxPrice}"/></span>원
|
|
| 1841 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${Math.floor(userMoney / mberPriceVO.faxPrice)}" var="faxCnt" />
|
|
| 1842 |
+ (<c:out value="${faxCnt}"/>건)</p>
|
|
| 1843 |
+ </li> |
|
| 1844 |
+ </ul> |
|
| 1845 |
+ <c:if test="${prePaymentYn eq 'Y' and (not empty eventLeftDay and eventLeftDay > 0)}">
|
|
| 1846 |
+ <p class="event_term">이벤트 적용중 <span class="fwBold">D-${eventLeftDay}</span></p>
|
|
| 1847 |
+ </c:if> |
|
| 1848 |
+ <c:if test="${prePaymentYn eq 'N'}">
|
|
| 1849 |
+ <p class="event_term">후불제(매월 1일 자동충전)</p> |
|
| 1850 |
+ </c:if> |
|
| 1851 |
+ </div> |
|
| 1852 |
+ </div> |
|
| 1783 | 1853 |
<fmt:formatNumber type="number" maxFractionDigits="3" value="${userMoney}" var="commaPrice" />
|
| 1784 |
- <p>보유잔액<!-- <em>(캐시)</em> --> <span class="fwMd" id="hdUserMoney"><c:out value="${commaPrice}"/></span>원</p>
|
|
| 1785 |
- <c:if test="${prePaymentYn eq 'N'}">
|
|
| 1786 |
- <dl> |
|
| 1787 |
- <dd>후불제 고객의 보유잔액(캐시)은 당월 발송 가능<br>금액을 말하며 <span>매월 1일 자동으로 충전</span>됩니다.</dd> |
|
| 1788 |
- </dl> |
|
| 1789 |
- </c:if> |
|
| 1790 |
- </div> |
|
| 1854 |
+ <span class="fwMd" id="hdUserMoney"><c:out value="${commaPrice}"/></span>원
|
|
| 1855 |
+ </ > |
|
| 1856 |
+ </div> |
|
| 1791 | 1857 |
<button type="button" class="btnType btnType3" onclick="location.href='/web/member/pay/PayView.do'">충전</button> |
| 1792 |
- <div class="account_box"> |
|
| 1793 |
- <button type="button" class="btnType btnType3" onclick="location.href='/web/member/pay/PayView.do?tabType=2'">전용계좌</button> |
|
| 1794 |
- <c:if test="${not empty myBankList}">
|
|
| 1795 |
- <dl> |
|
| 1796 |
- <dt>전용계좌</dt> |
|
| 1797 |
- <dd><c:out value="${myBankList[0].codeNm}"/> <c:out value="${myBankList[0].acctNo}"/></dd>
|
|
| 1798 |
- </dl> |
|
| 1799 |
- </c:if> |
|
| 1800 |
- </div> |
|
| 1801 | 1858 |
</div> |
| 1802 | 1859 |
<div class="point"> |
| 1803 | 1860 |
<i></i> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?