Commit @e7e0c044300fe066d14cb42788ffa16781f56543

rosewiper 2024-09-12

사용자 친구톡 스미싱 의심에 대한 30분 지연에 대한 오류 수정 - 지연처리가 안되고 있어서 오류 수정 완료(at_delay_yn 값이 변경이 안되던 부분 수정) - 야간스미싱의심 미처리 기능 추가 완료

친구톡 스미싱 의심에 대한 30분 지연에 대한 오류 수정
  - 지연처리가 안되고 있어서 오류 수정 완료(at_delay_yn 값이 변경이 안되던 부분 수정)
  - 야간스미싱의심 미처리 기능 추가 완료

관리자
  - 사용자 상세 팝업에 친구톡 단가 및 마진률 표시, 협의단가 입력 팝업에 친구톡 항목 추가 및 수정 기능 변경

@e7e0c044300fe066d14cb42788ffa16781f56543

d26b4c9

e7e0c04

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

...	...	@@ -432,6 +432,51 @@
432	432
433	433	//카카오 알림톡 전송 리스트
434	434	List<KakaoVO> kakaoFtSendList = new ArrayList<KakaoVO>();
	435	+
	436	+ //야간스미싱 알림여부 정보 불러오기
	437	+ JoinSettingVO joinSettingVO = siteManagerDAO.selectAdminNotiDetail();
	438	+ String holiSmishingNoti = joinSettingVO.getHoliSmishingNoti();
	439	+
	440	+ //스팸,스미싱이어도 딜레이없이 문자 전송을 처리할지 선택 상태값 변수
	441	+ boolean spamSmishingPassStatus = false; //야간스미싱 알림여부가 활성화인 경우 false, 비활성화인경우 true 값을 가지도록 한다.
	442	+
	443	+ //야간스미싱알리 여부가 비활성화 인경우 무조건 문자를 즉시 보내도록 한다.
	444	+ //현재는 평일, 주말, 휴일 상관없이 N 이면 30분 딜레이 없이 발송 처리하도록 함.
	445	+ if(holiSmishingNoti.equals("Y")) {
	446	+
	447	+ MsgAlarmSetVO msgAlarmSetVO = new MsgAlarmSetVO();
	448	+
	449	+ msgAlarmSetVO.setUseYn("Y");
	450	+ msgAlarmSetVO.setFirstIndex(0);
	451	+
	452	+ List<MsgAlarmSetVO> resultAlarmList = msgHolidayDAO.selectAlarmSettingList(msgAlarmSetVO);
	453	+
	454	+ Calendar calendar = Calendar.getInstance();
	455	+ int year = calendar.get(Calendar.YEAR);
	456	+
	457	+ MsgHolidayVO msgHolidayVO = new MsgHolidayVO();
	458	+ msgHolidayVO.setFirstIndex(0);
	459	+ msgHolidayVO.setRecordCountPerPage(100);
	460	+ msgHolidayVO.setSearchHoliYear(Integer.toString(year));
	461	+
	462	+ List<MsgHolidayVO> resultHolidayList = msgHolidayDAO.selectMsgHolidayList(msgHolidayVO);
	463	+
	464	+ MjonHolidayApi mjonHolidayApi = new MjonHolidayApi();
	465	+
	466	+ boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
	467	+
	468	+ spamSmishingPassStatus = smishingAlarmPassSts;
	469	+ }else {
	470	+
	471	+ spamSmishingPassStatus = true;
	472	+
	473	+ }
	474	+
	475	+ String atSmishingYn = kakaoVO.getAtSmishingYn();
	476	+
	477	+ if(spamSmishingPassStatus) {
	478	+ atSmishingYn = "N";
	479	+ }
