From 52c53a10bf41491a2f2bc9f0c88b6f90078b08a0 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 11 Jul 2023 16:24:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=8B=A8?=
 =?UTF-8?q?=EA=B0=80=20=EC=B6=94=EC=B6=9C=20=3D>=20=EC=8B=9C=EC=8A=A4?=
 =?UTF-8?q?=ED=85=9C=20=EB=8B=A8=EA=B0=80=EC=97=90=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../grd/service/impl/MberGrdServiceImpl.java  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
index d595dea6..9cabd803 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
@@ -32,17 +32,24 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 	// 등급제 단가 추출 => 시스템 단가에 적용
 	@Override
 	public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
-		MberGrdVO mberGrdVO = new MberGrdVO();
-		mberGrdVO = selectMberGrdInfo(mberId);
-		if (null != mberGrdVO) {
-			if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
-				sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
-				sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
-				sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
-				sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
-				sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
+		
+		// Step 1. 등급제 시행 ON 일경우
+		MberGrdVO mberGrdVO = new MberGrdVO();		
+		MberGrdVO mberGrdVO1 = new MberGrdVO();
+		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+			mberGrdVO = new MberGrdVO();
+			mberGrdVO = selectMberGrdInfo(mberId);
+			if (null != mberGrdVO) {
+				if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
+					sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
+					sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
+					sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
+					sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
+					sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
+				}
 			}
-		}
+		}		
 		
 		return sysJoinSetVO;
 	}