팩스 환불 로직 개선

src/main/java/itn/let/mjo/msg/service/RefundDTO.java

@@ -0,0 +1,20 @@
+package itn.let.mjo.msg.service;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RefundDTO {
+	private String userId;
+	private String msgGroupId;
+	private int userData;
+	private String 	eachPrice ;	// 전송문자 개별가격
+
+	public RefundDTO(String userId, String msgGroupId, int userData, String eachPrice) {
+		this.userId = userId;
+		this.msgGroupId = msgGroupId;
+		this.userData = userData;
+		this.eachPrice = eachPrice;
+	}
+}

src/main/java/itn/let/mjo/test/web/TestController.java

@@ -17,6 +17,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
@@ -84,6 +85,7 @@ import itn.let.mjo.mjocommon.MjonCommon;
 import itn.let.mjo.mjocommon.MjonHolidayApi;
 import itn.let.mjo.msg.service.MjonMsgService;
 import itn.let.mjo.msg.service.MjonMsgVO;
+import itn.let.mjo.msg.service.RefundDTO;
 import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
 import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
@@ -3434,8 +3436,14 @@ public class TestController {
 			//어플리케이션 트랜잭션 문제가 있어 Util 단으로 DB 호출을 가져옴	-	2024-03-14
 			//schdlrManageService.msgFailPayBack();
 
+			long forBeforeTime = System.currentTimeMillis(); // 코드 실행 전 시간
 			List<MjonMsgVO> msgFailList = mjonMsgDataDAO.selectMsgSentFailList();
 			
+
+			long forAfterTime1 = System.currentTimeMillis(); // 코드 실행 후 시간
+			long forSecDiffTime1 = (forAfterTime1 - forBeforeTime)/1000; // 코드 실행 전후 시간 차이 계산(초 단위)
+			System.out.println("==PayBack list =============> 수량 : "+msgFailList.size()+"  =====  "  + forSecDiffTime1 +"초");
+			
 			// 리스트가 비어있는 경우 종료
 			if (msgFailList == null || msgFailList.isEmpty()) {
 				System.out.println("No messages to process.");
@@ -3443,29 +3451,22 @@ public class TestController {
 			}
 			
 			
-			long forBeforeTime = System.currentTimeMillis(); // 코드 실행 전 시간
-//			int count = 0;
 			System.out.println("==  msgFailList  =============>  : "+ msgFailList.size());
-//			for(MjonMsgVO vo : msgFailList) {
-//				System.out.println(count + " : "+ msgFailList.size());
-				
 			try {
-
+		           // 필요한 필드만 DTO로 매핑
+	            List<RefundDTO> dtoList = msgFailList.stream()
+	                .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
+	                .collect(Collectors.toList());
 				// JSON 변환
 				ObjectMapper objectMapper = new ObjectMapper();
-					String msgFailListJson = objectMapper.writeValueAsString(msgFailList);
+				String msgFailListJson = objectMapper.writeValueAsString(dtoList);
-
-					System.out.println("JSON Data: " + msgFailListJson);
-					
 
 				mjonMsgDataDAO.updateMsgSentFailPayBackBatch(msgFailListJson);
 				
-//					mjonMsgDataDAO.updateMsgSentFailPayBack(vo);
 			}catch(Exception ex) {
 				ex.printStackTrace();
 			}
 				
-//				count = count + 1;
 //			}
 			long forAfterTime = System.currentTimeMillis(); // 코드 실행 후 시간
 			long forSecDiffTime = (forAfterTime - forBeforeTime)/1000; // 코드 실행 전후 시간 차이 계산(초 단위)

src/main/java/itn/let/schdlr/service/SchdlrManageService.java

@@ -52,4 +52,6 @@ public interface SchdlrManageService {
 	
 	//문자온 문자전송 실패 건수 환불 배치
 	public void payBack(String type, int limitCout) throws Exception;
+
+	public void payBack_advc(String p_type) throws Exception;
 }

src/main/java/itn/let/schdlr/service/SchedulerUtil.java

@@ -92,8 +92,8 @@ public class SchedulerUtil {
 	 * 10분 마다 1주일 데이터에서 환불 대상을 찾아서 환불 한다.
 	 * */
 	// Schdule Lock (10분동안)	
-//	@Scheduled(cron = "0 0/10 * * * ?")
+	@Scheduled(cron = "0 0/10 * * * ?")
-//	@SchedulerLock(name = "runScenarioOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
+	@SchedulerLock(name = "runScenarioOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
 	public void runScenarioOneTime() throws Exception {
 		
 		// do something...
@@ -119,10 +119,10 @@ public class SchedulerUtil {
 	}
 	
 	/*
-	 * 매일 5시20분에 31일전 데이터에서 환불 대상을 찾아서 환불 한다.
+	 * 매일 5시20분 20초에 31일전 데이터에서 환불 대상을 찾아서 환불 한다.
 	 * */
-//	@Scheduled(cron = "20 20 5 * * ?")
+	@Scheduled(cron = "20 25 5 * * ?")
-//	@SchedulerLock(name = "runScenarioOneTimeOneByDay", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
+	@SchedulerLock(name = "runScenarioOneTimeOneByDay", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
 	public void runScenarioOneTimeOneByDay() throws Exception {
 		
 		// do something...
@@ -477,10 +477,14 @@ public class SchedulerUtil {
 	
 	//환불 실행
 	private void PayBack(String p_type) throws Exception {
+		
+		
 		// 문자 환불
+		schdlrManageService.payBack_advc(p_type);
+		
+		/*
 		if ("ONE".equals(p_type)) {	//하루에 한번만 31일 대상으로 실행
 			schdlrManageService.msgFailPayBackOneByDay();	
-			
 		}else {	
 			// 10분 마다 1주일 데이터에서 환불 대상을 찾아서 환불 한다.
 			//어플리케이션 트랜잭션 문제가 있어 Util 단으로 DB 호출을 가져옴	-	2024-03-14
@@ -489,10 +493,8 @@ public class SchedulerUtil {
 			List<MjonMsgVO> msgFailList = mjonMsgDataDAO.selectMsgSentFailList();
 			
 			long forBeforeTime = System.currentTimeMillis(); // 코드 실행 전 시간
-			int count = 0;
 			System.out.println("==  msgFailList  =============>  : "+ msgFailList.size());
 			for(MjonMsgVO vo : msgFailList) {
-				System.out.println(count + " : "+ msgFailList.size());
 				
 				try {
 					mjonMsgDataDAO.updateMsgSentFailPayBack(vo);
@@ -502,15 +504,16 @@ public class SchedulerUtil {
 					ex.printStackTrace();
 				}
 				
-				count = count + 1;
 			}
 			long forAfterTime = System.currentTimeMillis(); // 코드 실행 후 시간
 			long forSecDiffTime = (forAfterTime - forBeforeTime)/1000; // 코드 실행 전후 시간 차이 계산(초 단위)
 			System.out.println("==PayBack for 2 =============> 수량 : "+msgFailList.size()+"  =====  "  + forSecDiffTime +"초");
 		}
 			
+		*/
 		System.out.println("==== faxFailPayBack ====");
 		// 팩스 환불
 		schdlrManageService.faxFailPayBack();
+			
 	}
 }

src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java

@@ -1,8 +1,10 @@
 package itn.let.schdlr.service.impl;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -10,8 +12,12 @@ import org.jsoup.Jsoup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import itn.com.cmm.EgovMultiPartEmail;
@@ -19,8 +25,10 @@ import itn.com.cmm.service.EgovFileMngService;
 import itn.com.cmm.service.impl.FileManageDAO;
 import itn.let.fax.user.service.impl.FaxDAO;
 import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
+import itn.let.mail.service.StatusResponse;
 import itn.let.mjo.mjocommon.MjonCommon;
 import itn.let.mjo.msg.service.MjonMsgVO;
+import itn.let.mjo.msg.service.RefundDTO;
 import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
 import itn.let.mjo.pay.service.MjonPayService;
@@ -164,7 +172,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		return schdlrManageDAO.selectSchdlrShare(schdlrVO);
 	}
 
-
 	// 일정 목록 조회
 	public List<SchdlrVO> selectSchList(SchdlrVO schdlrVO) throws Exception {
 		return schdlrManageDAO.selectSchList(schdlrVO);
@@ -206,18 +213,20 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		List<SchdlrVO> mailList = schdlrManageDAO.selectMailSendList(bgnDateTime);
 
 		for (SchdlrVO vo : mailList) {
-			if (("").equals(vo.getEmailAdres())) continue;
+			if (("").equals(vo.getEmailAdres()))
+				continue;
 
 			boolean result = sendMail(vo);
 			LOGGER.debug("send succ update:", result);
 
-			if (result) schdlrManageDAO.updateMailSend(vo);
+			if (result)
+				schdlrManageDAO.updateMailSend(vo);
 		}
 	}
 
-
 	/**
 	 * 일정 알림 메일 전송
+	 * 
 	 * @param SchdlrVO schdlrVO
 	 * @return boolean
 	 * @throws Exception
@@ -235,16 +244,29 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 //				alram = schdlrVO.getSchdlrAlarmDatetime();
 //			}
 			switch (schdlrVO.getSchdlrAlarmCnd()) {
-				case "0" : alram = "정시"; break;
+			case "0":
-				case "10" : alram = "십분 전"; break;
+				alram = "정시";
-				case "30" : alram = "삼십분 전"; break;
+				break;
-				case "60" : alram = "한시간 전"; break;
+			case "10":
-				case "etc" : alram = schdlrVO.getSchdlrAlarmDatetime(); break;
+				alram = "십분 전";
+				break;
+			case "30":
+				alram = "삼십분 전";
+				break;
+			case "60":
+				alram = "한시간 전";
+				break;
+			case "etc":
+				alram = schdlrVO.getSchdlrAlarmDatetime();
+				break;
 			}
 
-			String mailContent = Jsoup.parse(new File(MAIL_CONTENT_PATH + "/direct/mail_template/sch_alrm_cont.html"), "UTF-8").toString();
+			String mailContent = Jsoup
+					.parse(new File(MAIL_CONTENT_PATH + "/direct/mail_template/sch_alrm_cont.html"), "UTF-8")
+					.toString();
 			mailContent = mailContent.replace("#일정명", schdlrVO.getSchdlrTitle());
-			mailContent = mailContent.replace("#일시", schdlrVO.getSchdlrBgnDatetime() + " ~ " + schdlrVO.getSchdlrEndDatetime());
+			mailContent = mailContent.replace("#일시",
+					schdlrVO.getSchdlrBgnDatetime() + " ~ " + schdlrVO.getSchdlrEndDatetime());
 			mailContent = mailContent.replace("#장소", schdlrVO.getSchdlrPlace());
 			mailContent = mailContent.replace("#내용", schdlrVO.getSchdlrCn().replaceAll("(\r\n|\r|\n|\n\r)", "<br>"));
 			mailContent = mailContent.replace("#알림설정", alram);
@@ -262,7 +284,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		return result;
 	}
 
-	
 	// 메인화면 > 전체일정
 	public List<SchdlrVO> selectMainSchList(SchdlrVO schdlrVO) throws Exception {
 		return schdlrManageDAO.selectMainSchList(schdlrVO);
@@ -275,39 +296,36 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		System.out.println("문자온 실패 건수 환불 스케줄러 실행!!!(1weeks)" + now);
 		/*
 		 * 문자발송 실패 건수 확인 및 캐시 환불 처리
-		 * */
+		 */
 		mjonMsgDataService.selectMsgSentFailList();
 
 		/*
 		 * 세틀뱅크 입금 확인 및 캐시 충전 배치 프로세스
-		 * */
+		 */
-		/*VacsAhstVO vacsAhstVO = new VacsAhstVO();
+		/*
-		List<VacsAhstVO> resultBeforCashList = vacsAhstService.selectBeforCashList(vacsAhstVO);
+		 * VacsAhstVO vacsAhstVO = new VacsAhstVO(); List<VacsAhstVO>
-	
+		 * resultBeforCashList = vacsAhstService.selectBeforCashList(vacsAhstVO);
-		if(resultBeforCashList != null) {
+		 * 
-			
+		 * if(resultBeforCashList != null) {
-			for(VacsAhstVO temp : resultBeforCashList) {
+		 * 
-				
+		 * for(VacsAhstVO temp : resultBeforCashList) {
-				StVcVO stvcVO = new StVcVO();
+		 * 
-				
+		 * StVcVO stvcVO = new StVcVO();
-				stvcVO.setOrgCd(temp.getOrgCd());
+		 * 
-				stvcVO.setBankCd(temp.getBankCd());
+		 * stvcVO.setOrgCd(temp.getOrgCd()); stvcVO.setBankCd(temp.getBankCd());
-				stvcVO.setIacctNo(temp.getIacctNo());
+		 * stvcVO.setIacctNo(temp.getIacctNo()); stvcVO.setTrNo(temp.getTrNo());
-				stvcVO.setTrNo(temp.getTrNo());
+		 * stvcVO.setTrIl(temp.getTrIl()); stvcVO.setTrAmt(temp.getTrAmt());
-				stvcVO.setTrIl(temp.getTrIl());
+		 * stvcVO.setIacctNm(temp.getIacctNm()); stvcVO.setMberId(temp.getMberId());
-				stvcVO.setTrAmt(temp.getTrAmt());
+		 * 
-				stvcVO.setIacctNm(temp.getIacctNm());
+		 * //세틀뱅크 입금 내역 자동 충전하기 mjonPayService.insertVcCharge(stvcVO);
-				stvcVO.setMberId(temp.getMberId());
+		 * 
-				
+		 * //세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기
-				//세틀뱅크 입금 내역 자동 충전하기
+		 * vacsAhstService.updateVacsAhstCashComplete(temp);
-				mjonPayService.insertVcCharge(stvcVO);
+		 * 
-				
+		 * }
-				//세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기
+		 * 
-				vacsAhstService.updateVacsAhstCashComplete(temp);
+		 * }
-				
+		 */
-			}
-			
-		}*/
 
 	}
 
@@ -318,8 +336,8 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		System.out.println("문자온 실패 건수 환불 스케줄러 실행!!!(31days)" + now);
 		/*
 		 * 문자발송 실패 건수 확인 및 캐시 환불 처리
-		 * */
+		 */
-		mjonMsgDataService.selectMsgSentFailListOneByDay();		
+//		mjonMsgDataService.selectMsgSentFailListOneByDay();
 
 	}
 
@@ -339,12 +357,12 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 		System.out.println("문자온 전용계좌  자동 충전 스케줄러 실행 !!!" + now);
 		/*
 		 * 문자발송 실패 건수 확인 및 캐시 환불 처리
-		 * */
+		 */
 		// mjonMsgDataService.selectMsgSentFailList();
 
 		/*
 		 * 세틀뱅크 입금 확인 및 캐시 충전 배치 프로세스
-		 * */
+		 */
 		VacsAhstVO vacsAhstVO = new VacsAhstVO();
 		List<VacsAhstVO> resultBeforCashList = vacsAhstService.selectBeforCashList(vacsAhstVO);
 
@@ -406,22 +424,19 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 						}
 					}
 
