tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2024-07-10 18:33:30 +09:00
commit 38fa6d56a8
15 changed files with 137 additions and 1521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
View File

@ -176,7 +176,13 @@ public class KakaoStepInfoController {
public String kakaoAlimtalkIntrdView(HttpServletRequest request,
@ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , BoardVO boardVO ,
RedirectAttributes redirectAttributes) throws Exception {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(userId == "") {
return "redirect:/web/user/login/login.do";
}
model.addAttribute("loginVO", loginVO);
return "/web/kakao/intrd/KakaoAllimtalkIntro";
}

1484
src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
View File

File diff suppressed because it is too large Load Diff

15
src/main/java/itn/let/mjo/pay/web/MjonPayController.java
View File

@ -2119,11 +2119,7 @@ public class MjonPayController {
// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
System.out.println("???");
System.out.println("mjonPayVO.getStartDate() :: "+mjonPayVO.getStartDate());
System.out.println("mjonPayVO.getEndDate() :: "+mjonPayVO.getEndDate());
if(!DateUtils.dateChkAndValueChk(mjonPayVO.getStartDate(),mjonPayVO.getEndDate(), 12 )) {
System.out.println("???");
mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365));
mjonPayVO.setEndDate(DateUtils.getCurrentDate());
};
@ -2132,6 +2128,10 @@ public class MjonPayController {
//결제 리스트 정보 불러오기
List<MjonPayVO> resultList = mjonPayService.selectPayList(mjonPayVO);
model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0);
model.addAttribute("resultList", resultList);
paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
model.addAttribute("paginationInfo", paginationInfo);
@ -2203,6 +2203,13 @@ public class MjonPayController {
model.addAttribute("resultList", resultList);
paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0);
// String requestUri = request.getRequestURI();
// String fileName = requestUri.substring(requestUri.lastIndexOf('/') + 1);
//
// model.addAttribute("fileName", fileName);
return "/web/pay/PayListPointAjax";

2
src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
View File

@ -27,6 +27,7 @@
<select id="mjonPayDAO.selectPayList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
SELECT
COUNT(A.MOID) OVER() AS totCnt
, SUM(A.cash) OVER() AS totChgPay
, A.MOID AS moid
, A.PG_CODE AS pgCode
, A.PG_STATUS AS pgStatus
@ -1179,6 +1180,7 @@
<select id="mjonPayDAO.selectPointUseList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
SELECT
COUNT(POINT_USE_ID) OVER() AS totCnt,
SUM(A.POINT) OVER() AS totChgPay,
A.POINT_USE_ID AS pointUseId,
A.POINT_ID AS pointId,
A.USER_ID AS userId,

48
src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
View File

