Commit @098b1ee6398dffed030940af2f64ed2cf76149e1

itn 2023-07-12

이벤트 진행여부 쿼리 추가

@098b1ee6398dffed030940af2f64ed2cf76149e1

18ce8d6

098b1ee

src/main/java/itn/let/sym/grd/service/MberGrdService.java

--- src/main/java/itn/let/sym/grd/service/MberGrdService.java

+++ src/main/java/itn/let/sym/grd/service/MberGrdService.java


 	public MberGrdVO selectMberGrdDetail(MberGrdVO mberGrdVO) throws Exception;
 
 	// 회원 등급제 대상여부 정보(사용자화면용)
-	public MberGrdVO selectMberGrdInfo(String userId) throws Exception;
+	public MberGrdVO selectMberGrdInfo(String mberId) throws Exception;
 	
 	// 회원별 등급 누적결제액 상세
 	public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception;

 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
 	
 	// 회원별 등급 진행여부
-	int selectMberGrdPrgCnt(String userId) throws Exception;
+	int selectMberGrdPrgCnt(String mberId) throws Exception;
+	
+	// 회원별 이벤트 진행여부
+	int selectMberEventPrgCnt(String mberId) throws Exception;
 	
 	// 회원별 등급 저장여부
-	int selectMberGrdSaveCnt(String userId) throws Exception;
+	int selectMberGrdSaveCnt(String mberId) throws Exception;
 	
 	
 	// 회원별 등급 히스토리 등록

18ce8d6

098b1ee

src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java


 	}
 
 	// 회원 등급제 대상여부 정보(사용자화면용)
-	public MberGrdVO selectMberGrdInfo(String userId) throws Exception{
-		return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", userId);
+	public MberGrdVO selectMberGrdInfo(String mberId) throws Exception{
+		return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", mberId);
 	}
 	
 	// 회원별 등급 누적결제액 상세

 	}		
 	
 	// 회원별 등급 진행여부