-		    	}
+				} catch (Exception e) {
-		    	catch (Exception e) {
 					System.out.println("#############################################################");
 					System.out.println("전용계좌 슬랙알림 & 스미싱의심 처리 Error");
 					System.out.println("전용계좌 TrNo : " + temp.getTrNo());
 					System.out.println("전용계좌 e.getMessage() : " + e.getMessage());
 				}
 
-				
 			}
 
 		}
 
 	}
 
-	
 	// 카카오 환불 처리 리스트
 	public void kakaoFailPayBack() throws Exception {
 
@@ -457,7 +472,8 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 						mjonMsgDataDAO.updateMsgSentFailPayBack(msgFailList.get(j));
 					} catch (Exception ex) {
 						System.out.println("=============SchedulerUtil=====PayBack Catch =============>");
-						System.out.println(msgFailList.get(j).getUserId()+"  :   "+ msgFailList.get(j).getMsgGroupId() +" :  "+ msgFailList.get(j).getUserData());
+						System.out.println(msgFailList.get(j).getUserId() + "  :   "
+								+ msgFailList.get(j).getMsgGroupId() + " :  " + msgFailList.get(j).getUserData());
 						ex.printStackTrace();
 					}
 				}
@@ -469,8 +485,75 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 			}
 			long forAfterTime = System.currentTimeMillis(); // 코드 실행 후 시간
 			long forSecDiffTime = (forAfterTime - forBeforeTime) / 1000; // 코드 실행 전후 시간 차이 계산(초 단위)
