diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java index fec76fce..60e925cd 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java @@ -56,6 +56,7 @@ public class KakaoAlimTalkController { if(userId == "") { return "redirect:/web/user/login/login.do"; } + model.addAttribute("loginVO", loginVO); KakaoVO kakaoVO = new KakaoVO(); kakaoVO.setUserId(userId); diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java index 6ce18690..1e6c0c2c 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java @@ -124,25 +124,22 @@ public class KakaoAlimTalkSendController { , @ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String author = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - if(userId == "") { + + model.addAttribute("loginVO", loginVO); +/* if(userId == "") { return "redirect:/web/user/login/login.do"; - } + }*/ - String author = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); - // 사용자 아이디를 이용한 발신프로필 조회 - kakaoVO.setUserId(userId); - List selectKakaoProfileList = new ArrayList<>(); - try { - selectKakaoProfileList = kakaoApiService.selectKakaoProfileList(kakaoVO); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - model.addAttribute("kakaoProfileList", selectKakaoProfileList); - - if(!userId.equals("")) {//로그인 된 사용자만 발신번호를 불러오도록 수정 + //2.사용자 개인 단가 정보 불러오기 + if(!userId.equals("") && !author.equals("ROLE_ADMIN")) { + + // 사용자 아이디를 이용한 발신프로필 조회 + kakaoVO.setUserId(userId); + List selectKakaoProfileList = kakaoApiService.selectKakaoProfileList(kakaoVO); + model.addAttribute("kakaoProfileList", selectKakaoProfileList); //발신번호 불러오기 //아이디 발신번호 리스트 불러오기. @@ -157,50 +154,43 @@ public class KakaoAlimTalkSendController { } model.addAttribute("resultPhonList", resultPhonList); - } - - - //2.사용자 개인 단가 정보 불러오기 - MberManageVO mberManageVO = new MberManageVO(); - - if(!userId.equals("") && !author.equals("ROLE_ADMIN")) { - mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); + MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); model.addAttribute("atSmishingYn", mberManageVO.getAtSmishingYn()); + + //3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용 + Float shortPrice = mberManageVO.getShortPrice(); + Float longPrice = mberManageVO.getLongPrice(); + Float picturePrice = mberManageVO.getPicturePrice(); + Float picture2Price = mberManageVO.getPicture2Price(); + Float picture3Price = mberManageVO.getPicture3Price(); + BigDecimal userMoney = new BigDecimal(mberManageVO.getUserMoney()).setScale(2, RoundingMode.HALF_EVEN); + + model.addAttribute("userMoney", userMoney); + + + ////////////////////////////////////////////////////////////////// + + //최근 전송 내역 + MjonMsgDataVO searchVO = new MjonMsgDataVO(); + Calendar cal = Calendar.getInstance(); + Date now = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); + cal.setTime(now); + cal.add(Calendar.DATE, -3); + String chkDate = format.format(cal.getTime()); + searchVO.setUserId(userId); + searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작 + model.addAttribute("resultLatestMsgList", mjonMsgDataService.selectLatestMsgList(searchVO)); + + //자주보내는 번호 + model.addAttribute("resultBookMarkMsgList", mjonMsgDataService.selectBookMarkMsgList(searchVO)); + + // 사용자 저으이 + model.addAttribute("sendPrice", kakaoSendUtil.selectSendPriceOfKakaoAtAndSmsAndMms(userId)); } - //3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용 - Float shortPrice = mberManageVO.getShortPrice(); - Float longPrice = mberManageVO.getLongPrice(); - Float picturePrice = mberManageVO.getPicturePrice(); - Float picture2Price = mberManageVO.getPicture2Price(); - Float picture3Price = mberManageVO.getPicture3Price(); - BigDecimal userMoney = new BigDecimal(mberManageVO.getUserMoney()).setScale(2, RoundingMode.HALF_EVEN); - - model.addAttribute("userMoney", userMoney); - - - ////////////////////////////////////////////////////////////////// - - //최근 전송 내역 - MjonMsgDataVO searchVO = new MjonMsgDataVO(); - Calendar cal = Calendar.getInstance(); - Date now = new Date(); - SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); - cal.setTime(now); - cal.add(Calendar.DATE, -3); - String chkDate = format.format(cal.getTime()); - searchVO.setUserId(userId); - searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작 - model.addAttribute("resultLatestMsgList", mjonMsgDataService.selectLatestMsgList(searchVO)); - - //자주보내는 번호 - model.addAttribute("resultBookMarkMsgList", mjonMsgDataService.selectBookMarkMsgList(searchVO)); - - // 사용자 저으이 - model.addAttribute("sendPrice", kakaoSendUtil.selectSendPriceOfKakaoAtAndSmsAndMms(userId)); - return "web/kakao/msgdata/at/KakaoAlimtalkMsgDataView"; } diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java index e28d9590..83d05b39 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java @@ -99,6 +99,7 @@ public class KakaoAlimTalkTemplateController { if(userId == "") { return "redirect:/web/user/login/login.do"; } + model.addAttribute("loginVO", loginVO); KakaoVO kakaoVO = new KakaoVO(); kakaoVO.setUserId(userId); diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java index 09c9933a..d85d87b5 100644 --- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java +++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java @@ -62,7 +62,7 @@ public class KakaoStepInfoController { if(userId == "") { return "redirect:/web/user/login/login.do"; } - + model.addAttribute("loginVO", loginVO); BoardMasterVO bmVO = new BoardMasterVO(); PaginationInfo paginationInfo = new PaginationInfo(); diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp index b51e0dae..554ca0e6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp @@ -66,8 +66,10 @@ function fnLinkPageTopTab(tabInfo){ function usrDeptChk(){ - var usrDept = '${LoginVO.dept}'; - + var usrDept = '${loginVO.dept}'; + + alert(usrDept); + //카카오 알림톡 기업회원 전용체크 if(usrDept != 'c'){ diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp index 158faa25..ec856370 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp @@ -14,6 +14,7 @@