From 4ddae8d6ebe265e5d721f013bc4179382d7a5cb1 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 4 Jul 2023 12:53:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:api=20=EC=9A=94=EC=B2=AD=EC=97=90=20?= =?UTF-8?q?=EC=9D=98=ED=95=9C=20=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=B5=9C=EC=8B=A0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/test/web/TestController.java | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java index f4641c14..591ce491 100644 --- a/src/main/java/itn/let/mjo/test/web/TestController.java +++ b/src/main/java/itn/let/mjo/test/web/TestController.java @@ -1157,21 +1157,10 @@ public class TestController { try { - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - - - // api인지 확인 - ApiKeyVO apiKeyVO = new ApiKeyVO(); - apiKeyVO.setAccessKey(mjonMsgVO.getAccessKey()); - List resultList = apiKeyMngService.selectCheckApiKeyDup(apiKeyVO); - - if(resultList.size() >= 1) { - userId = resultList.get(0).getMberId(); - } - - +// LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; +// userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + userId = mjonMsgVO.getMberId(); if(userId.equals("")) { modelAndView.addObject("message", "로그인 후 이용이 가능합니다."); @@ -1388,6 +1377,9 @@ public class TestController { } + // 토탈금액 "," 리플레이스 처리 + mjonMsgVO.setTotPrice(mjonMsgVO.getTotPrice().replaceAll(",", "")); + float tmpOrgEachPrice = Float.parseFloat(mjonMsgVO.getEachPrice()); float tmpOrgTotPrice = Float.parseFloat(mjonMsgVO.getTotPrice()); @@ -1517,8 +1509,6 @@ public class TestController { shortMsgVO = mjonMsgVO; longMsgVO = mjonMsgVO; imgMsgVO = mjonMsgVO; - System.out.println("shortMsgVO :: "+ shortMsgVO.getsPrice()); - System.out.println("mjonMsgVO :: "+ mjonMsgVO.getsPrice()); int shortMsgCnt = Integer.parseInt(mjonMsgVO.getShortMsgCnt()); int longMsgCnt = Integer.parseInt(mjonMsgVO.getLongMsgCnt()); @@ -1768,7 +1758,14 @@ public class TestController { imgMsgVO.setRep4List(imgRep4); //개별단가 계산하기 - String eachPrice = shortMsgVO.getsPrice(); + String eachPrice = imgMsgVO.getpPrice(); + + //api 서버에서 pPrice 값이 없는 경우가 있어서 오류 방지를위해서 추가 + if(eachPrice == null) { + + eachPrice = imgMsgVO.getEachPrice(); + + } /** * 그림문자에 치환 내용이 포함되어 있는 경우 단가 계산하기. @@ -1813,9 +1810,12 @@ public class TestController { //개별단가 계산하기 String eachPrice = shortMsgVO.getsPrice(); - if(StringUtils.isEmpty(eachPrice)) - { + + //api 서버에서 sPrice 값이 없는 경우가 있어서 오류 방지를위해서 추가 + if(eachPrice == null) { + eachPrice = shortMsgVO.getEachPrice(); + } /** @@ -1845,7 +1845,6 @@ public class TestController { shortMsgVO.setMsgType("4"); } - System.out.println("shortMsgVO.getEachPrice() :: "+ shortMsgVO.getEachPrice()); //총금액 계산하기 Float sTotPrice = Float.parseFloat(shortMsgVO.getEachPrice()) * shortCnt; shortMsgVO.setTotPrice(sTotPrice.toString()); @@ -1871,6 +1870,13 @@ public class TestController { String eachPrice = longMsgVO.getmPrice(); + //api 서버에서 mPrice 값이 없는 경우가 있어서 오류 방지를위해서 추가 + if(eachPrice == null) { + + eachPrice = longMsgVO.getEachPrice(); + + } + if(fileCount > 2) {//그림 이미지가 3개 eachPrice = mjonMsgVO.getP3Price(); @@ -2001,9 +2007,7 @@ public class TestController { }else { //문자발송 함수 호출 - 일괄변환이 없거나, 그림문자 일괄변환의 경우 한번에 전송 처리 - System.out.println("???????"); modelAndView = fncSendMsg(mjonMsgVO); - System.out.println("!!!!!!!!!!!!"); } @@ -2060,16 +2064,13 @@ public class TestController { // 법인폰 알람여부 체크 JoinSettingVO joinSettingVO = new JoinSettingVO(); joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); - // SMS 체크 - if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { -// getAdminPhoneSendMsgData(mjonMsgVO); - } // SLACK 체크 if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { //Slack으로 메세지 전송 처리 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + System.out.println("slack noti"); +// comm.getAdminSandSlack(mjonMsgVO); } } @@ -2079,11 +2080,6 @@ public class TestController { } return modelAndView; - - - - - } /** * 문자발송시 치환문자가 있거나 단문, 장문 일경우 타는 로직 From cd6154280ce0628fd840c296b52010c781a6cd9c Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 10 Jul 2023 10:10:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20pms=20-=203258=20"=ED=8C=A9?= =?UTF-8?q?=EC=8A=A4=20=EB=B0=9C=EC=86=A1=EC=A0=84=20=EB=B9=84=EC=9A=A9=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC"=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/fax/faxDataView.jsp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index fc0eb24c..ed562130 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -51,6 +51,11 @@ return false; } + if(!moneyChk()){ + return false; + } + + if(!valueChk()){ return false; } @@ -152,6 +157,19 @@ } + function moneyChk(){ + + //회원 보유 잔액 비교 + var totPriceOnly = stringReplaceAll($('#totalPriceTxt').text() , ",", ""); + var userMoneyOnly = stringReplaceAll($('#hdUserMoney').text(), ",", ""); + + if(parseFloat(userMoneyOnly) < parseFloat(totPriceOnly)){ + alert("팩스 발송에 필요한 회원님의 보유 잔액이 부족 합니다."); + return false; + } + } + + function valueChk(){ if($('#title').val() == ''){ alert('제목을 입력해 주세요.');