435	480
436	481	/** 카카오 알림톡 전송 리스트 생성 (시작)-------------------------------------------*/
437	482	for(int i = 0; i < callToCnt; i++) {
...	...	@@ -496,7 +541,7 @@
496	541
497	542	}
498	543
499		- if(kakaoVO.getAtSmishingYn().equals("Y")) {
	544	+ if(atSmishingYn.equals("Y")) {
500	545	String sandDate = "";
501	546
502	547	if(kakaoVO.getDivideChk().equals("Y")) {
...	...	@@ -632,6 +677,12 @@
632	677	mjonMsgVO.setKakaoSubMagOrgnlTxt(kakaoVO.getKakaoSubMagOrgnlTxt());
633	678	mjonMsgVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
634	679
	680	+ //야간 스미싱 알림 비활성화인 경우 딜레이처리 안하도록 함 20240912 우영두 수정
	681	+ if(spamSmishingPassStatus) {
	682	+ mjonMsgVO.setAtDelayYn("N");
	683	+ }else {
	684	+ mjonMsgVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
	685	+ }
635	686
636	687	if(kakaoVO.getBizJsonYn().equals("Y")) {
637	688	mjonMsgVO.setFileCnt("1");
...	...	@@ -655,6 +706,20 @@
655	706	*
656	707	* */
657	708	kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
	709	+
	710	+
	711	+ try {
	712	+
	713	+ //야간 스미싱 알림이 활성화 이고 알림 예외 일정에 포함되고, 스팸 또는 스미싱 의심 상태일 경우 문자정보 별도 저장처리 - 20240821 우영두 추가
	714	+ if(holiSmishingNoti.equals("Y") && spamSmishingPassStatus && kakaoVO.getAtSmishingYn().equals("Y")) {
	715	+ mjonMsgDAO.insertSpamPassMsgData(mjonMsgVO);
	716	+ }
	717	+
	718	+ } catch (Exception e) {
	719	+ System.out.println("++++++++++++++++++++++++++++++ spamSmishingPassStatus 친구톡 야간 스미싱 알림 데이터 입력 오류 발생 !!!!");
	720	+ }
	721	+
	722	+
658	723	}else {
659	724	mjonMsgDAO.updateMsgGroupDataForTotCntSum(mjonMsgVO);
660	725	}

d26b4c9

e7e0c04

src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java

--- src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java


 
 				//스미싱 의심이 아니면 delayYn 값 셋팅
 				if(kakaoVO.getAtSmishingYn().equals("N")) {
-					kakaoVO.setDelayYn("N");
+					kakaoVO.setAtDelayYn("N");
 				}else {
-					kakaoVO.setDelayYn("Y");
+					kakaoVO.setAtDelayYn("Y");
 				}
 				
 				//분할발송 여부 - 친구톡은 분할 발송이 없기애 N으로 픽스

d26b4c9

e7e0c04

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

...	...	@@ -1099,6 +1099,7 @@
1099	1099	model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
1100	1100	model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
1101	1101	model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice());
	1102	+ model.addAttribute("sysKakaoFtPrice", sysJoinSetVO.getKakaoFtPrice());
1102	1103
1103	1104	// 등급제 단가 추출 => 시스템 단가에 적용
1104	1105	sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId);
...	...	@@ -1110,6 +1111,7 @@
1110	1111	Float picture2Price = mberManageVO.getPicture2Price();
1111	1112	Float picture3Price = mberManageVO.getPicture3Price();
1112	1113	Float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
	1114	+ Float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
1113	1115	Float faxPrice = mberManageVO.getFaxPrice();
1114	1116	System.out.println("mberManageVO.getFaxPrice() : " + mberManageVO.getFaxPrice());
1115	1117
...	...	@@ -1125,6 +1127,11 @@
1125	1127	if(kakaoAtPrice < 1) {
1126	1128	kakaoAtPrice = sysJoinSetVO.getKakaoAtPrice();
1127	1129	}
	1130	+
	1131	+ if(kakaoFtPrice < 1) {
	1132	+ kakaoFtPrice = sysJoinSetVO.getKakaoFtPrice();
	1133	+ }
	1134	+
1128	1135	if(faxPrice < 1) {
1129	1136	faxPrice = sysJoinSetVO.getFaxPrice();
1130	1137	}
...	...	@@ -1135,6 +1142,7 @@
1135	1142	model.addAttribute("picture2Price", picture2Price);
1136	1143	model.addAttribute("picture3Price", picture3Price);
1137	1144	model.addAttribute("kakaoAtPrice", kakaoAtPrice);
	1145	+ model.addAttribute("kakaoFtPrice", kakaoFtPrice);
1138	1146	model.addAttribute("faxPrice", faxPrice);
1139	1147	model.addAttribute("sysJoinSetVO", sysJoinSetVO);
1140	1148
...	...	@@ -1313,6 +1321,9 @@
1313	1321	double kakaoAtCost = 0.00;
1314	1322	double kakaoAtMargin = 0.00;
1315	1323
	1324	+ double kakaoFtCost = 0.00;
	1325	+ double kakaoFtMargin = 0.00;
	1326	+
1316	1327	double faxCost = 0.00;
1317	1328	double faxMargin = 0.00;
1318	1329
...	...	@@ -1345,10 +1356,23 @@
1345	1356	avgPriceP = Double.parseDouble(item.getAgentPrice());
1346	1357	}
1347	1358	}
	1359	+
	1360	+ /*
	1361	+ * 알림톡,친구톡 원가 정보 조회
	1362	+ * Agent 코드 번호를 넘겨준다.
	1363	+ * 다우기술 04번으로 넘겨줌
	1364	+ * */
