Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/service/TsaCustomerService.java

@@ -145,7 +145,6 @@ public class TsaCustomerService {
 	@Transactional("shopTxnManager")
 	public GagaMap saveCustomerSecede(Customer customer) {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
-		customer.setCustStat(TscConstants.CustStat.SECEDE.value());
 		return coreCustomerService.saveCustomerSecede(customer);
 	}
 

src/main/java/com/style24/persistence/domain/CustomerSearch.java

@@ -30,6 +30,7 @@ public class CustomerSearch extends TscBaseDomain {
 	private String smsAgreeYn;
 	private String emailAgreeYn;
 	private String appAgreeYn;
+	private String mkAgreeYn;
 	private String secedeRsn;
 	private String custNm;
 	private String email;

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

@@ -459,8 +459,8 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
+		               AND    EXP_BE_DT > NOW()
 		               AND    EXP_CMP_DT IS NULL
-		               /*AND    EXP_BE_DT > NOW()*/
 		               ), 0)                           AS RM_PNT_AMT -- 가용포인트
 		     , IFNULL((
 		               SELECT SUM(GV_PNT_AMT)
@@ -476,6 +476,7 @@
 		               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
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
@@ -485,6 +486,7 @@
 		                          , ORD_NO
 		                     FROM   TB_CUST_POINT_HST
 		                     WHERE  OCCUR_GB = 'G069_12' -- 적립예정
+		                     AND    PNT_UPLOAD_STAT = 'G070_10' -- 포인트반영
 		                     AND    CUST_NO = #{custNo}
 		                     GROUP BY ORD_NO
 		                    ) A
@@ -493,6 +495,7 @@
 		                         , ORD_NO
 		                    FROM   TB_CUST_POINT_HST
 		                    WHERE  OCCUR_GB = 'G069_13' -- 적립예정취소
+		                    AND    PNT_UPLOAD_STAT = 'G070_20' -- 포인트반영전취소
 		                    AND    CUST_NO = #{custNo}
 		                    GROUP BY ORD_NO
 		                    ) B
@@ -501,7 +504,7 @@
 		     , IFNULL((
 		               SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		               FROM  TB_CUST_POINT
-		               WHERE EXP_BE_DT >= NOW()
+		               WHERE 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