From 9806c4be5ffd497ebd0786567d54baec4e7719ac Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 9 Aug 2023 14:20:02 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B8=88=EC=95=A1=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20=3D>=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=ED=95=98=EB=A0=A4=EB=8A=94=20=EB=8B=A8=EA=B0=80?= =?UTF-8?q?=EA=B0=80=20=EC=8B=9C=EC=8A=A4=ED=85=9C=EB=8B=A8=EA=B0=80?= =?UTF-8?q?=EC=99=80=20=EB=8F=99=EC=9D=BC=ED=95=A0=EA=B2=BD=EC=9A=B0=200?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uss/umt/web/EgovUserManageController.java | 34 ++++++++++++++++++- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 2 ++ .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 19 +++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index bec6e7db..507c37a0 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1092,6 +1092,14 @@ public class EgovUserManageController { //1.시스템 기본 단가 정보 조회하기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + model.addAttribute("sysShortPrice", sysJoinSetVO.getShortPrice()); + model.addAttribute("sysLongPrice", sysJoinSetVO.getLongPrice()); + model.addAttribute("sysPicturePrice", sysJoinSetVO.getPicturePrice()); + model.addAttribute("sysPicture2Price", sysJoinSetVO.getPicture2Price()); + model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price()); + model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price()); + model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice()); + // 등급제 단가 추출 => 시스템 단가에 적용 sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); @@ -2791,7 +2799,31 @@ public class EgovUserManageController { } try { - + //1.시스템 기본 단가 정보 조회하기 + JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 문자 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅 + if (Float.compare(sysJoinSetVO.getShortPrice(), mberManageVO.getShortPrice()) == 0) { + if (Float.compare(sysJoinSetVO.getLongPrice(), mberManageVO.getLongPrice()) == 0) { + if (Float.compare(sysJoinSetVO.getPicturePrice(), mberManageVO.getPicturePrice()) == 0) { + if (Float.compare(sysJoinSetVO.getPicture2Price(), mberManageVO.getPicture2Price()) == 0) { + if (Float.compare(sysJoinSetVO.getPicture3Price(), mberManageVO.getPicture3Price()) == 0) { + mberManageVO.setShortPrice(0); + mberManageVO.setLongPrice(0); + mberManageVO.setPicturePrice(0); + mberManageVO.setPicture2Price(0); + mberManageVO.setPicture3Price(0); + mberManageVO.setPicture3Price(0); + } + } + } + } + } + + // 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅 + if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) { + mberManageVO.setKakaoAtPrice(0); + } + int resultCnt = mberManageService.updateUserPrice(mberManageVO); if(resultCnt > 0) { diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index af9ffe33..592c733e 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -680,6 +680,8 @@ , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00') , A.EDIT_DATE = NOW() , A.TEMP_YN = 'Y' + , A.GRD_END_DATE = '9999:12:31 23:59:59' + , A.GRD_STATUS = 'Y' WHERE A.TEMP_YN = 'N' AND C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING) ]]> diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index 278b17b7..1c2e07e2 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -61,6 +61,12 @@ tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}