1348	1365
1349		- // kakao 원가
1350		- kakaoAtCost = kakaoApiService.selectKakaoCost();
	1366	+ MjonMsgAgentStsVO resultAgentCost = mjonMsgAgentStsService.selectHotLineAgentCost("04");
	1367	+ kakaoAtCost = resultAgentCost.getKakaoAtCost(); //알림톡 원가
	1368	+ kakaoFtCost = resultAgentCost.getKakaoFtCost(); //친구톡 원가
	1369	+
	1370	+ // kakao 알림톡 마진률 계산
	1371	+ //kakaoAtCost = kakaoApiService.selectKakaoCost();
1351	1372	kakaoAtMargin = (1-(kakaoAtCost / kakaoAtPrice))*100;
	1373	+
	1374	+ //kakao 친구톡 마진률 계산
	1375	+ kakaoFtMargin = (1-(kakaoFtCost / kakaoFtPrice))*100;
1352	1376
1353	1377	// fax 원가 SELECT
1354	1378	faxCost = faxService.getFaxCost();
...	...	@@ -1366,7 +1390,9 @@
1366	1390	model.addAttribute("avgPriceL", avgPriceL);
1367	1391	model.addAttribute("avgPriceP", avgPriceP);
1368	1392	model.addAttribute("kakaoAtCost", kakaoAtCost);
	1393	+ model.addAttribute("kakaoFtCost", kakaoFtCost);
1369	1394	model.addAttribute("kakaoAtMargin", kakaoAtMargin);
	1395	+ model.addAttribute("kakaoFtMargin", kakaoFtMargin);
1370	1396	model.addAttribute("faxCost", faxCost);
1371	1397	model.addAttribute("faxMargin", faxMargin);
1372	1398	}
...	...	@@ -2892,6 +2918,11 @@
2892	2918	// 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
2893	2919	if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) {
2894	2920	mberManageVO.setKakaoAtPrice(0);
	2921	+ }
	2922	+
	2923	+ // 친구톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
	2924	+ if (Float.compare(sysJoinSetVO.getKakaoFtPrice(), mberManageVO.getKakaoFtPrice()) == 0) {
	2925	+ mberManageVO.setKakaoFtPrice(0);
2895	2926	}
2896	2927
2897	2928	int resultCnt = mberManageService.updateUserPrice(mberManageVO);
...	...	@@ -4789,7 +4820,7 @@
4789	4820	* 회원 이용정지 사유 조회하기
4790	4821	* @param searchVO
4791	4822	* @param model
4792		- * @return "/uss/umt/user/uss/umt/user/EgovGnrlselectedUserView.do.do"
	4823	+ * @return "/uss/umt/user/uss/umt/user/selectMberSpamBlockMemoDetailAjax.do"
4793	4824	* @throws Exception
4794	4825	*/
4795	4826	@RequestMapping(value = {"/uss/umt/user/selectMberSpamBlockMemoDetailAjax.do"})

d26b4c9

e7e0c04

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml


 			, PICTURE2_PRICE = #picture2Price#
 			, PICTURE3_PRICE = #picture3Price#
 			, KAKAO_AT_PRICE = #kakaoAtPrice#
+			, KAKAO_FT_PRICE = #kakaoFtPrice#
 			, KAKAO_FT_IMG_PRICE = #kakaoFtImgPrice#
 			, KAKAO_FT_WIDE_IMG_PRICE = #kakaoFtWideImgPrice#
 		WHERE MBER_ID = #mberId#

d26b4c9

e7e0c04

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp


 							<tr>
 								<th>구분</th>
 								<th>알림톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoAtPrice}" pattern="###.#" />원)</th>
-								<th>친구톡(준비중)</th>
+								<th>친구톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtPrice}" pattern="###.#" />원)</th>
 								<th>팩스(<fmt:formatNumber value="${sysJoinSetVO.faxPrice}" pattern="###.#" />원)</th>
 							</tr>
 						</thead>

 							<tr>
 								<td>문자온 원가</td>
 								<td><c:out value="${kakaoAtCost}"/></td>
-								<td>준비중</td>
+								<td><c:out value="${kakaoFtCost}"/></td>
 								<td><c:out value="${faxCost}"/></td>
 							</tr>
 							<tr>

 									<fmt:formatNumber value='${kakaoAtPrice}' pattern='###.#' />
 								</td>
 								<td>
-									준비중
+									<fmt:formatNumber value='${kakaoFtPrice}' pattern='###.#' />
 								</td>
 								<td>
 									<fmt:formatNumber value='${faxPrice}' pattern='###.#' />

 							<tr>
 								<td>마진률</td>
 								<td><fmt:formatNumber value="${kakaoAtMargin}" pattern=".0" />%</td>
