포인트 수정

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

@@ -41,7 +41,7 @@
 		FROM   TB_CUST_POINT
 		WHERE  CUST_NO = #{custNo}
 		AND    EXP_BE_DT > NOW()
-		AND    EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 30 DAY)
+		AND    EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 	</select>
 	
 	<!-- 적립내역 조회-->
@@ -71,7 +71,7 @@
 		            WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_37' THEN '출석체크'
 		            WHEN 'G069_41' THEN G.GOODS_NM
-		            WHEN 'G069_43' THEN G.GOODS_NM
+		            WHEN 'G069_43' THEN FR.GOODS_NM
 		            WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
 		       END                                          AS  OCCUR_DTL_DESC
@@ -83,10 +83,19 @@
 		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
 		LEFT JOIN TB_GOODS G
 		ON  OD.GOODS_CD = G.GOODS_CD
+		LEFT JOIN (SELECT FG.GOODS_NM
+		                 ,OFV.ORD_NO 
+		           FROM TB_ORD_FREEGIFT_VAL OFV
+		           INNER JOIN TB_FREE_GOODS FG
+		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		           )FR ON CPH.ORD_NO = FR.ORD_NO
+
 		WHERE CPH.CUST_NO = #{custNo}
 		AND CPH.PNT_AMT > 0
 		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
 		GROUP BY CPH.REG_DT
+		ORDER BY CPH.REG_DT DESC
 	</select>
 	
 	<!-- 사용내역 조회-->
@@ -98,7 +107,7 @@
 		            WHEN 'G069_21' THEN '리뷰'
 		            WHEN 'G069_36' THEN '상품 구매'
 		            WHEN 'G069_40' THEN '상품 구매'
-		            WHEN 'G069_42' THEN '상품 구매'
+		            WHEN 'G069_42' THEN '사은품'
 		            WHEN 'G069_46' THEN '적립취소'
 		            WHEN 'G069_90' THEN '관리자'
 		            WHEN 'G069_99' THEN '소멸'
@@ -109,23 +118,31 @@
 		            WHEN 'G069_21' THEN G.GOODS_NM
 		            WHEN 'G069_36' THEN G.GOODS_NM
 		            WHEN 'G069_40' THEN G.GOODS_NM
-		            WHEN 'G069_42' THEN G.GOODS_NM
+		            WHEN 'G069_42' THEN FR.GOODS_NM
 		            WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_99' THEN '유효기간 경과 소멸'
 		       END                                          AS  OCCUR_DTL_DESC
 		     , CPH.PNT_AMT
-		     , CPH.REG_DT
+		     , CPH.REG_DT AS PNT_UPLOAD_DT
 		FROM TB_CUST_POINT_HST CPH
 		LEFT JOIN TB_ORDER_DETAIL OD
 		ON  CPH.ORD_NO = OD.ORD_NO
 		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
 		LEFT JOIN TB_GOODS G
 		ON  OD.GOODS_CD = G.GOODS_CD
+		LEFT JOIN (SELECT FG.GOODS_NM
+		                 ,OFV.ORD_NO 
+		           FROM TB_ORD_FREEGIFT_VAL OFV
+		           INNER JOIN TB_FREE_GOODS FG
+		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		           )FR ON CPH.ORD_NO = FR.ORD_NO
 		WHERE CPH.CUST_NO = #{custNo}
 		AND CPH.PNT_AMT <![CDATA[<]]> 0
 		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
-		GROUP BY CPH.REG_DT
+		GROUP BY CPH.ORD_NO, CPH.REG_DT
+		ORDER BY CPH.REG_DT DESC
 	</select>
 	
 	<!-- 전체내역 조회-->
@@ -146,8 +163,8 @@
 		            WHEN 'G069_37' THEN '이벤트'
 		            WHEN 'G069_40' THEN '상품 구매'
 		            WHEN 'G069_41' THEN '구매 취소'
-		            WHEN 'G069_42' THEN '상품 구매'
-		            WHEN 'G069_43' THEN '구매 취소'
+		            WHEN 'G069_42' THEN '사은품'
+		            WHEN 'G069_43' THEN '사은품'
 		            WHEN 'G069_44' THEN '관리자'
 		            WHEN 'G069_45' THEN '관리자'
 		            WHEN 'G069_46' THEN '적립취소'
@@ -169,8 +186,8 @@
 		            WHEN 'G069_37' THEN '출석체크'
 		            WHEN 'G069_40' THEN G.GOODS_NM
 		            WHEN 'G069_41' THEN G.GOODS_NM
-		            WHEN 'G069_42' THEN G.GOODS_NM
-		            WHEN 'G069_43' THEN G.GOODS_NM
+		            WHEN 'G069_42' THEN FR.GOODS_NM
+		            WHEN 'G069_43' THEN FR.GOODS_NM
 		            WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_45' THEN CPH.OCCUR_DTL_DESC
 		            WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
@@ -185,9 +202,17 @@
 		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
 		LEFT JOIN TB_GOODS G
 		ON  OD.GOODS_CD = G.GOODS_CD
+		LEFT JOIN (SELECT FG.GOODS_NM
+		                 ,OFV.ORD_NO 
+		           FROM TB_ORD_FREEGIFT_VAL OFV
+		           INNER JOIN TB_FREE_GOODS FG
+		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		           )FR ON CPH.ORD_NO = FR.ORD_NO
 		WHERE CPH.CUST_NO = #{custNo}
 		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
 		GROUP BY CPH.REG_DT
+		ORDER BY CPH.REG_DT DESC
 	</select>
 
 	<!-- 고객 포인트 내역 -->