diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java index 80c55e34..9519ff67 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java @@ -184,6 +184,9 @@ public interface MjonMsgDataService { public StatusResponse insertMberCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO); public StatusResponse deleteCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO); + + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO); + } diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java index 58a9d84f..8256a57e 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java @@ -205,7 +205,7 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { } public SendLogVO selectSysMsgLogCheck(SendLogVO sendLogVO) throws Exception{ - return (SendLogVO) select("mjonMsgDAO.selectSysMsgLogCheck",sendLogVO); + return (SendLogVO) select("mjonMsgDAO.selectSysMsgLogCheck_new",sendLogVO); } @SuppressWarnings("unchecked") @@ -383,5 +383,10 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { public void deleteCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO) { update("mjonMsgDataDAO.deleteCertPhoneInfo", mberCertPhoneVO); } + + + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO) { + return (List) list("mjonMsgDataDAO.selectMberCertPhoneListVO", mberCertPhoneVO); + } } diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index 2a28d396..f37602a9 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -3177,5 +3177,10 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mjonMsgDataDAO.deleteCertPhoneInfo(mberCertPhoneVO); return new StatusResponse(HttpStatus.OK, "삭제하였습니다.", LocalDateTime.now()); } + + @Override + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO) { + return mjonMsgDataDAO.selectMberCertPhoneListVO(mberCertPhoneVO); + } } diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index f3224563..f1016408 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -109,6 +109,7 @@ import itn.let.uat.uap.service.EgovLoginPolicyService; import itn.let.uat.uap.service.LoginPolicyVO; import itn.let.uat.uia.service.AuthCertVO; import itn.let.uat.uia.service.EgovLoginService; +import itn.let.uat.uia.service.MberCertPhoneVO; import itn.let.uss.umt.service.EgovMberManageService; import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageConfigVO; @@ -2043,9 +2044,23 @@ public class EgovLoginController { String message = "로그인 성공했습니다."; + + + + + /* 일시 : 2024.11.18 + * 내용 : 다중 인증번호 조회 + * 작업자 : 이호영 + */ + + + List mberCertPhoneList = mjonMsgDataService.selectMberCertPhoneList(resultVO.getId()); + + modelAndView.addObject("status", "success"); modelAndView.addObject("msg", message); modelAndView.addObject("data", resultVO); + modelAndView.addObject("mberCertPhoneList", mberCertPhoneList); return modelAndView; @@ -3580,6 +3595,11 @@ public class EgovLoginController { code = randomCode.append(Integer.toString(random.nextInt(10))).toString(); } contents = contents.replace("%code%", code); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); mjonMsgVO.setSmsTxt(contents); mjonMsgVO.setReserveYn("N"); @@ -3601,9 +3621,25 @@ public class EgovLoginController { userManageVO.setEmplyrNm(mjonMsgVO.getSearchNm()); userManageVO.setMoblphonNo(mjonMsgVO.getCallTo()); - List usedNmList = userManageService.selectUserIdAjax2(userManageVO); + + + + + + - boolean TorF = usedNmList.size() > 0 ? true : false; + MberCertPhoneVO mberCertPhoneVO = new MberCertPhoneVO(); + mberCertPhoneVO.setMbtlnum(mjonMsgVO.getCallTo()); + mberCertPhoneVO.setMberId(mjonMsgVO.getUserId()); + + + List mberCertPhoneList = mjonMsgDataService.selectMberCertPhoneListVO(mberCertPhoneVO); + + + + + + boolean TorF = mberCertPhoneList.size() > 0 ? true : false; if (!TorF) { @@ -3616,7 +3652,8 @@ public class EgovLoginController { return modelAndView; } - + + List usedNmList = userManageService.selectUserIdAjax2(userManageVO); if(!usedNmList.get(0).getMberSttus().equals("Y")) { String mberSttus = usedNmList.get(0).getMberSttus(); diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 9743cfd4..74bbcaa3 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -43,12 +43,13 @@ import itn.let.utl.user.service.MjonNoticeSendUtil; /** * 사용자관리에 관한 비지니스 클래스를 정의한다. + * * @author 공통서비스 개발팀 조재영 * @since 2009.04.10 * @version 1.0 * @see * - * 
+ *      
  * << 개정이력(Modification Information) >>
  *
  *   수정일      수정자           수정내용
@@ -56,74 +57,75 @@ import itn.let.utl.user.service.MjonNoticeSendUtil;
  *   2009.04.10  조재영          최초 생성
  *   2011.08.31  JJY            경량환경 템플릿 커스터마이징버전 생성
  *
- * 

+ *
*/ @Service("userManageService") public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implements EgovUserManageService { /** userManageDAO */ - @Resource(name="userManageDAO") + @Resource(name = "userManageDAO") private UserManageDAO userManageDAO; @Resource(name = "egovAuthorGroupService") private EgovAuthorGroupService egovAuthorGroupService; - + /** mberManageDAO */ - @Resource(name="mberManageDAO") + @Resource(name = "mberManageDAO") private MberManageDAO mberManageDAO; @Resource(name = "faxDAO") public FaxDAO faxDao; - + /** entrprsManageDAO */ - //EBT-CUSTOMIZING//@Resource(name="entrprsManageDAO") - //EBT-CUSTOMIZING//private EntrprsManageDAO entrprsManageDAO; + // EBT-CUSTOMIZING//@Resource(name="entrprsManageDAO") + // EBT-CUSTOMIZING//private EntrprsManageDAO entrprsManageDAO; /** egovUsrCnfrmIdGnrService */ - @Resource(name="egovUsrCnfrmIdGnrService") + @Resource(name = "egovUsrCnfrmIdGnrService") private EgovIdGnrService idgenService; - - @Resource(name="siteManagerDAO") + + @Resource(name = "siteManagerDAO") SiteManagerDAO siteManagerDAO; - + @Resource(name = "MjonMsgDataService") - private MjonMsgDataService mjonMsgDataService; + private MjonMsgDataService mjonMsgDataService; @Resource(name = "egovMjonCashIdGnrService") - private EgovIdGnrService idgenMjonCashId; - - @Resource(name = "egovMjonPointIdGnrService") - private EgovIdGnrService idgenMjonPointId; + private EgovIdGnrService idgenMjonCashId; - @Resource(name="mjonPayDAO") + @Resource(name = "egovMjonPointIdGnrService") + private EgovIdGnrService idgenMjonPointId; + + @Resource(name = "mjonPayDAO") private MjonPayDAO mjonPayDAO; - + @Resource(name = "egovPgMoidGnrService") private EgovIdGnrService idgenPgMoid; - - @Resource(name="taxDAO") - private TaxDAO taxDAO; - + + @Resource(name = "taxDAO") + private TaxDAO taxDAO; + /** 알림전송 Util */ @Resource(name = "mjonNoticeSendUtil") private MjonNoticeSendUtil mjonNoticeSendUtil; - - @Resource(name="MjonCommon") + + @Resource(name = "MjonCommon") private MjonCommon mjonCommon; - - /** 사이트 설정 */ + + /** 사이트 설정 */ @Resource(name = "egovSiteManagerService") - EgovSiteManagerService egovSiteManagerService; - + EgovSiteManagerService egovSiteManagerService; + /** mberManageService */ @Resource(name = "mberManageService") private EgovMberManageService mberManageService; @Resource(name = "mjonMsgAgentStsService") - private MjonMsgAgentStsService mjonMsgAgentStsService; - + private MjonMsgAgentStsService mjonMsgAgentStsService; + /** * 입력한 사용자아이디의 중복여부를 체크하여 사용가능여부를 확인 + * * @param checkId 중복여부 확인대상 아이디 * @return 사용가능여부(아이디 사용회수 int) * @throws Exception @@ -135,38 +137,40 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 화면에 조회된 사용자의 정보를 데이터베이스에서 삭제 + * * @param checkedIdForDel 삭제대상 업무사용자아이디 * @throws Exception */ @Override - public void deleteUser(String checkedIdForDel) throws Exception{ + public void deleteUser(String checkedIdForDel) throws Exception { AuthorGroup authorGroup = new AuthorGroup(); - String [] delId = checkedIdForDel.split(","); - for (int i=0; i 업무사용자 목록정보 * @throws Exception @@ -236,6 +241,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 기 등록된 특정 사용자목록의 전체수를 확인 + * * @param userSearchVO 검색조건 * @return 총사용자갯수(int) * @throws Exception @@ -247,12 +253,13 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 화면에 조회된 사용자의 기본정보를 수정하여 항목의 정합성을 체크하고 수정된 데이터를 데이터베이스에 반영 + * * @param userManageVO 업무사용자 수정정보 * @throws Exception */ @Override public void updateUser(UserManageVO userManageVO) throws Exception { - //패스워드 암호화 + // 패스워드 암호화 String pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); userManageVO.setPassword(pass); @@ -261,6 +268,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 사용자정보 수정시 히스토리 정보를 추가 + * * @param userManageVO 업무사용자 수정정보 * @return result 등록결과 * @throws Exception @@ -272,6 +280,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 업무사용자 암호 수정 + * * @param userManageVO 업무사용자 수정정보(비밀번호) * @throws Exception */ @@ -282,34 +291,35 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 사용자가 비밀번호를 기억하지 못할 때 비밀번호를 찾을 수 있도록 함 + * * @param passVO 업무사용자 암호 조회조건정보 * @return userManageVO 업무사용자 암호정보 * @throws Exception */ @Override - public UserManageVO selectPassword(UserManageVO passVO) throws Exception{ + public UserManageVO selectPassword(UserManageVO passVO) throws Exception { UserManageVO userManageVO = userManageDAO.selectPassword(passVO); return userManageVO; } - + @Override public List selectUserIdAjax(UserManageVO userManageVO) throws Exception { List userNmList = userManageDAO.selectUserIdAjax(userManageVO); return userNmList; } - + @Override public List selectUserIdAjax2(UserManageVO userManageVO) throws Exception { List userNmList = userManageDAO.selectUserIdAjax2(userManageVO); return userNmList; } - + @Override public int selectAdminIdAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminIdAjax(userManageVO); - + } - + @Override public int selectUserPWAjax(UserManageVO userManageVO) throws Exception { int userCount = userManageDAO.selectUserPWAjax(userManageVO); @@ -318,21 +328,18 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement @Override public void updateUserPWAjax(UserManageVO userManageVO) throws Exception { - //패스워드 암호화 + // 패스워드 암호화 String pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); userManageVO.setPassword(pass); userManageDAO.updateUserPWAjax(userManageVO); - + // 페스워드 히스토리 등록 MberManageVO mberManageVO = new MberManageVO(); mberManageVO.setMberId(userManageVO.getEmplyrId()); mberManageVO.setPassword(pass); mberManageDAO.insertMberPWLog(mberManageVO); - + } - - - @Override public void updateUserSttusCode(UserManageVO userManageVO) throws Exception { @@ -353,13 +360,13 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public UserManageVO selectRecentSearchWord(UserManageVO userManageVO) throws Exception { return userManageDAO.selectRecentSearchWord(userManageVO); } - + // 관리자 모바일환경 비번 저장여부 @Override public UserManageVO selectAdminMobilePwSaveCheck(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminMobilePwSaveCheck(userManageVO); } - + @Override public void insertUpdateSearchWord(UserManageVO userManageVO) throws Exception { userManageDAO.insertUpdateSearchWord(userManageVO); @@ -367,7 +374,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement @Override public UserDefaultVO selectUserCount() throws Exception { - return userManageDAO.selectUserCount(); + return userManageDAO.selectUserCount(); } @Override @@ -384,29 +391,28 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public UserManageVO selectUserPw2Ajax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPw2Ajax(userManageVO); } - + @Override - public UserManageVO selectAdminUserSmsCertCheck(UserManageVO userManageVO) throws Exception{ + public UserManageVO selectAdminUserSmsCertCheck(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminUserSmsCertCheck(userManageVO); } - + @Override public UserManageVO selectAddrRequestMsgAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAddrRequestMsgAjax(userManageVO); } - + @Override - //관리자가 사용자의 비밀번호를 변경해주는 서비스 - public UserManageVO selectUserPwByAdminAjax(UserManageVO userManageVO) throws Exception{ + // 관리자가 사용자의 비밀번호를 변경해주는 서비스 + public UserManageVO selectUserPwByAdminAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPwByAdminAjax(userManageVO); } - + @Override public MberManageVO selectUserInfo(MberManageVO mberManageVO) throws Exception { return userManageDAO.selectUserInfo(mberManageVO); } - @Override public void updateUserInfo(MberManageVO mberManageVO) throws Exception { userManageDAO.updateUserInfo(mberManageVO); @@ -416,7 +422,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public void updateSandResul(MberManageVO mberManageVO) throws Exception { userManageDAO.updateSandResul(mberManageVO); } - + @Override public void updateNoticet(MberManageVO mberManageVO) throws Exception { userManageDAO.updateNoticet(mberManageVO); @@ -426,119 +432,118 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public void updateDeleteInfo(MberManageVO mberManageVO) throws Exception { userManageDAO.updateDeleteInfo(mberManageVO); } - - //발신번호 관리 본인인증 DI 값 받아오기 + + // 발신번호 관리 본인인증 DI 값 받아오기 @Override - public String selectUserMblDnById(String mberId) throws Exception{ + public String selectUserMblDnById(String mberId) throws Exception { return userManageDAO.selectUserMblDnById(mberId); } - - //발신번호 관리 본인인증 DI 값 받아오기 + + // 발신번호 관리 본인인증 DI 값 받아오기 @Override - public void updateCrtfcDnValue(UserManageVO userManageVO) throws Exception{ + public void updateCrtfcDnValue(UserManageVO userManageVO) throws Exception { userManageDAO.updateCrtfcDnValue(userManageVO); } // 다음 결제시 결제수단 SELECT @Override - public String selectNextPayMethod(String mberId) throws Exception{ + public String selectNextPayMethod(String mberId) throws Exception { return userManageDAO.selectNextPayMethod(mberId); } // 다음 결제시 결제수단 UPDATE @Override - public void updateNextPayMethod(UserManageVO userManageVO) throws Exception{ + public void updateNextPayMethod(UserManageVO userManageVO) throws Exception { userManageDAO.updateNextPayMethod(userManageVO); } - + @Override public int selectAdminDiChk(UserManageVO userManageVO) { return userManageDAO.selectAdminDiChk(userManageVO); } - + @Override - public boolean selectUserStatusInfo(String userId) throws Exception{ - - String mberSttus = userManageDAO.selectUserStatusInfo(userId); - + public boolean selectUserStatusInfo(String userId) throws Exception { + + String mberSttus = userManageDAO.selectUserStatusInfo(userId); + boolean status = true; - if(mberSttus.equals("B")) { + if (mberSttus.equals("B")) { status = false; } - + return status; } - + @Override public String selectUserStatusInfoCheck(String userId) throws Exception { - String mberSttus = userManageDAO.selectUserStatusInfo(userId); + String mberSttus = userManageDAO.selectUserStatusInfo(userId); return mberSttus; } - + // 결제 여부 @Override public int selectPayCountByUser(UserManageVO userManageVO) { return userManageDAO.selectPayCountByUser(userManageVO); } - + // 후불결제여부 @Override - public int selectUserAfterPayInfo(String userId) throws Exception{ + public int selectUserAfterPayInfo(String userId) throws Exception { return userManageDAO.selectUserAfterPayInfo(userId); - } - + } + @Override public UserManageVO selectAdminSmsNoticeYn(UserManageVO userManageVO) { return userManageDAO.selectAdminSmsNoticeYn(userManageVO); } - public void updateUserAdminSmsNoticeYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { - if(!"".equals(checkedIdForUpt)) { - String [] uptId = checkedIdForUpt.split(","); - for (int i=0; i 슬랙, 문자 알림 No // B선 회원이 아닌경우 전송사 JJ로 변경 로직 포함 public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception { // 업데이트 userManageDAO.updateUserSmishingYn(userManageVO); - + /* - // B선 전송사 이용고객 => 전송사 JJ로 변경안함 - MberManageVO mberManageVO = new MberManageVO(); - mberManageVO.setMberId(userManageVO.getMberId()); - String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); - if (blineCode != null && blineCode.equals("N")) { - // 전송사 JJ로 변경 - mberManageVO.setHotlineAgentName("첫결제 JJ"); - mberManageVO.setHotlineAgentCode("05"); - mberManageVO.setAdmUserId("admin"); - mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); - } - */ - } - + * // B선 전송사 이용고객 => 전송사 JJ로 변경안함 MberManageVO mberManageVO = new + * MberManageVO(); mberManageVO.setMberId(userManageVO.getMberId()); String + * blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); if + * (blineCode != null && blineCode.equals("N")) { // 전송사 JJ로 변경 + * mberManageVO.setHotlineAgentName("첫결제 JJ"); + * mberManageVO.setHotlineAgentCode("05"); mberManageVO.setAdmUserId("admin"); + * mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); } + */ + } + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { - if(!"".equals(checkedIdForUpt)) { - String [] uptIdAll = checkedIdForUpt.split(","); + if (!"".equals(checkedIdForUpt)) { + String[] uptIdAll = checkedIdForUpt.split(","); String[] uptId = Arrays.stream(uptIdAll).distinct().toArray(String[]::new); - for (int i=0; i selectUserPrePaymentYnList(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPrePaymentYnList(userManageVO); } - + // 후불제 회원 월 충전 한도금액 만큼 Cash, Point 충전하기 public void updateUserCashByAutoCash() throws Exception { List userPrePaymentYnList = userManageDAO.selectUserPrePaymentYnList(new UserManageVO()); - for (UserManageVO umVO: userPrePaymentYnList) { + for (UserManageVO umVO : userPrePaymentYnList) { if (umVO.getPaymentCash() > 0) { - - //이번달에 입력된 후불 결제요청 데이터가 있는지 확인 - 혹시나 중복 입력을 방지하기 위함 + + // 이번달에 입력된 후불 결제요청 데이터가 있는지 확인 - 혹시나 중복 입력을 방지하기 위함 int paymentCnt = userManageDAO.selectUserPrePaymentPGdataCount(umVO.getMberId()); - - if(paymentCnt > 0) continue; - - //회원 정보 조회 - MberManageVO mberManageVO = mberManageDAO.selectMber(umVO.getMberId()); //멤버ID에서 유니크ID로 수정 필요 + + if (paymentCnt > 0) + continue; + + // 회원 정보 조회 + MberManageVO mberManageVO = mberManageDAO.selectMber(umVO.getMberId()); // 멤버ID에서 유니크ID로 수정 필요 // CASH 값 넣기 MjonPayVO mjonPayVO = this.setAdvCashVO(umVO); - - //CASH 테이블 - mjonPayDAO.insertCash(mjonPayVO); - - //회원정보 CASH 업데이트 + + // CASH 테이블 + mjonPayDAO.insertCash(mjonPayVO); + + // 회원정보 CASH 업데이트 mjonPayDAO.updateMemberCash(mjonPayVO); /* - * JSPark 2023.01.10 => 포인트는 선충전하지 않음 - // point 값 넣기 - mjonPayVO = this.setAdvPointVO(umVO); - - //POINT 테이블 - mjonPayDAO.insertPoint(mjonPayVO); - - //회원정보 POINT 업데이트 - mjonPayDAO.updateMemberPoint(mjonPayVO); - */ - - //지난 달 사용금액 조회 + * JSPark 2023.01.10 => 포인트는 선충전하지 않음 // point 값 넣기 mjonPayVO = + * this.setAdvPointVO(umVO); + * + * //POINT 테이블 mjonPayDAO.insertPoint(mjonPayVO); + * + * //회원정보 POINT 업데이트 mjonPayDAO.updateMemberPoint(mjonPayVO); + */ + + // 지난 달 사용금액 조회 MjonPayVO payVO = mjonPayDAO.selectPrvMonthUseCash(umVO.getMberId()); - + mjonPayVO.setMoid(idgenPgMoid.getNextStringId()); mjonPayVO.setPgCode("INNOPAY"); mjonPayVO.setPgStatus("0"); - mjonPayVO.setCash(Float.parseFloat(payVO.getCashSum())); //실제충전금액(부가세제외) - - mjonPayVO.setPhone(mberManageVO.getMoblphonNo()); //휴대폰번호 - mjonPayVO.setUserName(mberManageVO.getMberNm()); //이름 - mjonPayVO.setBuyerName("결제전"); //추후 결제 시에 입금자명 수기입력 - - mjonPayVO.setTid(" "); //필수값이라 공백 처리 + mjonPayVO.setCash(Float.parseFloat(payVO.getCashSum())); // 실제충전금액(부가세제외) + + mjonPayVO.setPhone(mberManageVO.getMoblphonNo()); // 휴대폰번호 + mjonPayVO.setUserName(mberManageVO.getMberNm()); // 이름 + mjonPayVO.setBuyerName("결제전"); // 추후 결제 시에 입금자명 수기입력 + + mjonPayVO.setTid(" "); // 필수값이라 공백 처리 mjonPayVO.setResultCode("0000"); mjonPayVO.setResultMsg("후불결제 입금 전"); - + mjonPayVO.setPayMethod("AFTERPAY"); mjonPayVO.setGoodsName("후불결제"); - mjonPayVO.setAmt(payVO.getCashVatSum()); //결제액(부가세포함) + mjonPayVO.setAmt(payVO.getCashVatSum()); // 결제액(부가세포함) mjonPayVO.setUserId(umVO.getMberId()); - + Calendar cal = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); - cal.add(cal.MONTH, - 1); //지난달 - - mjonPayVO.setCalcBaseM(format.format(cal.getTime())); //정산월 : 지난 달 - mjonPayVO.setAfterPayYn("Y"); //후불여부 + cal.add(cal.MONTH, -1); // 지난달 - //PG 테이블에 지난 사용량 누계 추가 + mjonPayVO.setCalcBaseM(format.format(cal.getTime())); // 정산월 : 지난 달 + mjonPayVO.setAfterPayYn("Y"); // 후불여부 + + // PG 테이블에 지난 사용량 누계 추가 mjonPayDAO.insertMjPg(mjonPayVO); - - //세금계산서 데이터 등록 + + // 세금계산서 데이터 등록 TaxVO taxVO = new TaxVO(); - if("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) { - - /*발행타입 1:소득공제 현금영수증 2:지출증빙 현금영수증 9:세금계산서*/ + if ("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) { + + /* 발행타입 1:소득공제 현금영수증 2:지출증빙 현금영수증 9:세금계산서 */ String rcptType; - String regNo=""; - - if("B".equals(mberManageVO.getTaxbillAuto())) { //세금계산서 기업 자동발행 + String regNo = ""; + + if ("B".equals(mberManageVO.getTaxbillAuto())) { // 세금계산서 기업 자동발행 rcptType = "9"; taxVO.setTaxTrgt("B"); - - regNo = mberManageVO.getTaxBizNo(); //사업자등록번호 - - taxVO.setCompanyName(mberManageVO.getTaxBzNm());//회사명 - taxVO.setRepName(mberManageVO.getTaxChrmNm());//대표자명 - taxVO.setAddr(mberManageVO.getTaxAddr());//세금계산서 주소 - - }else if("C".equals(mberManageVO.getTaxbillAuto())) { //세금계산서 개인 자동발행 + + regNo = mberManageVO.getTaxBizNo(); // 사업자등록번호 + + taxVO.setCompanyName(mberManageVO.getTaxBzNm());// 회사명 + taxVO.setRepName(mberManageVO.getTaxChrmNm());// 대표자명 + taxVO.setAddr(mberManageVO.getTaxAddr());// 세금계산서 주소 + + } else if ("C".equals(mberManageVO.getTaxbillAuto())) { // 세금계산서 개인 자동발행 rcptType = "9"; taxVO.setTaxTrgt("C"); /* - if(mberManageVO.getCandidateNo1() != null) { - String candiNo1 = mberManageVO.getCandidateNo1(); - String candiNo2 = mberManageVO.getCandidateNo2(); - - regNo = candiNo1 + candiNo2; //주민등록번호 - } - taxVO.setRepName(mberManageVO.getCandidateNm());//후보자 성명 - taxVO.setAddr(mberManageVO.getCandidateAddr());//후보자 주소 - */ + * if(mberManageVO.getCandidateNo1() != null) { String candiNo1 = + * mberManageVO.getCandidateNo1(); String candiNo2 = + * mberManageVO.getCandidateNo2(); + * + * regNo = candiNo1 + candiNo2; //주민등록번호 } + * taxVO.setRepName(mberManageVO.getCandidateNm());//후보자 성명 + * taxVO.setAddr(mberManageVO.getCandidateAddr());//후보자 주소 + */ regNo = mberManageVO.getTaxCIhidNum(); // 세금계산서 개인 주민등록번호 - taxVO.setRepName(mberManageVO.getTaxCNm()); //세금계산서 개인 성명 - taxVO.setAddr(mberManageVO.getTaxCAddr()); //세금계산서 개인 주소 - - } else { //현금영수증 자동발행 + taxVO.setRepName(mberManageVO.getTaxCNm()); // 세금계산서 개인 성명 + taxVO.setAddr(mberManageVO.getTaxCAddr()); // 세금계산서 개인 주소 + + } else { // 현금영수증 자동발행 rcptType = mberManageVO.getCashbillType(); } - taxVO.setMoid(mjonPayVO.getMoid()); //주문ID - taxVO.setRcptType(rcptType);//발행타입 - /*발행번호 개인세금계산서:주민등록번호 / 기업세금계산서:사업자번호 / 소득공제현금영수증:휴대폰번호 / 지출증빙현금영수증:사업자번호*/ + taxVO.setMoid(mjonPayVO.getMoid()); // 주문ID + taxVO.setRcptType(rcptType);// 발행타입 + /* 발행번호 개인세금계산서:주민등록번호 / 기업세금계산서:사업자번호 / 소득공제현금영수증:휴대폰번호 / 지출증빙현금영수증:사업자번호 */ taxVO.setRegNo(regNo); - taxVO.setEmail(mberManageVO.getTaxMngEmail());//담당자이메일 - taxVO.setPhone(mberManageVO.getTaxMngPhoneNum());//담당자 휴대폰번호 - taxVO.setConfirmYn("N"); //완료여부 + taxVO.setEmail(mberManageVO.getTaxMngEmail());// 담당자이메일 + taxVO.setPhone(mberManageVO.getTaxMngPhoneNum());// 담당자 휴대폰번호 + taxVO.setConfirmYn("N"); // 완료여부 taxVO.setFrstRegisterId(mberManageVO.getMberId()); - + taxDAO.insertCashBill(taxVO); // mjonPayDAO.insertMjTax(mjonPayVO); //PGTax 테이블 } - + } } - - } + + } /** * @param mjonPayVO * @return - * @throws Exception - * cash table 값 넣기 - * 2022.04.12 JSP => mjonPayVO.getMoid() => userId 사용 제거 (휴대폰결제에서만 사용) + * @throws Exception cash table 값 넣기 2022.04.12 JSP => mjonPayVO.getMoid() => + * userId 사용 제거 (휴대폰결제에서만 사용) */ - private MjonPayVO setAdvCashVO(UserManageVO userManageVO) throws Exception{ - - //캐쉬 테이블 변수 생성 + private MjonPayVO setAdvCashVO(UserManageVO userManageVO) throws Exception { + + // 캐쉬 테이블 변수 생성 MjonPayVO mjonPayVO = new MjonPayVO(); - mjonPayVO.setCashId(idgenMjonCashId.getNextStringId()) ; - mjonPayVO.setCash((float)userManageVO.getNowChargeCash()); // 자동 충전금액 - 전월 남은 금액 - mjonPayVO.setOrderId("ADVPAY"); // 선지급 + mjonPayVO.setCashId(idgenMjonCashId.getNextStringId()); + mjonPayVO.setCash((float) userManageVO.getNowChargeCash()); // 자동 충전금액 - 전월 남은 금액 + mjonPayVO.setOrderId("ADVPAY"); // 선지급 mjonPayVO.setUserId(userManageVO.getMberId()); mjonPayVO.setFrstRegisterId(userManageVO.getMberId()); - String memo = "후불제 회원 " + userManageVO.getNowChargeCash() + "원 충전" ; - mjonPayVO.setMemo(memo); //캐쉬메모 - + String memo = "후불제 회원 " + userManageVO.getNowChargeCash() + "원 충전"; + mjonPayVO.setMemo(memo); // 캐쉬메모 + return mjonPayVO; } @Override public Map selectFaxSendList(FaxGroupDataVO faxGroupDataVO) { - Map resultMap = new HashMap(); - - //기본 내림차순 정렬 - if(StringUtils.isEmpty(faxGroupDataVO.getSearchSortOrd())) { - - faxGroupDataVO.setSearchSortOrd("desc"); - faxGroupDataVO.setSearchSortCnd("doneDate"); - } - if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) - && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) - ) { - faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); - faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); - } - + // 기본 내림차순 정렬 + if (StringUtils.isEmpty(faxGroupDataVO.getSearchSortOrd())) { + + faxGroupDataVO.setSearchSortOrd("desc"); + faxGroupDataVO.setSearchSortCnd("doneDate"); + } + + if (StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) + && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())) { + faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); + faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); + } + /** pageing */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(faxGroupDataVO.getPageIndex()); @@ -877,19 +872,18 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement List faxGroupListVO = faxDao.selectFaxSendList(faxGroupDataVO); try { Map faxPriceMap = faxDao.selectSentAndErrorPrice(faxGroupDataVO); - resultMap.put("faxPriceMap", faxPriceMap); - + resultMap.put("faxPriceMap", faxPriceMap); + } catch (Exception e) { e.printStackTrace(); // TODO: handle exception } - + paginationInfo.setTotalRecordCount(faxGroupListVO.size() > 0 ? faxGroupListVO.get(0).getTotCnt() : 0); resultMap.put("faxGroupListVO", faxGroupListVO); resultMap.put("paginationInfo", paginationInfo); return resultMap; } - } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index fa655e4a..dfac412f 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3774,6 +3774,24 @@ AND CERT_USE_YN = 'Y' + + diff --git a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp index f3caaae5..cab58bf2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp @@ -178,6 +178,8 @@ function actionLogin(){ success : function(data) { //alert(data.status); //alert(data.data.moblphonNo); + console.log('==========='); + console.log(data.mberCertPhoneList); if (data.status=="success"){ //번호인증팝업 띄우기 @@ -190,8 +192,14 @@ function actionLogin(){ $("#input_list_item_5").show(); $("#input_list_item_6").show(); - $("#hp_text2").val(data.data.moblphonNo); - +// $("#hp_text2").val(data.data.moblphonNo); + var $select = $('#hp_text2'); + data.mberCertPhoneList.forEach(function(item) { + $select.append($('