포인트목록 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -533,8 +533,6 @@ public class TsfMypageController extends TsfBaseController {
 		
 		result.set("accumulatePointList",pointService.getAccumulatePointList(point));
 		
-		log.info("result {}", result);
-		
 		return result;
 	}
 	
@@ -556,8 +554,6 @@ public class TsfMypageController extends TsfBaseController {
 		
 		result.set("usePointList",pointService.getUsePointList(point));
 		
-		log.info("result {}", result);
-		
 		return result;
 	}
 	
@@ -579,8 +575,6 @@ public class TsfMypageController extends TsfBaseController {
 		
 		result.set("allPointList",pointService.getAllPointList(point));
 		
-		log.info("result {}", result);
-		
 		return result;
 	}
 

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

@@ -47,16 +47,16 @@
 	<select id="getAccumulatePointList" parameterType="Point" resultType="Point">
 	/* TsfPoint.getAccumulatePointList */
 	SELECT	
-		CASE   TCHP.OCCUR_GB
+	   CASE   TCHP.OCCUR_GB
+			WHEN   'G069_12' THEN '상품 구매'
 			WHEN   'G069_20' THEN '리뷰'
 			WHEN   'G069_30' THEN '이벤트'
-			WHEN   'G069_40' THEN '상품 구매'
 			WHEN   'G069_90' THEN '관리자'
 		END AS OCCUR_GB
-	  , CASE   TCHP.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_40' THEN TG.GOODS_NM
 			WHEN   'G069_90' THEN TCHP.OCCUR_DTL_DESC
 		END AS  OCCUR_DTL_DESC
 			  , TCHP.PNT_AMT AS pntAmt
@@ -65,26 +65,29 @@
 		LEFT JOIN 
 		(
 			SELECT REVIEW_SQ
-		         , goods_cd
-			FROM   TB_REVIEW TR
-			WHERE  TR.PNT_GIVE_STAT = 'G043_30'
+				 , ORD_NO 
+				 , ORD_DTL_NO 
+		         , GOODS_CD
+			FROM TB_REVIEW TR
+			WHERE TR.PNT_GIVE_STAT = 'G043_30' 														/* 리뷰조건 : 포인트지급반영*/
 		) TR
 		ON TCHP.REVIEW_SQ = TR.REVIEW_SQ
+		AND (TCHP.ORD_NO = TR.ORD_NO AND TCHP.ORD_DTL_NO = TR.ORD_DTL_NO)
 		LEFT JOIN TB_ORDER_DETAIL TOD
 		ON TCHP.ORD_NO = TOD.ORD_NO
 		AND TCHP.ORD_DTL_NO = TOD.ORD_DTL_NO
 		LEFT JOIN TB_GOODS TG
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
-		AND CASE 
+		AND CASE 																					/* 상품평조건 */
 			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
 			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
 		END > 0	
-		AND TCHP.OCCUR_GB IN ('G069_20','G069_30','G069_40','G069_90')
-		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'
+		AND TCHP.OCCUR_GB IN ('G069_12','G069_20','G069_30','G069_90')
+		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'														/* 공통코드 : 반영완료 */
 		AND TCHP.PNT_AMT <![CDATA[>]]> 0
-		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
+		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
 	ORDER BY TCHP.UPD_DT DESC;
 	</select>
 	
@@ -93,28 +96,32 @@
 	/* TsfPoint.getUsePointList */
 	SELECT
 		CASE   TCHP.OCCUR_GB
-		WHEN   'G069_10' THEN '구매 사용'
-		WHEN   'G069_21' THEN '구매 취소'
-		WHEN   'G069_90' THEN '관리자'
-		WHEN   'G069_99' THEN '소멸'
+			WHEN   'G069_13' THEN '구매 취소'
+			WHEN   'G069_40' THEN '구매 사용'
+			WHEN   'G069_42' THEN '사은품'
+			WHEN   'G069_90' THEN '관리자'
+			WHEN   'G069_99' THEN '소멸'
 		END AS OCCUR_GB ,	
 		CASE   TCHP.OCCUR_GB	