@ -68,6 +68,8 @@ function usrDeptChk(){
var usrDept = '${loginVO.dept}';
console.log('usrDept : ', usrDept);
//카카오 알림톡 기업회원 전용체크
if(usrDept != 'c'){
@ -82,7 +84,53 @@ function usrDeptChk(){
}
/**
* @discripton : 카톡발송 > 알림톡 소개 하단에 버튼 액션
* 기업회원 체크
*/
function cntntBtnInfo(stepInfo){
//기업회원 여부 체크
if(usrDeptChk()){
if(stepInfo == 'step02'){
location.href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>";
}else if(stepInfo == 'step03'){
location.href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>";
}
}
}
//step 02
//<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>
// step 03
// <c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>
</script>
<!-- 기업회원 이동 팝업 -->
<div class="tooltip-wrap cvt_member_popup_wrap">
<div class="popup-com cvt_member_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close">
<div class="popup_heading">
<p>알림</p>
<button type="button" class="tooltip-close" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<p>카카오톡 알림톡은 기업회원만 전송 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
<div class="popup_btn_wrap2">
<button type="button" onclick="location.href='/web/user/membershipChange.do'">확인</button>
<button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">취소</button>
</div>
</div>
</div>
</div>
<button type="button" id="btnDeptPop" data-tooltip="popup02" style="display: none;"></button>
<ul class="tabType4">
<li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li>
<li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li>

9
src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp
View File

@ -35,9 +35,13 @@ function fnLinkPageTab(tabInfo){
var url = "";
if(tabInfo == 'tabSms'){
url = "<c:url value='/web/mjon/msgsent/selectMsgSentView.do'/>";
}else if(tabInfo == 'tabKakao'){
}
else if(tabInfo == 'tabKakao'){
url = "<c:url value='/web/kakao/sent/selectKakaoSentView.do'/>";
}
else if(tabInfo == 'tabFax'){
url = "<c:url value='/web/mjon/fax/faxSendList.do'/>";
}
form.action =url;
form.submit();
@ -54,4 +58,7 @@ function fnLinkPageTab(tabInfo){
<li class="tab topTab" id="kakaoTab">
<button type="button" onclick="javascript:fnLinkPageTab('tabKakao');return false;">카카오톡</button>
</li>
<li class="tab topTab" id="faxTab">
<button type="button" onclick="javascript:fnLinkPageTab('tabFax');return false;">카카오톡</button>
</li>
</ul>

6
src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp
View File

@ -203,7 +203,8 @@
</div>
<div class="text">
<div class="btn">
<a href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
<%-- <a href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a> --%>
<a href="javascript:cntntBtnInfo('step02');">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
</div>
<div class="text-line"></div>
<div class="type">
@ -225,7 +226,8 @@
</div>
<div class="text">
<div class="btn">
<a href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
<%-- <a href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a> --%>
<a href="javascript:cntntBtnInfo('step03');">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
</div>
<div class="text-line"></div>
<div class="type">

18
src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp
View File

@ -54,24 +54,6 @@ function fnGoFriends(){
<input type="hidden" id="menuSubTab" name="menuSubTab" value="tabStep">
</form>
<!-- 기업회원 이동 팝업 -->
<div class="tooltip-wrap cvt_member_popup_wrap">
<div class="popup-com cvt_member_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close">
<div class="popup_heading">
<p>알림</p>
<button type="button" class="tooltip-close" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<p>카카오톡 알림톡은 기업회원만 전송 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
<div class="popup_btn_wrap2">
<button type="button" onclick="location.href='/web/user/membershipChange.do'">확인</button>
<button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">취소</button>
</div>
</div>
</div>
</div>
<button type="button" id="btnDeptPop" data-tooltip="popup02" style="display: none;"></button>
<!-- content 영역 -->
<div class="inner">
<!-- send top -->

4
src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
View File

@ -608,7 +608,7 @@
<tbody>
<tr>
<th scope="row"><span class="essential">*</span>성명</th>
<td><input type="text" id="taxCNm" value="<c:out value="${mberManageVO.taxCNm}" />" /></td>
<td><input type="text" id="taxCNm" maxlength="5" value="<c:out value="${mberManageVO.taxCNm}" />" /></td>
</tr>
<tr>
<th scope="row"><span class="essential">*</span>주민등록번호</th>
@ -616,7 +616,7 @@
</tr>
<tr>
<th scope="row"><span class="essential">*</span>주소</th>
<td><input type="text" id="taxCAddr" value="<c:out value="${mberManageVO.taxCAddr}" />" style="width:80%;"/></td>
<td><input type="text" id="taxCAddr" maxlength="65" value="<c:out value="${mberManageVO.taxCAddr}" />" style="width:80%;"/></td>
</tr>
</tbody>
</table>

9
src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
View File

@ -316,7 +316,10 @@ function inputNumberFormatPay(obj) {
function inputPagesNumberFormatPay(obj) {
$(obj).val($(obj).val().replace(/[^0-9]/g,""));
$('#casePage').val(numberWithCommas(obj.value));
$(obj).val(numberWithCommas(obj.value));
}
function inputPagesNumber(obj) {
$(obj).val($(obj).val().replace(/[^0-9]/g,""));
}
function fn_gunClear(){
@ -720,7 +723,7 @@ function getMberGrdChk() {
<th>연락처</th>
<td>
<label for="" class="label">연락처 입력</label>
<input type="text" id="mobile" name="mobile" style="width: 400px;">
<input type="text" onkeyup="inputPagesNumber(this)"; maxlength="11" id="mobile" name="mobile" style="width: 400px;">
</td>
</tr>
<tr>
@ -757,7 +760,7 @@ function getMberGrdChk() {
<th>건수</th>
<td class="publish_btn">
<label for="" class="label">건수 입력</label>
<input type="text" id="caseNumber" name="caseNumber" style="width: 210px;" onkeyup="inputNumberFormatPay(this)">
<input type="text" id="caseNumber" numberOnly maxlength="10" name="caseNumber" style="width: 210px;" onkeyup="inputNumberFormatPay(this)">
<p class="input_in">건</p>
<div>
<button type="button" class="btnType" id="btnItemAdd">품목추가<i class="arrow_img"></i></button>

20
src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
View File

@ -187,6 +187,26 @@ function fnShowRefundPrintPopup(){
<div class="heading">
<h2>요금결제내역</h2>
</div>
<div class="hisroy_price">
<div class="hisroy_price_in">
<p>
<i></i>충전금액
</p>
<div class="clearfix">
<p id="cashTitId">
캐시
</p>
<p>
<span id="cashTxtId">
</span>원
</p>
</div>
</div>
</div>
<div class="pay_tab_wrap">
<!-- tab button -->
<c:choose>

7
src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
View File

@ -19,6 +19,13 @@
<script src="/publish/js/content.js"></script>
<script>
$(document).ready(function(){
// 충전금액 캐시 노출
$('.hisroy_price').show();
var totChgPay = '${totChgPay}';
$('#cashTxtId').empty().text(totChgPay.replace(/\B(?=(\d{3})+(?!\d))/g, ','));
$('#cashTitId').text("캐시")
/* 목록 정렬 항목 아이콘 표시 */
var searchSortCnd = $("[name='searchSortCnd']").val();
var searchSortOrd = $("[name='searchSortOrd']").val();

10
src/main/webapp/WEB-INF/jsp/web/pay/PayListPointAjax.jsp
View File

@ -19,6 +19,16 @@
<script src="/publish/js/content.js"></script>
<script>
$(document).ready(function(){
$('.hisroy_price').show();
var totChgPay = '${totChgPay}';
$('#cashTxtId').text(totChgPay.replace(/\B(?=(\d{3})+(?!\d))/g, ','));
$('#cashTitId').text("포인트")
var pathname = window.location.pathname;
var fileName = pathname.substring(pathname.lastIndexOf('/') + 1);
console.log("Current File Name is: " + fileName);
/* 목록 정렬 항목 아이콘 표시 */
var searchSortCnd = $("[name='searchSortCnd']").val();
var searchSortOrd = $("[name='searchSortOrd']").val();

3
src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp
View File

@ -32,6 +32,9 @@ var userMoney = 0; // 보유Cash
var refundMoneySum = 0; // 환불신청금액(환불요청 상태)
$(document).ready(function() {
$('.hisroy_price').hide();
$('#refundMoney').keyup(function(e){
var money = $(this).val().replace(/,/gi, "");

15
src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
View File

@ -24,7 +24,6 @@ $(document).ready(function(){
// 사용금액 캐시 노출
var succPrice = '${totSuccSendPrice}';
console.log('succPrice.toLocaleString("ko-KR") : ', succPrice.toLocaleString('ko-KR'));
$('#cashTxtId').text(succPrice.replace(/\B(?=(\d{3})+(?!\d))/g, ','));
@ -236,7 +235,7 @@ function fnShowPdfPrintPopup(){
<col style="width: 15%;">
<col style="width: 15%;">
<col style="width: 20%;">
<col style="width: 20%;">
<%-- <col style="width: 20%;"> --%>
<%-- <col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 10%;">
@ -265,13 +264,14 @@ function fnShowPdfPrintPopup(){
<!-- <th colspan="2">충전</th>
<th colspan="2">사용</th>
<th colspan="2">잔액</th> -->
<th colspan="2">사용</th>
<!-- <th colspan="2">사용</th> -->
<th>사용</th>
<!-- <th>반환(실패)</th> -->
<!-- <th colspan="2">잔액</th> -->
</tr>
<tr>
<th>충전금</th>
<th>포인트</th>
<!-- <th>포인트</th> -->
<!-- <th>캐시</th> -->
<!-- <th>포인트</th> -->
<!-- <th>충전금</th>
@ -350,13 +350,6 @@ function fnShowPdfPrintPopup(){
<c:out value="${succCash}"/>
</p>
</td>
<td>
<p class="fwRg c_002c9a">
<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.befPoint}" var="befPoint" />
<c:out value="${befPoint}"/> --%>
0
</p>
</td>
<%-- <td>
<p class="fwRg c_002c9a">
<fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.failSendPrice}" var="failPrice" />