-			System.out.println("==PayBack for 2 =============> 수량 : "+msgFailList.size()+"  =====  "  + forSecDiffTime +"초");
+			System.out.println(
+					"==PayBack for 2 =============> 수량 : " + msgFailList.size() + "  =====  " + forSecDiffTime + "초");
 
 		}
 	}
+
+	/**
+	 * @methodName : refundTest
+	 * @author : 이호영
+	 * @date : 2024.12.12
+	 * @description : 환불 데이터
+	 * @param p_type
+	 * @param request
+	 * @param model
+	 * @return
+	 * @throws Exception
+	 */
+	@Override
+	public void payBack_advc(String p_type) throws Exception {
+		List<MjonMsgVO> msgFailList = new ArrayList<>();
+
+		msgFailList = getMsgFailList(p_type);
+
+		// 리스트가 비어있는 경우 종료
+		if (msgFailList == null || msgFailList.isEmpty()) {
+			System.out.println("No payBack messages empty.");
+		}
+
+		try {
+			// 필요한 필드만 DTO로 매핑
+			List<RefundDTO> dtoList = msgFailList.stream().map(msg -> new RefundDTO(msg.getUserId(),
+					msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
+					.collect(Collectors.toList());
+			// JSON 변환
+			ObjectMapper objectMapper = new ObjectMapper();
+			String msgFailListJson = objectMapper.writeValueAsString(dtoList);
+
+			mjonMsgDataDAO.updateMsgSentFailPayBackBatch(msgFailListJson);
+
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+
+		// TODO Auto-generated method stub
+
+	}
+
+	/**
+	 * @methodName : getMsgFailList
+	 * @author : 이호영
+	 * @date : 2024.12.12
+	 * @description : 파라미터에 따라 환불 데이터 가져오기
+	 * @param p_type
+	 * @return
+	 * @throws Exception
+	 */
+	private List<MjonMsgVO> getMsgFailList(String p_type) throws Exception {
+		List<MjonMsgVO> msgFailList = new ArrayList<>();
+		// 문자 환불
+		if ("ONE".equals(p_type)) { // 하루에 한번만 31일 대상으로 실행
+
+			msgFailList = mjonMsgDataDAO.selectMsgSentFailListOneByDay();
+		} else {
+			// 10분 마다 1주일 데이터에서 환불 대상을 찾아서 환불 한다.
+			// schdlrManageService.msgFailPayBack();
+
+			msgFailList = mjonMsgDataDAO.selectMsgSentFailList();
+		}
+
+		return msgFailList;
+	}
 }

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

@@ -4040,20 +4040,28 @@
 	</update>
 	<!-- 문자발송 실패건에 대한 환불 대상 리스트 : 발송 완료되었고, 결과코드가 실패이고, 예약 취소가 아닌건들 -->
 	<select id="MjonMsgDataDAO.selectMsgSentFailList" resultClass="mjonMsgVO">
+	/*MjonMsgDataDAO.selectMsgSentFailList*/
 		
-		SELECT USER_ID                              AS userId,
+			
-		         MSG_GROUP_ID                         AS msgGroupId,
+	SELECT MMD.USER_ID                              AS userId
-		         MSG_SEQ                              AS msgSeq,
+		, MMD.MSG_GROUP_ID                         AS msgGroupId
-		         USERDATA                             AS userData,
+		, MMD.MSG_SEQ                              AS msgSeq
-		         REFUND_YN                            AS refundYn,
+		, MMD.USERDATA                             AS userData
-		         RSLT_CODE                            AS rsltCode,
+		, MMD.REFUND_YN                            AS refundYn
-		         RSLT_CODE2                           AS rsltCode2,
+		, MMD.RSLT_CODE                            AS rsltCode
-		         AGENT_CODE                           AS agentCode,
+		, MMD.RSLT_CODE2                           AS rsltCode2
-		         DATE_FORMAT(SENT_DATE,'%Y-%m-%d %T') AS sentDate,
+		, MMD.AGENT_CODE                           AS agentCode
-		         DATE_FORMAT(RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
+		, DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate
+		, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
+		, MGD.EACH_PRICE				            AS eachPrice
 	FROM   MJ_MSG_DATA MMD
 		INNER JOIN LETTNGNRLMBER MB
 		ON     MMD.USER_ID = MB.MBER_ID
+		LEFT JOIN MJ_MSG_GROUP_DATA MGD
+		ON     MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
+		LEFT JOIN MJ_CASH MC
+		ON     MC.ORDER_ID = MMD.USERDATA
+		AND    MC.USER_ID = MMD.USER_ID
 	WHERE  1=1	  
 		AND	 MMD.SENT_DATE > date_add(now(), interval -7 day)
 		AND	 MMD.CUR_STATE          = '3'
@@ -4061,6 +4069,8 @@
 		AND    MMD.RESERVE_C_YN       = 'N'
 		AND    MMD.MSG_TYPE IN ('4','6')
 		AND 	 MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
+		AND 	 MGD.EACH_PRICE != 0
+		AND    MC.ORDER_ID IS NULL
 		AND
 			(CASE
 				WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0'))
@@ -4088,6 +4098,9 @@
 				THEN 'W'
 				ELSE 'F'
 			END) IN ('F')
+   		ORDER BY MMD.USER_ID
+		LIMIT 10000
+
 	</select>
 	
 	<!-- 문자발송 실패건에 대한 환불 대상 리스트 : 발송 완료되었고, 결과코드가 실패이고, 예약 취소가 아닌건들 -->
@@ -4145,20 +4158,27 @@
 	
 	<!-- 문자발송 실패건에 대한 환불 대상 리스트 : 발송 완료되었고, 결과코드가 실패이고, 예약 취소가 아닌건들(하루에 한번은 31일 실행) -->
 	<select id="MjonMsgDataDAO.selectMsgSentFailListOneByDay" resultClass="mjonMsgVO">
+		/*MjonMsgDataDAO.selectMsgSentFailListOneByDay*/
 			
-		SELECT USER_ID                              AS userId,
+		SELECT MMD.USER_ID                              AS userId
-		         MSG_GROUP_ID                         AS msgGroupId,
+			, MMD.MSG_GROUP_ID                         AS msgGroupId
-		         MSG_SEQ                              AS msgSeq,
+			, MMD.MSG_SEQ                              AS msgSeq
-		         USERDATA                             AS userData,
+			, MMD.USERDATA                             AS userData
-		         REFUND_YN                            AS refundYn,
+			, MMD.REFUND_YN                            AS refundYn
-		         RSLT_CODE                            AS rsltCode,
+			, MMD.RSLT_CODE                            AS rsltCode
-		         RSLT_CODE2                           AS rsltCode2,
+			, MMD.RSLT_CODE2                           AS rsltCode2
-		         AGENT_CODE                           AS agentCode,
+			, MMD.AGENT_CODE                           AS agentCode
-		         DATE_FORMAT(SENT_DATE,'%Y-%m-%d %T') AS sentDate,
+			, DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate
-		         DATE_FORMAT(RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
+			, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
+			, MGD.EACH_PRICE				            AS eachPrice
 		FROM   MJ_MSG_DATA MMD
 			INNER JOIN LETTNGNRLMBER MB
 			ON     MMD.USER_ID = MB.MBER_ID
+			LEFT JOIN MJ_MSG_GROUP_DATA MGD
+			ON     MMD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
+			LEFT JOIN MJ_CASH MC
+			ON     MC.ORDER_ID = MMD.USERDATA
+			AND    MC.USER_ID = MMD.USER_ID
 		WHERE  1=1	  
 			AND	 MMD.SENT_DATE > date_add(now(), interval -40 day)
 			AND	 MMD.CUR_STATE          = '3'
@@ -4166,6 +4186,8 @@
 			AND    MMD.RESERVE_C_YN       = 'N'
 			AND    MMD.MSG_TYPE IN ('4','6')
 			AND 	 MMD.USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
+			AND 	 MGD.EACH_PRICE != 0
+			AND    MC.ORDER_ID IS NULL
 			AND
 				(CASE
 					WHEN MMD.AGENT_CODE = '01' AND ( MMD.RSLT_CODE = '100' AND (MMD.RSLT_CODE2 = '0'))
@@ -4193,6 +4215,8 @@
 				THEN 'W'
 				ELSE 'F'
 			END) IN ('F')
+		ORDER BY MMD.USER_ID
+		LIMIT 10000
 	
 	</select>
 		

src/main/webapp/js/MJUtill.js

@@ -58,7 +58,7 @@ function checkOnlyHpNum(str) {
 	function checkFaxNum(str) {
 	    str = removeDash(str);
 	    var subNum = str.substring(0,3);
-	var regExp = /^(02|0[3-6][1-4]|030|050|060|070|080|1\d{2})$/;
+	    var regExp = /^(02|03[1-3]|04[1-4]|05[1-5]|06[1-4]|030|050|060|070|080|1\d{2})$/;
 	    return regExp.test(subNum);
 	}