-		WHEN   'G069_10' THEN TG.GOODS_NM 
-		WHEN   'G069_21' THEN TG.GOODS_NM 
-		WHEN   'G069_90' THEN TCHP.OCCUR_DTL_DESC
-		WHEN   'G069_99' THEN TCHP.OCCUR_DTL_DESC
+			WHEN   'G069_13' THEN TG.GOODS_NM
+			WHEN   'G069_40' THEN TG.GOODS_NM 
+			WHEN   'G069_42' THEN TG.GOODS_NM
+			WHEN   'G069_90' THEN TCHP.OCCUR_DTL_DESC
+			WHEN   'G069_99' THEN '유효기간 경과 소멸'
 		END AS OCCUR_DTL_DESC
 			 , TCHP.PNT_AMT AS pntAmt
 			 , TCHP.UPD_DT  AS pntUploadDt
 		FROM TB_CUST_POINT_HST TCHP
-		LEFT JOIN TB_ORDER_DETAIL TOD
+		LEFT JOIN TB_ORDER_DETAIL TOD																/* 주문상세 */
 		ON TOD.ORD_NO = TCHP.ORD_NO
 		AND TOD.ORD_DTL_NO = TCHP.ORD_DTL_NO
-		LEFT JOIN TB_GOODS TG 
+		LEFT JOIN TB_ORD_FREEGIFT TOF																/* 사은품 */
+		ON TOD.ORD_NO = TOF.ORD_NO
+		LEFT JOIN TB_GOODS TG																		/* 상품품 */
 		ON TG.GOODS_CD = TOD.GOODS_CD 
 		WHERE TCHP.CUST_NO = #{custNo}
-		AND TCHP.OCCUR_GB IN ('G069_10','G069_21','G069_90','G069_99')
-		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'
+		AND TCHP.OCCUR_GB IN ('G069_13','G069_40','G069_42','G069_90','G069_99')
+		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'														/* 공통코드 : 반영완료 */
 		AND 0 <![CDATA[>]]> TCHP.PNT_AMT
 		AND DATE_FORMAT(TCHP.UPD_DT,'%Y%m') = #{searchDt}
 		GROUP BY  TCHP.OCCUR_GB, PNT_AMT, GOODS_NM, TCHP.OCCUR_DTL_DESC, TCHP.UPD_DT
@@ -123,41 +130,58 @@
 	
 	<!-- 전체내역 조회-->
 	<select id="getAllPointList" parameterType="Point" resultType="Point">
-		/* TsfPoint.getAllPointList */
+	/* TsfPoint.getAllPointList */
 	SELECT
 		CASE   TCHP.OCCUR_GB
-		WHEN   'G069_10' THEN '구매 사용'
 		WHEN   'G069_12' THEN '상품 구매'
+		WHEN   'G069_13' THEN '구매 취소'
 		WHEN   'G069_20' THEN '리뷰'	
-		WHEN   'G069_21' THEN '구매 취소'
 		WHEN   'G069_30' THEN '이벤트'
+		WHEN   'G069_40' THEN '구매 사용'
+		WHEN   'G069_42' THEN '사은품'
 		WHEN   'G069_90' THEN '관리자'
 		WHEN   'G069_99' THEN '소멸'
 		END AS OCCUR_GB ,	
 		CASE   TCHP.OCCUR_GB
-		WHEN   'G069_10' THEN TG.GOODS_NM
 		WHEN   'G069_12' THEN TG.GOODS_NM 
+		WHEN   'G069_13' THEN TG.GOODS_NM 
 		WHEN   'G069_20' THEN TG.GOODS_NM 
-		WHEN   'G069_21' THEN TG.GOODS_NM
 		WHEN   'G069_30' 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
-		WHEN   'G069_99' THEN TCHP.OCCUR_DTL_DESC
+		WHEN   'G069_99' THEN '유효기간 경과 소멸'
 		END AS OCCUR_DTL_DESC
 			 , TCHP.PNT_AMT AS pntAmt
 			 , TCHP.UPD_DT  AS pntUploadDt
 		FROM TB_CUST_POINT_HST TCHP
-		LEFT JOIN TB_REVIEW TR
-		ON TR.REVIEW_SQ = TCHP.REVIEW_SQ 
+		LEFT JOIN 
+		(
+			SELECT REVIEW_SQ
+				 , ORD_NO 
+				 , ORD_DTL_NO 
+		         , GOODS_CD
+			FROM TB_REVIEW TR
+			WHERE TR.PNT_GIVE_STAT = 'G043_30'
+		) TR
+		ON TCHP.REVIEW_SQ = TR.REVIEW_SQ
+		AND (TCHP.ORD_NO = TR.ORD_NO AND TCHP.ORD_DTL_NO = TR.ORD_DTL_NO)
 		LEFT JOIN TB_ORDER_DETAIL TOD
 		ON TCHP.ORD_NO = TOD.ORD_NO
 		AND TCHP.ORD_DTL_NO = TOD.ORD_DTL_NO