-								<td>준비중</td>
+								<td><fmt:formatNumber value="${kakaoFtMargin}" pattern=".0" />%</td>
 								<td><fmt:formatNumber value="${faxMargin}" pattern=".0" />%</td>
 							</tr>
 						</tbody>

 							<th>알림톡 금액</th>
 							<td><input type="text" name="kakaoAtPrice" id="kakaoAtPrice" value="<c:out value='${kakaoAtPrice}'/>"/></td>
 						</tr>
+						<tr>
+							<th>친구톡 금액</th>
+							<td><input type="text" name="kakaoFtPrice" id="kakaoFtPrice" value="<c:out value='${kakaoFtPrice}'/>"/></td>
+						</tr>
 					</tbody>
 				</table>
 				<div class="button_box">

Add a comment

Open 0
Closed 0

List

...	...	@@ -409,9 +409,9 @@
409	409
410	410	//스미싱 의심이 아니면 delayYn 값 셋팅
411	411	if(kakaoVO.getAtSmishingYn().equals("N")) {
412		- kakaoVO.setDelayYn("N");
	412	+ kakaoVO.setAtDelayYn("N");
413	413	}else {
414		- kakaoVO.setDelayYn("Y");
	414	+ kakaoVO.setAtDelayYn("Y");
415	415	}
416	416
417	417	//분할발송 여부 - 친구톡은 분할 발송이 없기애 N으로 픽스

...	...	@@ -1217,6 +1217,7 @@
1217	1217	, PICTURE2_PRICE = #picture2Price#
1218	1218	, PICTURE3_PRICE = #picture3Price#
1219	1219	, KAKAO_AT_PRICE = #kakaoAtPrice#
	1220	+ , KAKAO_FT_PRICE = #kakaoFtPrice#
1220	1221	, KAKAO_FT_IMG_PRICE = #kakaoFtImgPrice#
1221	1222	, KAKAO_FT_WIDE_IMG_PRICE = #kakaoFtWideImgPrice#
1222	1223	WHERE MBER_ID = #mberId#

...	...	@@ -5246,7 +5246,7 @@
5246	5246	<tr>
5247	5247	<th>구분</th>
5248	5248	<th>알림톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoAtPrice}" pattern="###.#" />원)</th>
5249		- <th>친구톡(준비중)</th>
	5249	+ <th>친구톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtPrice}" pattern="###.#" />원)</th>
5250	5250	<th>팩스(<fmt:formatNumber value="${sysJoinSetVO.faxPrice}" pattern="###.#" />원)</th>
5251	5251	</tr>
5252	5252	</thead>
...	...	@@ -5254,7 +5254,7 @@
5254	5254	<tr>
5255	5255	<td>문자온 원가</td>
5256	5256	<td><c:out value="${kakaoAtCost}"/></td>
5257		- <td>준비중</td>
	5257	+ <td><c:out value="${kakaoFtCost}"/></td>
5258	5258	<td><c:out value="${faxCost}"/></td>
5259	5259	</tr>
5260	5260	<tr>
...	...	@@ -5263,7 +5263,7 @@
5263	5263	<fmt:formatNumber value='${kakaoAtPrice}' pattern='###.#' />
5264	5264	</td>
5265	5265	<td>
5266		- 준비중
	5266	+ <fmt:formatNumber value='${kakaoFtPrice}' pattern='###.#' />
5267	5267	</td>
5268	5268	<td>
5269	5269	<fmt:formatNumber value='${faxPrice}' pattern='###.#' />
...	...	@@ -5272,7 +5272,7 @@
5272	5272	<tr>
5273	5273	<td>마진률</td>
5274	5274	<td><fmt:formatNumber value="${kakaoAtMargin}" pattern=".0" />%</td>
5275		- <td>준비중</td>
	5275	+ <td><fmt:formatNumber value="${kakaoFtMargin}" pattern=".0" />%</td>
5276	5276	<td><fmt:formatNumber value="${faxMargin}" pattern=".0" />%</td>
5277	5277	</tr>
5278	5278	</tbody>
...	...	@@ -5729,6 +5729,10 @@
5729	5729	<th>알림톡 금액</th>
5730	5730	<td><input type="text" name="kakaoAtPrice" id="kakaoAtPrice" value="<c:out value='${kakaoAtPrice}'/>"/></td>
5731	5731	</tr>
	5732	+ <tr>
	5733	+ <th>친구톡 금액</th>
	5734	+ <td><input type="text" name="kakaoFtPrice" id="kakaoFtPrice" value="<c:out value='${kakaoFtPrice}'/>"/></td>
	5735	+ </tr>
5732	5736	</tbody>
5733	5737	</table>
5734	5738	<div class="button_box">

Delete comment