마이페이지 포인트 수정

src/main/java/com/style24/persistence/mybatis/shop/TsfPoint.xml

@@ -65,12 +65,22 @@
 		            WHEN 'G069_12' THEN '상품구매'
 		            WHEN 'G069_20' THEN '리뷰'
 		            WHEN 'G069_30' THEN '이벤트'
+		            WHEN 'G069_31' THEN '회원가입'
+		            WHEN 'G069_32' THEN '생일축하'
+		            WHEN 'G069_35' THEN 'APP다운'
+		            WHEN 'G069_36' THEN '사은품구매'
+		            WHEN 'G069_37' THEN '출석체크'
 		            WHEN 'G069_90' THEN '관리자'
 		       END                                          AS OCCUR_GB
 		     , CASE TCHP.OCCUR_GB
 		            WHEN 'G069_12' THEN TG.GOODS_NM
 		            WHEN 'G069_20' THEN TG.GOODS_NM
 		            WHEN 'G069_30' THEN TCHP.OCCUR_DTL_DESC
+		            WHEN 'G069_31' THEN TCHP.OCCUR_DTL_DESC
+		            WHEN 'G069_32' THEN TCHP.OCCUR_DTL_DESC
+		            WHEN 'G069_35' THEN TCHP.OCCUR_DTL_DESC
+		            WHEN 'G069_36' THEN TCHP.OCCUR_DTL_DESC
+		            WHEN 'G069_37' THEN TCHP.OCCUR_DTL_DESC
 		            WHEN 'G069_90' THEN TCHP.OCCUR_DTL_DESC
 		       END                                          AS  OCCUR_DTL_DESC
 		      , TCHP.PNT_AMT                                AS PNT_AMT
@@ -96,7 +106,7 @@
 		AND CASE WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
 		         WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1 /* 상품평조건 */
 		    END > 0
-		AND TCHP.OCCUR_GB IN ('G069_12','G069_20','G069_30','G069_90')
+		AND TCHP.OCCUR_GB IN ('G069_12','G069_20','G069_30','G069_31','G069_32','G069_35','G069_36','G069_37','G069_90')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'														/* 공통코드 : 반영완료 */
 		AND TCHP.PNT_AMT <![CDATA[>]]> 0
 		AND DATE_FORMAT(TCHP.UPD_DT,'%Y%m') = #{searchDt}
@@ -150,6 +160,11 @@
 		WHEN   'G069_13' THEN '구매 취소'
 		WHEN   'G069_20' THEN '리뷰'	
 		WHEN   'G069_30' THEN '이벤트'
+		WHEN   'G069_31' THEN '회원가입'
+		WHEN   'G069_32' THEN '생일축하'
+		WHEN   'G069_35' THEN 'APP다운'
+		WHEN   'G069_36' THEN '사은품구매'
+		WHEN   'G069_37' THEN '출석체크'
 		WHEN   'G069_40' THEN '구매 사용'
 		WHEN   'G069_42' THEN '사은품'
 		WHEN   'G069_90' THEN '관리자'
@@ -158,8 +173,13 @@
 		CASE   TCHP.OCCUR_GB
 		WHEN   'G069_12' THEN TG.GOODS_NM 
 		WHEN   'G069_13' THEN TG.GOODS_NM 
-		WHEN   'G069_20' THEN TG.GOODS_NM 
+		WHEN   'G069_20' THEN TG.GOODS_NM
 		WHEN   'G069_30' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_31' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_32' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_35' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_36' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_37' THEN TCHP.OCCUR_DTL_DESC
 		WHEN   'G069_40' THEN TG.GOODS_NM 
 		WHEN   'G069_42' THEN TG.GOODS_NM
 		WHEN   'G069_90' THEN TCHP.OCCUR_DTL_DESC
@@ -191,7 +211,7 @@
 			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
 			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1
 		END <![CDATA[>]]> 0		
-		AND TCHP.OCCUR_GB IN ('G069_12','G069_13','G069_20','G069_30','G069_40','G069_42','G069_90','G069_99')
+		AND TCHP.OCCUR_GB IN  ('G069_12','G069_13','G069_20','G069_30','G069_31','G069_32','G069_35','G069_36','G069_37','G069_40','G069_42','G069_90','G069_99')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'
 		AND DATE_FORMAT(TCHP.UPD_DT,'%Y%m') = #{searchDt}
 		GROUP BY TCHP.REVIEW_SQ, TCHP.OCCUR_GB, PNT_AMT, GOODS_NM, TCHP.OCCUR_DTL_DESC, TCHP.UPD_DT

src/main/webapp/WEB-INF/views/web/mypage/MypagePointForm2Web.html

@@ -154,20 +154,23 @@
 		var jsonData = JSON.stringify(data);
 		
 		gagajf.ajaxJsonSubmit('/mypage/allpoint/list', jsonData, function(result){
+
 						accumulatePointList = result.accumulatePointList;
 						usePointList = result.usePointList;
 						allPointList = result.allPointList;
-						
 						// 클릭상태 확인
-						if($("#accumulatePointList").hasClass("on")){
+						if($("#accumulatePointList").hasClass("active")){
 							$("#accumulatePointList").click();
-						}else if($("#usePointList").hasClass("on")){
+							// 첫화면 전체내역 조회
+							fnGetPointTableInfo(result.accumulatePointList);
+						}else if($("#usePointList").hasClass("active")){
 							$("#usePointList").click();
-						}else if($("#allPointList").hasClass("on")) {
+							fnGetPointTableInfo(usePointList);
+						}else if($("#allPointList").hasClass("active")) {
 							$("#allPointList").click();
+							fnGetPointTableInfo(allPointList);
 						}
-						// 첫화면 전체내역 조회
-						fnGetPointTableInfo();
+						
 		});
 	}
 	
@@ -193,7 +196,7 @@
 				tag += '	<td>';
 				if(item.pntAmt > 0){
 					tag += '		<span class="amount_plus">';
-					tag += '			<em>'+item.pntAmt+'</em>P';
+					tag += '			<em>'+item.pntAmt.addComma()+'</em>P';
 					tag += '		</span>';
 				}else{
 					tag += '		<span class="c_primary">';
@@ -251,14 +254,15 @@
 	});
 	
 	$(document).ready(function() {
+		// 전체내역 표시
+ 		$("#allPointList").trigger("click");
 		// 마이페이지 LNB 설정
 		fnSetMypageLnbList(5);
 		
 		// 마이페이지 location 설정
 		fnSetMypageLocation('STYLE24 포인트', '_PAGE_MYPAGE_POINT');
 		
-		// 전체내역 표시
- 		$("#allPointList").trigger('click');
+		
 
 		// 셀렉트박스 활성화
 		$('.select_custom').each(function(index) {