Commit @d41c503de7f646210932bbc0c0af8530121bd80e

이호영 2025-10-15

Merge branch 'master' into 알림톡api

@d41c503de7f646210932bbc0c0af8530121bd80e

0b38493

d41c503

src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java

--- src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java

+++ src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java


 					v_ret	=	false;
 				}	
 				
+				// lettnloginlog 테이블에 insert 패턴 추가 (/web/user/login/usrIdCheckAjax.do) 
 			}else if(request.getRequestURI().indexOf("ListAjax.do")>-1
 					|| request.getRequestURI().indexOf("ViewAjax.do")>-1
 					|| request.getRequestURI().indexOf("DataAjax.do")>-1

 					|| request.getRequestURI().indexOf("MapUrl")>-1
 					|| request.getRequestURI().indexOf("uss/ion/fms/FmsFileInsertAjax")>-1
 					|| request.getRequestURI().indexOf("web/mjon/addr/sendExelFilePhoneNumAjax")>-1
+					|| request.getRequestURI().indexOf("/web/user/login/usrIdCheckAjax.do")>-1
 					
 					
 					

0b38493

d41c503

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 		Float totPrice = eachPrice * instCnt;
 		sendVO.setTotPrice(String.format("%.1f", totPrice));
 		
-		sendVO.setAtDelayYn(kakaoVO.getAtDelayYn()); 
+//		sendVO.setAtDelayYn(kakaoVO.getAtDelayYn()); 
+		sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn()); 
 		sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
 		sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
 		sendVO.setBizKakaoImageType(kakaoVO.getImageType());

0b38493

d41c503

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java


 
 				KakaoSendAdvcVO sendVO = groupedMsgList.get(0);
 
+//				log.info(" ++ kakaoVO.getAtSmishingYn() :: [{}]", kakaoVO.getAtSmishingYn());
+//				log.info(" ++ kakaoVO.getAtDelayYn() :: [{}]", kakaoVO.getAtDelayYn());
 /** @groupData 테이블 insert */
 				kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
 

0b38493

d41c503

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp


 													<c:out value="${ftSendCount}"/>
 			                            		</td>
 			                            		<td>
-			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
-													<c:out value="${supplyPrice}"/>		                            		
-		                            			</td>
-			                            		<td>
 			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
 													<c:out value="${totalPrice}"/>
 		                            			</td>

0b38493

d41c503

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

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

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp

...	...	@@ -545,6 +545,37 @@
545	545	</table>
546	546	<span class="reqTxt4">* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지.</span>
547	547
	548	+ <p class="tType1_title"><img src="/publish/images/content/icon_fee2.png" alt="알림톡 아이콘 이미지"> 친구톡</p>
	549	+ <table class="tType2">
	550	+ <colgroup>
	551	+ <col style="width: 20%;">
	552	+ <col style="width: 60%;">
	553	+ <col style="width: 20%;">
	554	+ </colgroup>
	555	+ <thead>
	556	+ <tr>
	557	+ <th>구분</th>
	558	+ <th>특징</th>
	559	+ <th>가격</th>
	560	+ </tr>
	561	+ </thead>
	562	+ <tbody>
	563	+ <tr>
	564	+ <th>친구톡(텍스트)</th>
	565	+ <td rowspan="3">카카오톡을 통해 채널 친구 대상으로 발송이 가능한 광고성 메시지<br />(1,000자 이하의 텍스트 및 이미지 발송 가능)</td>
	566	+ <td><span>13.8</span>원</td>
	567	+ </tr>
	568	+ <tr>
	569	+ <th>친구톡(이미지)</th>
	570	+ <td><span>19.9</span>원</td>
	571	+ </tr>
	572	+ <tr>
	573	+ <th>친구톡(와이드 이미지)</th>
	574	+ <td><span>22.9</span>원</td>
	575	+ </tr>
	576	+ </tbody>
	577	+ </table>
	578	+
548	579	<p class="tType1_title"><img src="/publish/images/content/icon_fee_fax.png" alt="팩스 아이콘 이미지"> 팩스</p>
549	580	<table class="tType2">
550	581	<colgroup>

0b38493

d41c503

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp


 		return;
 	};
 	
-	if(!fn_G_limitDateChk("startDate", 3)){
+	/* 검색 기간 3개월 제한 처리 */
+	/* if(!fn_G_limitDateChk("startDate", 3)){
 		return;
-	};
+	}; */
 	
 	document.listForm.pageIndex.value = pageNo;
 	var sendData= $(document.listForm).serializeArray();

Add a comment

Open 0
Closed 0

List

...	...	@@ -1892,7 +1892,8 @@
1892	1892	Float totPrice = eachPrice * instCnt;
1893	1893	sendVO.setTotPrice(String.format("%.1f", totPrice));
1894	1894
1895		- sendVO.setAtDelayYn(kakaoVO.getAtDelayYn());
	1895	+// sendVO.setAtDelayYn(kakaoVO.getAtDelayYn());
	1896	+ sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
1896	1897	sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
1897	1898	sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
1898	1899	sendVO.setBizKakaoImageType(kakaoVO.getImageType());

...	...	@@ -990,6 +990,8 @@
990	990
991	991	KakaoSendAdvcVO sendVO = groupedMsgList.get(0);
992	992
	993	+// log.info(" ++ kakaoVO.getAtSmishingYn() :: [{}]", kakaoVO.getAtSmishingYn());
	994	+// log.info(" ++ kakaoVO.getAtDelayYn() :: [{}]", kakaoVO.getAtDelayYn());
993	995	/** @groupData 테이블 insert */
994	996	kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
995	997

...	...	@@ -197,10 +197,6 @@
197	197	<c:out value="${ftSendCount}"/>
198	198	</td>
199	199	<td>
200		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
201		- <c:out value="${supplyPrice}"/>
202		- </td>
203		- <td>
204	200	<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
205	201	<c:out value="${totalPrice}"/>
206	202	</td>

...	...	@@ -90,9 +90,10 @@
90	90	return;
91	91	};
92	92
93		- if(!fn_G_limitDateChk("startDate", 3)){
	93	+ /* 검색 기간 3개월 제한 처리 */
	94	+ /* if(!fn_G_limitDateChk("startDate", 3)){
94	95	return;
95		- };
	96	+ }; */
96	97
97	98	document.listForm.pageIndex.value = pageNo;
98	99	var sendData= $(document.listForm).serializeArray();

...	...	@@ -61,6 +61,7 @@
61	61	v_ret = false;
62	62	}
63	63
	64	+ // lettnloginlog 테이블에 insert 패턴 추가 (/web/user/login/usrIdCheckAjax.do)
64	65	}else if(request.getRequestURI().indexOf("ListAjax.do")>-1
65	66	\|\| request.getRequestURI().indexOf("ViewAjax.do")>-1
66	67	\|\| request.getRequestURI().indexOf("DataAjax.do")>-1
...	...	@@ -74,6 +75,7 @@
74	75	\|\| request.getRequestURI().indexOf("MapUrl")>-1
75	76	\|\| request.getRequestURI().indexOf("uss/ion/fms/FmsFileInsertAjax")>-1
76	77	\|\| request.getRequestURI().indexOf("web/mjon/addr/sendExelFilePhoneNumAjax")>-1
	78	+ \|\| request.getRequestURI().indexOf("/web/user/login/usrIdCheckAjax.do")>-1
77	79
78	80
79	81

Delete comment