Merge branch 'sowon' into develop

src/main/java/com/style24/batch/biz/task/TsbCustomerTask.java

@@ -218,9 +218,8 @@ public class TsbCustomerTask {
 	 * @author sowon
 	 * @since 2021. 05. 27
 	 */
-	//@Scheduled(cron = "${cron.customer.giftcard.expect}")
-	//@Async
-	//@Scheduled(fixedDelay=3500000)
+	@Scheduled(cron = "${cron.customer.giftcard.expect}")
+	@Async
 	public void giftcardExpectJob() throws Exception {
 		expectGiftcardJob.runById("cron.customer.giftcard.expect");
 	}

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

@@ -45,7 +45,7 @@
 	<select id="getSendGiftcardExpectList" parameterType="Giftcard" resultType="Giftcard">
 		/*TsbGiftcardDao.getSendGiftcardExpectList*/
 		SELECT  CG.CUST_NO 
-		      , FORMAT(CG.RM_GFCD_AMT , 0) AS RM_GFCD_AMT 
+		      , CG.RM_GFCD_AMT
 		      , DATE_FORMAT(CG.USE_EXP_DATE ,'%Y.%m.%d') AS USE_EXP_DATE 
 		      , C.CUST_STAT   
 		      , C.CUST_NM   
@@ -54,6 +54,6 @@
 		                  ON CG.CUST_NO = C.CUST_NO 
 		WHERE CG.USE_EXP_DATE = DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 30 DAY),'%Y%m%d')
 		AND CG.RM_GFCD_AMT > 0
-		AND C.CUST_STAT IN ('G104_10', 'G104_20')         /* 활동회원 , 휴먼 회원 (휴먼회원도 보내야하는건가.. )*/
+		AND C.CUST_STAT = 'G104_10'
 	</select>
 </mapper>