등급제 시행여부 로직수정
@dd44ad160b59fe7dfd2f63f4a0ab5ed76c2544ab
--- src/main/java/itn/let/sym/grd/service/MberGrdVO.java
+++ src/main/java/itn/let/sym/grd/service/MberGrdVO.java
... | ... | @@ -39,8 +39,9 @@ |
| 39 | 39 |
private String grdStatusNm; |
| 40 | 40 |
private int mberGrdHistNo; |
| 41 | 41 |
|
| 42 |
- private String grdNoti; // 회원등급제 시행 여부 |
|
| 43 |
- private String grdDate; // 회원등급제 시행일자 |
|
| 42 |
+ private String grdNoti; // 회원등급제 시행 여부 |
|
| 43 |
+ private String grdDate; // 회원등급제 시행일자 |
|
| 44 |
+ private String grdDatePrgYn; // 회원등급제 시행일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N) |
|
| 44 | 45 |
|
| 45 | 46 |
// 검색필터 |
| 46 | 47 |
private String searchGrdStatus; |
... | ... | @@ -233,6 +234,12 @@ |
| 233 | 234 |
public void setGrdDate(String grdDate) {
|
| 234 | 235 |
this.grdDate = grdDate; |
| 235 | 236 |
} |
| 237 |
+ public String getGrdDatePrgYn() {
|
|
| 238 |
+ return grdDatePrgYn; |
|
| 239 |
+ } |
|
| 240 |
+ public void setGrdDatePrgYn(String grdDatePrgYn) {
|
|
| 241 |
+ this.grdDatePrgYn = grdDatePrgYn; |
|
| 242 |
+ } |
|
| 236 | 243 |
public String getSearchGrdStatus() {
|
| 237 | 244 |
return searchGrdStatus; |
| 238 | 245 |
} |
--- src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
... | ... | @@ -121,7 +121,7 @@ |
| 121 | 121 |
// Step 1. 등급제 시행 ON 일경우 |
| 122 | 122 |
MberGrdVO mberGrdVO1 = new MberGrdVO(); |
| 123 | 123 |
mberGrdVO1 = selectMberSettingDetail(mberGrdVO); |
| 124 |
- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) {
|
|
| 124 |
+ if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
|
|
| 125 | 125 |
// 문자할인, B선라인 대상자 초기화 |
| 126 | 126 |
updateCnt1 = updateMberGrdEndBySale(mberGrdVO); |
| 127 | 127 |
|
... | ... | @@ -155,10 +155,10 @@ |
| 155 | 155 |
mberGrdVO.setRegId(mberGrdVO.getMberId()); |
| 156 | 156 |
mberGrdVO.setEditId(mberGrdVO.getMberId()); |
| 157 | 157 |
|
| 158 |
- // Step 1. 등급제 시행 ON 일경우 |
|
| 158 |
+ // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우) |
|
| 159 | 159 |
MberGrdVO mberGrdVO1 = new MberGrdVO(); |
| 160 | 160 |
mberGrdVO1 = selectMberSettingDetail(mberGrdVO); |
| 161 |
- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) {
|
|
| 161 |
+ if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
|
|
| 162 | 162 |
mberGrdVO.setGrdDate(mberGrdVO1.getGrdDate()); |
| 163 | 163 |
|
| 164 | 164 |
// Step 2. /협의/스팸/비선등급 적용 제외 |
--- src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
... | ... | @@ -15,12 +15,21 @@ |
| 15 | 15 |
|
| 16 | 16 |
<!-- 등급제 시행여부 상세 --> |
| 17 | 17 |
<select id="mberGrdDAO.selectMberSettingDetail" parameterClass="mberGrdVO" resultClass="mberGrdVO"> |
| 18 |
+ <![CDATA[ |
|
| 18 | 19 |
SELECT |
| 19 | 20 |
GRD_NOTI AS grdNoti |
| 20 |
- , DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate |
|
| 21 |
+ , DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate |
|
| 22 |
+ , CASE |
|
| 23 |
+ WHEN IFNULL(GRD_DATE, '') = '' |
|
| 24 |
+ THEN 'N' |
|
| 25 |
+ WHEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d') <= DATE_FORMAT(NOW(), '%Y-%m-%d') |
|
| 26 |
+ THEN 'Y' |
|
| 27 |
+ ELSE 'N' |
|
| 28 |
+ END grdDatePrgYn |
|
| 21 | 29 |
FROM |
| 22 | 30 |
MJ_MBER_SETTING |
| 23 | 31 |
LIMIT 1 |
| 32 |
+ ]]> |
|
| 24 | 33 |
</select> |
| 25 | 34 |
|
| 26 | 35 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?