-	public int selectMberGrdPrgCnt(String userId) throws Exception{
-		return (int) select("mberGrdDAO.selectMberGrdPrgCnt", userId);
+	public int selectMberGrdPrgCnt(String mberId) throws Exception{
+		return (int) select("mberGrdDAO.selectMberGrdPrgCnt", mberId);
+	}	
+	
+	// 회원별 이벤트 진행여부
+	public int selectMberEventPrgCnt(String mberId) throws Exception{
+		return (int) select("mberGrdDAO.selectMberEventPrgCnt", mberId);
 	}	
 	
 	// 회원별 등급 저장여부
-	public int selectMberGrdSaveCnt(String userId) throws Exception{
-		return (int) select("mberGrdDAO.selectMberGrdSaveCnt", userId);
+	public int selectMberGrdSaveCnt(String mberId) throws Exception{
+		return (int) select("mberGrdDAO.selectMberGrdSaveCnt", mberId);
 	}	
 	
 	

18ce8d6

098b1ee

src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java


 	
 	// 회원 등급제 대상여부 정보(사용자화면용)
 	@Override
-	public MberGrdVO selectMberGrdInfo(String userId) throws Exception {
+	public MberGrdVO selectMberGrdInfo(String mberId) throws Exception {
 		// 공백제거
-		userId = userId.trim();
+		mberId = mberId.trim();
 		
-		return mberGrdDAO.selectMberGrdInfo(userId);
+		return mberGrdDAO.selectMberGrdInfo(mberId);
 	}	
 	
 	// 회원별 등급 누적결제액 상세

 	
 	// 회원별 등급 진행여부
 	@Override
-	public int selectMberGrdPrgCnt(String userId) throws Exception{
+	public int selectMberGrdPrgCnt(String mberId) throws Exception{
 		// 공백제거
-		userId = userId.trim();
+		mberId = mberId.trim();
 		
-		return mberGrdDAO.selectMberGrdPrgCnt(userId);
+		return mberGrdDAO.selectMberGrdPrgCnt(mberId);
+	}
+	
+	// 회원별 이벤트 진행여부
+	@Override
+	public int selectMberEventPrgCnt(String mberId) throws Exception{
+		// 공백제거
+		mberId = mberId.trim();
+		
+		return mberGrdDAO.selectMberEventPrgCnt(mberId);
 	}
 	
 	// 회원별 등급 저장여부
 	@Override
-	public int selectMberGrdSaveCnt(String userId) throws Exception{
+	public int selectMberGrdSaveCnt(String mberId) throws Exception{
 		// 공백제거
-		userId = userId.trim();
+		mberId = mberId.trim();
 		
-		return mberGrdDAO.selectMberGrdSaveCnt(userId);
+		return mberGrdDAO.selectMberGrdSaveCnt(mberId);
 	}
 	
 	

18ce8d6

098b1ee

src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml


 			, DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d')			AS grdEndDate
 			, A.GRD_STATUS				AS grdStatus
 			, CASE
-				WHEN A.GRD_STATUS = 'Y' AND A.GRD_END_DATE >= NOW()  
-				THEN '진행중'
+				WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d')
+				THEN '대기'			
+				WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
+				THEN '진행'
 				WHEN A.GRD_STATUS = 'N'
-				THEN '미진행'
+				THEN '대기'
 				WHEN A.GRD_STATUS = 'E'
 				THEN '종료'
 				ELSE '종료'

 				ON A.GRD_SET_NO = B.GRD_SET_NO
 			INNER JOIN LETTNGNRLMBER C
 				ON A.MBER_ID = C.MBER_ID
+			LEFT OUTER JOIN MJ_EVENT_MBER_INFO E
+				ON A.MBER_ID = E.MBER_ID
 		WHERE 1=1
 			AND C.MBER_STTUS = 'Y'
             <isNotEmpty property="searchKeyword">

 				, SUM(S.AMT) AS AMT_SUM_ORIGIN
 				, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 				, (
-					SELECT MIN(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+					SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 				 ) GRD_SET_NO 
 			FROM MJ_PG S 
 			LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
 				ON S.USER_ID = SS.MBER_ID
-				AND SS.EVENT_START_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			WHERE S.PG_STATUS = '1'	
 				AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			GROUP BY S.USER_ID
 		) M
 		WHERE M.GRD_SET_NO IS NOT NULL
-		AND M.USER_ID = #mberId#
+			AND M.AMT_SUM > 0
+			AND M.USER_ID = #mberId#
 	]]>
 	</select>
 	

 					, SUM(S.AMT) AS AMT_SUM_ORIGIN
 					, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 					, (
-						SELECT MIN(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+						SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 					 ) GRD_SET_NO 
 				FROM MJ_PG S 
 				LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
 					ON S.USER_ID = SS.MBER_ID
-					AND SS.EVENT_START_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
 				WHERE S.PG_STATUS = '1'	
 					AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
 				GROUP BY S.USER_ID
 			) M
 			WHERE M.GRD_SET_NO IS NOT NULL
+				AND M.AMT_SUM > 0
 		) B
 			ON A.MBER_ID = B.USER_ID
 		INNER JOIN MJ_MBER_GRD_SETTING C

 		LIMIT 1
 	</select>
 	
+	<!-- 회원별 이벤트 진행여부 -->
+	<select id="mberGrdDAO.selectMberEventPrgCnt" parameterClass="String" resultClass="Integer">
+		SELECT
+			COUNT(0)
+		FROM MJ_EVENT_MBER_INFO A 
+		WHERE A.MBER_ID = #mberId#
+			AND A.EVENT_STATUS = 'Y' 
+			AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(A.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(A.EVENT_END_DATE, '%Y-%m-%d')				
+		LIMIT 1
+	</select>
+
 	<!-- 회원별 등급 저장여부 -->
 	<select id="mberGrdDAO.selectMberGrdSaveCnt" parameterClass="String" resultClass="Integer">
 		SELECT

Add a comment

Open 0
Closed 0

List

...	...	@@ -32,7 +32,7 @@
32	32	public MberGrdVO selectMberGrdDetail(MberGrdVO mberGrdVO) throws Exception;
33	33
34	34	// 회원 등급제 대상여부 정보(사용자화면용)
35		- public MberGrdVO selectMberGrdInfo(String userId) throws Exception;
	35	+ public MberGrdVO selectMberGrdInfo(String mberId) throws Exception;
36	36
37	37	// 회원별 등급 누적결제액 상세
38	38	public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception;
...	...	@@ -56,10 +56,13 @@
56	56	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
57	57
58	58	// 회원별 등급 진행여부
59		- int selectMberGrdPrgCnt(String userId) throws Exception;
	59	+ int selectMberGrdPrgCnt(String mberId) throws Exception;
	60	+
	61	+ // 회원별 이벤트 진행여부
	62	+ int selectMberEventPrgCnt(String mberId) throws Exception;
60	63
61	64	// 회원별 등급 저장여부
62		- int selectMberGrdSaveCnt(String userId) throws Exception;
	65	+ int selectMberGrdSaveCnt(String mberId) throws Exception;
63	66
64	67
65	68	// 회원별 등급 히스토리 등록

...	...	@@ -49,8 +49,8 @@
49	49	}
50	50
51	51	// 회원 등급제 대상여부 정보(사용자화면용)
52		- public MberGrdVO selectMberGrdInfo(String userId) throws Exception{
53		- return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", userId);
	52	+ public MberGrdVO selectMberGrdInfo(String mberId) throws Exception{
	53	+ return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", mberId);
54	54	}
55	55
56	56	// 회원별 등급 누적결제액 상세
...	...	@@ -84,13 +84,18 @@
84	84	}
85	85
86	86	// 회원별 등급 진행여부
87		- public int selectMberGrdPrgCnt(String userId) throws Exception{
88		- return (int) select("mberGrdDAO.selectMberGrdPrgCnt", userId);
	87	+ public int selectMberGrdPrgCnt(String mberId) throws Exception{
	88	+ return (int) select("mberGrdDAO.selectMberGrdPrgCnt", mberId);
	89	+ }
	90	+
	91	+ // 회원별 이벤트 진행여부
	92	+ public int selectMberEventPrgCnt(String mberId) throws Exception{
	93	+ return (int) select("mberGrdDAO.selectMberEventPrgCnt", mberId);
89	94	}
90	95
91	96	// 회원별 등급 저장여부
92		- public int selectMberGrdSaveCnt(String userId) throws Exception{
93		- return (int) select("mberGrdDAO.selectMberGrdSaveCnt", userId);
	97	+ public int selectMberGrdSaveCnt(String mberId) throws Exception{
	98	+ return (int) select("mberGrdDAO.selectMberGrdSaveCnt", mberId);
94	99	}
95	100
96	101

...	...	@@ -121,11 +121,11 @@
121	121
122	122	// 회원 등급제 대상여부 정보(사용자화면용)
123	123	@Override
124		- public MberGrdVO selectMberGrdInfo(String userId) throws Exception {
	124	+ public MberGrdVO selectMberGrdInfo(String mberId) throws Exception {
125	125	// 공백제거
126		- userId = userId.trim();
	126	+ mberId = mberId.trim();
127	127
128		- return mberGrdDAO.selectMberGrdInfo(userId);
	128	+ return mberGrdDAO.selectMberGrdInfo(mberId);
129	129	}
130	130
131	131	// 회원별 등급 누적결제액 상세
...	...	@@ -257,20 +257,29 @@
257	257
258	258	// 회원별 등급 진행여부
259	259	@Override
260		- public int selectMberGrdPrgCnt(String userId) throws Exception{
	260	+ public int selectMberGrdPrgCnt(String mberId) throws Exception{
261	261	// 공백제거
262		- userId = userId.trim();
	262	+ mberId = mberId.trim();
263	263
264		- return mberGrdDAO.selectMberGrdPrgCnt(userId);
	264	+ return mberGrdDAO.selectMberGrdPrgCnt(mberId);
	265	+ }
	266	+
	267	+ // 회원별 이벤트 진행여부
	268	+ @Override
	269	+ public int selectMberEventPrgCnt(String mberId) throws Exception{
	270	+ // 공백제거
	271	+ mberId = mberId.trim();
	272	+
	273	+ return mberGrdDAO.selectMberEventPrgCnt(mberId);
265	274	}
266	275
267	276	// 회원별 등급 저장여부
268	277	@Override
269		- public int selectMberGrdSaveCnt(String userId) throws Exception{
	278	+ public int selectMberGrdSaveCnt(String mberId) throws Exception{
270	279	// 공백제거
271		- userId = userId.trim();
	280	+ mberId = mberId.trim();
272	281
273		- return mberGrdDAO.selectMberGrdSaveCnt(userId);
	282	+ return mberGrdDAO.selectMberGrdSaveCnt(mberId);
274	283	}
275	284
276	285

...	...	@@ -108,10 +108,12 @@
108	108	, DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d') AS grdEndDate
109	109	, A.GRD_STATUS AS grdStatus
110	110	, CASE
111		- WHEN A.GRD_STATUS = 'Y' AND A.GRD_END_DATE >= NOW()
112		- THEN '진행중'
	111	+ WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d')
	112	+ THEN '대기'
	113	+ WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
	114	+ THEN '진행'
113	115	WHEN A.GRD_STATUS = 'N'
114		- THEN '미진행'
	116	+ THEN '대기'
115	117	WHEN A.GRD_STATUS = 'E'
116	118	THEN '종료'
117	119	ELSE '종료'
...	...	@@ -126,6 +128,8 @@
126	128	ON A.GRD_SET_NO = B.GRD_SET_NO
127	129	INNER JOIN LETTNGNRLMBER C
128	130	ON A.MBER_ID = C.MBER_ID
	131	+ LEFT OUTER JOIN MJ_EVENT_MBER_INFO E
	132	+ ON A.MBER_ID = E.MBER_ID
129	133	WHERE 1=1
130	134	AND C.MBER_STTUS = 'Y'
131	135	<isNotEmpty property="searchKeyword">
...	...	@@ -239,18 +243,18 @@
239	243	, SUM(S.AMT) AS AMT_SUM_ORIGIN
240	244	, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
241	245	, (
242		- SELECT MIN(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
	246	+ SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
243	247	) GRD_SET_NO
244	248	FROM MJ_PG S
245	249	LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
246	250	ON S.USER_ID = SS.MBER_ID
247		- AND SS.EVENT_START_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
248	251	WHERE S.PG_STATUS = '1'
249	252	AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
250	253	GROUP BY S.USER_ID
251	254	) M
252	255	WHERE M.GRD_SET_NO IS NOT NULL
253		- AND M.USER_ID = #mberId#
	256	+ AND M.AMT_SUM > 0
	257	+ AND M.USER_ID = #mberId#
254	258	]]>
255	259	</select>
256	260
...	...	@@ -332,17 +336,17 @@
332	336	, SUM(S.AMT) AS AMT_SUM_ORIGIN
333	337	, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
334	338	, (
335		- SELECT MIN(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
	339	+ SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
336	340	) GRD_SET_NO
337	341	FROM MJ_PG S
338	342	LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
339	343	ON S.USER_ID = SS.MBER_ID
340		- AND SS.EVENT_START_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
341	344	WHERE S.PG_STATUS = '1'
342	345	AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
343	346	GROUP BY S.USER_ID
344	347	) M
345	348	WHERE M.GRD_SET_NO IS NOT NULL
	349	+ AND M.AMT_SUM > 0
346	350	) B
347	351	ON A.MBER_ID = B.USER_ID
348	352	INNER JOIN MJ_MBER_GRD_SETTING C
...	...	@@ -425,6 +429,17 @@
425	429	LIMIT 1
426	430	</select>
427	431
	432	+ <!-- 회원별 이벤트 진행여부 -->
	433	+ <select id="mberGrdDAO.selectMberEventPrgCnt" parameterClass="String" resultClass="Integer">
	434	+ SELECT
	435	+ COUNT(0)
	436	+ FROM MJ_EVENT_MBER_INFO A
	437	+ WHERE A.MBER_ID = #mberId#
	438	+ AND A.EVENT_STATUS = 'Y'
	439	+ AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(A.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(A.EVENT_END_DATE, '%Y-%m-%d')
	440	+ LIMIT 1
	441	+ </select>
	442	+
428	443	<!-- 회원별 등급 저장여부 -->
429	444	<select id="mberGrdDAO.selectMberGrdSaveCnt" parameterClass="String" resultClass="Integer">
430	445	SELECT

Delete comment