Merge branch 'jsshin' into develop

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

@@ -239,20 +239,20 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
-		               AND    EXP_BE_DT <![CDATA[<]]> NOW()
-		               AND    EXP_CMP_DT IS NOT NULL
+		               AND    (EXP_BE_DT <![CDATA[<]]> NOW() OR EXP_CMP_DT IS NOT NULL)
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
 		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
 		               FROM   TB_CUST_POINT_HST CPH
-		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')       -- 적립예정, 적립취소
+		               WHERE  CPH.CUST_NO = C.CUST_NO
 		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')           -- 반영예정
-		               AND    CPH.CUST_NO = #{custNo}
+		               AND    CPH.OCCUR_GB IN ('G069_12', 'G069_13')       -- 적립예정, 적립취소
 		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
 		     , IFNULL((
 		                SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		                FROM  TB_CUST_POINT
-		                WHERE EXP_BE_DT > NOW()
+		                WHERE CUST_NO = C.CUST_NO
+		                AND   EXP_BE_DT > NOW()
 		                AND   EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 		               ), 0)                          AS EXPECTED_EXPIRE_PNT_AMT -- 소멸예정포인트(30일)
 		FROM   TB_CUSTOMER C