Merge branch 'develop' into eskim

src/main/java/com/style24/batch/biz/dao/TsbGoodsDao.java

@@ -200,7 +200,7 @@ public interface TsbGoodsDao {
 	 * @since 2020. 12. 04
 	 */
 	void createGoodsSummaryByReviewCount(GoodsSummary goodsSummary);
-	
+
 	/**
 	 * 전시상품 통계정보작업 - 딜상품 상품평 건수
 	 *
@@ -232,7 +232,7 @@ public interface TsbGoodsDao {
 	 * @since 2020. 12. 04
 	 */
 	void createGoodsSummaryByCounsel(GoodsSummary goodsSummary);
-	
+
 	/**
 	 * 전시상품 통계정보작업 - 딜상품 상품문의
 	 *
@@ -549,6 +549,14 @@ public interface TsbGoodsDao {
 	 */
 	int createTemporaryGoodsBenefitNew();
 
+	/**
+	 * 상품혜택임시-총알배송 생성
+	 * @return 생성건수
+	 * @author gagamel
+	 * @since 2021. 4. 29
+	 */
+	int createTemporaryGoodsShotDelivery();
+
 	/**
 	 * 상품혜택 삭제
 	 * @author gagamel

src/main/java/com/style24/batch/biz/service/TsbGoodsService.java

@@ -317,10 +317,10 @@ public class TsbGoodsService {
 		goodsDao.createGoodsSummaryByReviewScore(goodsSummary);
 		// 상품평-상품문의
 		goodsDao.createGoodsSummaryByCounsel(goodsSummary);
-		
+
 		// 딜전용 상품평등록건수
 		goodsDao.createDealGoodsSummaryByReviewCount(goodsSummary);
-		
+
 		// 딜전용 상품건수
 		goodsDao.createDealGoodsSummaryByCounsel(goodsSummary);
 
@@ -691,6 +691,10 @@ public class TsbGoodsService {
 		totCnt += cnt;
 		log.info("1.4.상품혜택임시-신상(=정상상품) 생성: {}", cnt);
 
+		cnt = goodsDao.createTemporaryGoodsShotDelivery();
+		totCnt += cnt;
+		log.info("1.5.상품혜택임시-총알배송 생성: {}", cnt);
+
 		return totCnt;
 	}
 

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

@@ -1265,6 +1265,7 @@
 		            WHEN FILTER_CD = '20' THEN '무료배송'
 		            WHEN FILTER_CD = '30' THEN '사은품'
 		            WHEN FILTER_CD = '40' THEN '신상'
+		            WHEN FILTER_CD = '50' THEN '총알배송'
 		       END              AS FILTER_NM
 		     , RANK() OVER(PARTITION BY SITE_CD, CATE_GB, FORMAL_GB, BRAND_GROUP_NO, CATE_NO
 		                   ORDER BY FILTER_CD

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

@@ -2469,6 +2469,29 @@
 		AND    G.FORMAL_GB = 'G009_10' /*정상상품(=신상)*/
 	</insert>
 	
+	<!-- 상품혜택임시-총알배송 생성 -->
+	<insert id="createTemporaryGoodsShotDelivery" timeout="600">
+		/* TsbGoods.createTemporaryGoodsShotDelivery */
+		INSERT INTO TB_GOODS_BENEFIT_TMP (
+		       GOODS_CD
+		     , BENEFIT_GB
+		)
+		SELECT G.GOODS_CD
+		     , '50'       AS BENEFIT_GB /*총알배송*/
+		FROM   TB_GOODS G
+		     , TB_GOODS_STOCK GS
+		WHERE  G.GOODS_CD = GS.GOODS_CD
+		AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
+		AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*판매기간*/
+		AND    G.SELF_GOODS_YN = 'Y' /*자사상품만*/
+		AND    GS.STOCK_QTY <![CDATA[>]]> 0 /*재고있는상품*/
+		AND    NOT EXISTS (SELECT 1
+		                   FROM   TB_GOODS_SHOT_DELV_SKIP
+		                   WHERE  GOODS_CD = G.GOODS_CD
+		                  )
+	</insert>
+	
 	<!-- 상품혜택 삭제 -->
 	<delete id="deleteGoodsBenefit">
 		/* TsbGoods.deleteGoodsBenefit */

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

@@ -38,6 +38,7 @@
 		WHERE  1=1
 		AND CP.EXP_BE_DT <![CDATA[<=]]> DATE_FORMAT(CONCAT(CURRENT_DATE(),' 23:59:59'), '%Y%m%d%H%i%S')
 		AND CP.RM_PNT_AMT > 0
+		AND EXP_CMP_DT IS NOT NULL
 	</select>
 	
 	<insert id="saveExpirePointHst" parameterType="Point">

src/main/resources/config/application-run.yml

@@ -9,9 +9,19 @@ spring:
                 max-active: 10
                 max-idle: 10
                 min-idle: 2
-        host: localhost
+        host: 172.30.90.111
         port: 6379
-        password: 
-
+        password:
+        cluster:
+            nodes:
+                172.30.90.111:6379
+                172.30.90.112:6379
+                172.30.90.113:6379
+                172.30.90.111:6380
+                172.30.90.112:6380
+                172.30.90.113:6380
+                172.30.90.111:6381
+                172.30.90.112:6381
+                172.30.90.113:6381
 logging:
     config: classpath:log/logback-run.xml