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; }