포인트 수정

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

@@ -88,12 +88,15 @@
 		                   END                                          AS  OCCUR_DTL_DESC
 		            , CPH.PNT_AMT
 		            , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		            , TCP.EXP_BE_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
+		       INNER JOIN TB_CUST_POINT TCP 
+		       ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		       LEFT JOIN (SELECT FG.GOODS_NM
 		                        ,OFV.ORD_NO
 		                  FROM TB_ORD_FREEGIFT_VAL OFV
@@ -116,12 +119,15 @@
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
 		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		           , TCP.EXP_BE_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
+		      INNER JOIN TB_CUST_POINT TCP 
+		      ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		      LEFT JOIN (SELECT FG.GOODS_NM
 		                       ,OFV.ORD_NO
 		                 FROM TB_ORD_FREEGIFT_VAL OFV
@@ -135,7 +141,7 @@
 		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
 		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
 		        AND CPH.PNT_AMT <![CDATA[>]]> 0
-		      GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT
+		      GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT,TCP.EXP_BE_DT 
 		) Z
 		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
 		ORDER BY Z.PNT_UPLOAD_DT DESC	
@@ -184,12 +190,15 @@
 		                   END                                          AS  OCCUR_DTL_DESC
 		            , CPH.PNT_AMT
 		            , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		            , TCP.EXP_BE_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
+		       INNER JOIN TB_CUST_POINT TCP 
+		       ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		       LEFT JOIN (SELECT FG.GOODS_NM
 		                        ,OFV.ORD_NO
 		                  FROM TB_ORD_FREEGIFT_VAL OFV
@@ -212,12 +221,15 @@
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
 		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		           , TCP.EXP_BE_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
+		      INNER JOIN TB_CUST_POINT TCP 
+		      ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		      LEFT JOIN (SELECT FG.GOODS_NM
 		                       ,OFV.ORD_NO
 		                 FROM TB_ORD_FREEGIFT_VAL OFV
@@ -231,7 +243,7 @@
 		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
 		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
 		        AND CPH.PNT_AMT <![CDATA[<]]> 0
-		      GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT
+		      GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT,TCP.EXP_BE_DT 
 		) Z
 		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
 		ORDER BY Z.PNT_UPLOAD_DT DESC	
@@ -280,12 +292,15 @@
 		                   END                                          AS  OCCUR_DTL_DESC
 		            , CPH.PNT_AMT
 		            , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		            , TCP.EXP_BE_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
+		       INNER JOIN TB_CUST_POINT TCP 
+		       ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		       LEFT JOIN (SELECT FG.GOODS_NM
 		                        ,OFV.ORD_NO
 		                  FROM TB_ORD_FREEGIFT_VAL OFV
@@ -307,12 +322,15 @@
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
 		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
+		           , TCP.EXP_BE_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
+		      INNER JOIN TB_CUST_POINT TCP 
+		      ON   CPH.CUST_PNT_SQ = TCP.CUST_PNT_SQ
 		      LEFT JOIN (SELECT FG.GOODS_NM
 		                       ,OFV.ORD_NO
 		                 FROM TB_ORD_FREEGIFT_VAL OFV
@@ -325,7 +343,7 @@
 		        AND CPH.OCCUR_GB IN ('G069_12','G069_13')
 		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
 		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
-		       GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT
+		       GROUP BY CPH.OCCUR_GB, G.GOODS_NM,CPH.UPD_DT,TCP.EXP_BE_DT 
 		) Z
 		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
 		ORDER BY Z.PNT_UPLOAD_DT DESC