+		LEFT JOIN TB_ORD_FREEGIFT TOF
+		ON TOD.ORD_NO = TOF.ORD_NO
 		LEFT JOIN TB_GOODS TG 
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
-		AND TCHP.OCCUR_GB IN ('G069_10','G069_12','G069_20','G069_21','G069_30','G069_90','G069_99')
+		AND CASE
+			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
+			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
+		END > 0		
+		AND TCHP.OCCUR_GB IN ('G069_12','G069_13','G069_20','G069_30','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.OCCUR_GB, PNT_AMT, GOODS_NM, TCHP.OCCUR_DTL_DESC, TCHP.UPD_DT
+		GROUP BY TCHP.REVIEW_SQ, TCHP.OCCUR_GB, PNT_AMT, GOODS_NM, TCHP.OCCUR_DTL_DESC, TCHP.UPD_DT
 	ORDER BY TCHP.UPD_DT DESC;
 	</select>
 </mapper>

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

@@ -86,24 +86,30 @@
 		// select 날짜 생성
 		var date = new Date();
 		var year = date.getFullYear();
-		var month = date.getMonth() + 1;
+		var month = date.getMonth() +1;
 		
 		var oneYearAgo = year -1;
-		var yearMonth = year;
 		var oneYearLater = year +1;
 		
+		if(10 > month){
+			month = 0 + "" + (date.getMonth()+1);
+		}
+		// Select this year month
+		var checkYm = year + "" + month;
+		
 		for(var i = 1;i <= 12; i++){
 			if(i < 10 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ yearMonth + "" + 0 + i +"'>"+ yearMonth + "년" + " " + i + "월" +"</li>");
+				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 			}
 			else if(i < 10 && i == month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ yearMonth + "" + 0 + i +"'>" + yearMonth + "년" + " " + i + "월" +"</li>");
+				$(".select").append("<li class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
 			}
 			else if(i > 9 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ yearMonth + "" + i +"'>"+ yearMonth + "년" + " " + i + "월" +"</li>");
+				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 			}
 			else if(i > 9 && i == month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ yearMonth + "" + i +"'>"+ yearMonth + "년" + " " + i + "월" +"</li>");
+				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 			}
 		}
 		
@@ -112,9 +118,8 @@
 		
 		let url = '/mypage/allpoint/list';		
 		let data = {};
-				
+
 		data.searchDt = $('#searchDt').find('.selected').val();
-		console.log(data);
 
 		var jsonData = JSON.stringify(data);
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
@@ -140,9 +145,13 @@
 		
 		let data = {};
 		
-		data.searchDt = $('#searchDt').find('.selected').val();
-		
-		console.log(data);
+		// 처음 화면 로딩시 이번 달 선택
+		if($('.select').find('.selected').val() == checkYm){
+			data.searchDt = $('.select').find('.selected').val();
+		}else{
+			data.searchDt = $('#searchDt').find('.selected').val();
+		}
+
 		var jsonData = JSON.stringify(data);
 		
 		$.ajax(
@@ -158,9 +167,7 @@
 				}
 		)
 	});
-	
 
-	
 	function PointAllListInfo(result) {
 		
 		let allPointList = result.allPointList;
@@ -197,7 +204,11 @@
 		
 		let data = {};
 		
-		data.searchDt = $('#searchDt').find('.selected').val();
+		if($('.select').find('.selected').val() == checkYm){
+			data.searchDt = $('.select').find('.selected').val();
+		}else{
+			data.searchDt = $('#searchDt').find('.selected').val();
+		}
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -246,7 +257,11 @@
 		
 		let data = {};
 		
-		data.searchDt = $('#searchDt').find('.selected').val();
+		if($('.select').find('.selected').val() == checkYm){
+			data.searchDt = $('.select').find('.selected').val();
+		}else{
+			data.searchDt = $('#searchDt').find('.selected').val();
+		}
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -287,9 +302,9 @@
 		// 마이페이지 location 설정
 		fnSetMypageLocation('STYLE24 포인트', '_PAGE_MYPAGE_POINT');
 		
-		// 전체내역
-		$("#SearchFullHistory").trigger('click');
-		
+		// 전체내역 표시
+ 		$("#SearchFullHistory").trigger('click');
+
 		// 셀렉트박스 활성화
 		$('.select_custom.type1').each(function(index) {
 			var selecter01 = new sCombo($(this));