Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

src/main/java/com/style24/batch/biz/job/marketing/TsbReviewGuideJob.java

@@ -64,6 +64,7 @@ public class TsbReviewGuideJob extends TsbAbstractJob<String, String, String> {
 				dm.setFuserid(String.valueOf(reviewGuide.getCustNo()));
 				dm.setFkkoresendtype("LMS");
 				dm.setFdestine(reviewGuide.getCellPhnno());
+				dm.setBizTime("Y");
 
 				// 대체할 문자열 설정
 				GagaMap replaceInfo = new GagaMap();

src/main/java/com/style24/batch/biz/job/shoplinker/TsbShoplinkerOrderJob.java

@@ -70,7 +70,8 @@ public class TsbShoplinkerOrderJob extends TsbAbstractJob<String, String, String
 		
 		if( null != ordDateInfo ) {
 			if("Y".equals(ordDateInfo.getBizdayYn())) {
-
+				
+				String toDt = GagaDateUtil.getToday("yyyyMMdd");
 				ShoplinkerOrder shoplinkerOrder = new ShoplinkerOrder();
 				ShoplinkerSearch slkSearch = new ShoplinkerSearch();
 
@@ -118,14 +119,22 @@ public class TsbShoplinkerOrderJob extends TsbAbstractJob<String, String, String
 						edtime = endHour+"0000";
 					}
 				}
-
+				
+				if("20210902".equals(toDt)) {
+					if( 5 == hours ) {
+						stDay = "20210831";
+						edDay = "20210831";
+						stTime = "150000";
+						edtime = "235959";
+					}									
+				}
+				
 				shoplinkerOrder.setStDate(stDay);
 				shoplinkerOrder.setEdDate(edDay);
 				shoplinkerOrder.setStTime(stTime);
 				shoplinkerOrder.setEdTime(edtime);
 
 				try {
-					String toDt = GagaDateUtil.getToday("yyyyMMdd");
 					
 					// 1. 기본세팅정보
 					shoplinkerOrder.setXmlPath(env.getProperty("shoplinker.xml.path")+"/order/"+toDt);		// xml path

src/main/java/com/style24/batch/biz/job/statistics/TsbSalesUploadJob.java

@@ -30,7 +30,7 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 	@Autowired
 	private HansaeErp hansaeErp;
 
-	private static final int PAGE_SIZE = 10;
+	private static final int PAGE_SIZE = 100;
 
 	@Override
 	public String read() throws Exception {

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

@@ -41,6 +41,7 @@
 		            (CPN_TARGET = 'G260_12' AND RK <![CDATA[<=]]> 2) /*브랜드만 2개 노출*/
 		           )
 		    GROUP  BY CPN_ID, CPN_TARGET
+		    LIMIT 1
 		)
 		SELECT CP.CPN_ID
 		     , CP.END_ALIM_YN

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

@@ -272,11 +272,16 @@
 	<!-- 재가입불가 기간 지난 회원 -->
 	<select id="getExpireSecedeCustomerList" parameterType="CustomerSearch" resultType="Customer">
 		/*TsbCustomerDao.getExpireSecedeCustomerList*/
-		SELECT CUST_NO
-		FROM   TB_CUSTOMER
-		WHERE  CUST_STAT = 'G104_30' -- 탈퇴회원
-		AND    SITE_CD = #{siteCd}
-		AND    SECEDE_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -#{rejoinRejectDay} DAY), '%Y%m%d%H%i%S')
+		SELECT C.CUST_NO
+		FROM   TB_CUSTOMER C
+		WHERE  C.CUST_STAT = 'G104_30' -- 탈퇴회원
+		AND    C.SITE_CD = #{siteCd}
+		AND    C.SECEDE_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -#{rejoinRejectDay} DAY), '%Y%m%d%H%i%S')
+		AND    EXISTS (
+		               SELECT 1
+		               FROM TB_SECEDE_CUST SC
+		               WHERE SC.CUST_NO = C.CUST_NO
+		               )
 	</select>
 
 	<!--개인정보 이용내역 안내(년 1회) 대상-->
@@ -1098,6 +1103,7 @@
 		            (CPN_TARGET = 'G260_12' AND RK <![CDATA[<=]]> 2) /*브랜드만 2개 노출*/
 		           )
 		    GROUP  BY CPN_ID, CPN_TARGET
+		    LIMIT  1
 		)
 		SELECT COUNT(*) AS CNT
 		FROM   TB_CUSTOMER C
@@ -1122,7 +1128,7 @@
 		                   WHERE  CCH.RECEIVER_NO = C.CUST_NO
 		                   AND    CCH.SEND_DT > DATE_FORMAT(DATE_ADD(LAST_DAY(NOW()), INTERVAL -1 MONTH ), '%Y%m%d')
 		                   AND    CCH.SEND_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(LAST_DAY(NOW()), INTERVAL 1 DAY), '%Y%m%d')
-		                   AND    CCH.CONTACT_TYPE = 'G054_601' /*생일쿠폰 다운로드 안내*/
+		                   AND    CCH.CONTACT_TYPE = 'G054_210' /*생일쿠폰 다운로드 안내*/
 		                   )
 	</select>
 
@@ -1170,6 +1176,7 @@
 		            (CPN_TARGET = 'G260_12' AND RK <![CDATA[<=]]> 2) /*브랜드만 2개 노출*/
 		           )
 		    GROUP  BY CPN_ID, CPN_TARGET
+		    LIMIT  1
 		)
 		SELECT C.CUST_NO
 		     , C.CUST_NM
@@ -1235,7 +1242,7 @@
 		                   WHERE  CCH.RECEIVER_NO = C.CUST_NO
 		                   AND    CCH.SEND_DT > DATE_FORMAT(DATE_ADD(LAST_DAY(NOW()), INTERVAL -1 MONTH ), '%Y%m%d')
 		                   AND    CCH.SEND_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(LAST_DAY(NOW()), INTERVAL 1 DAY), '%Y%m%d')
-		                   AND    CCH.CONTACT_TYPE = 'G054_601' /*생일쿠폰 다운로드 안내*/
+		                   AND    CCH.CONTACT_TYPE = 'G054_210' /*생일쿠폰 다운로드 안내*/
 		                   )
 		ORDER BY C.CUST_NO
 		<include refid="selectForPagingFooter"/>

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

@@ -53,6 +53,14 @@
 
 	<!-- 재고 전체 동기화 -->
 	<update id="updateSyncStock" timeout="600">
+	
+		update shoplinker_stock 
+		set send_yn = 'N'
+		where send_yn = 'Y'
+		and send_dt is null 
+		limit 1300
+
+		/*
 		UPDATE SHOPLINKER_STOCK A
 		SET UPD_DT = NOW()
 			, SEND_YN = 'N'
@@ -65,7 +73,7 @@
 		            WHERE VW.GOODS_CD = A.GOODS_CD
 		            AND VW.OPT_CD = A.OPT_CD
 		            AND VW.CURR_STOCK_QTY != A.STOCK_QTY
-		       )
+		       )*/
 	</update>
 
 	<!-- 재고 정보 수정 -->

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsDelivery.xml

@@ -627,9 +627,9 @@
 		SELECT 
 			  A.RecallNo			-- 반품 번호
 			, A.OrderExceptionNo  AS ORD_CHG_SQ -- 주문변경번호 (주문 예외 번호 ASIS) 
-			, MAX(B.ProductNo)    AS ProductNo			-- 상품 번호
-			, MAX(B.ProductCode)  AS ProductCode			-- 상품 코드
-			, MAX(B.SKUCode)      AS SKUCode				-- 옵션 코드
+			, B.ProductNo         AS ProductNo			-- 상품 번호
+			, B.ProductCode       AS ProductCode		-- 상품 코드
+			, B.SKUCode           AS SKUCode			-- 옵션 코드
 			, ISNULL(B.OrderDtlNo,999999999)        AS ORD_DTL_NO	-- 주문상세번호
 		  FROM istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERY A, istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERYITEM B
 		 WHERE A.RecallNo  = B.RecallNo
@@ -637,7 +637,6 @@
 		   AND B.StatusCd  = '입고완료'   
 		   AND B.IfStat    = '2' -- 회수완료
 		   AND A.RecallNo  = #{recallno}
-		GROUP BY A.RecallNo, A.OrderExceptionNo, B.OrderDtlNo   
 	</select>
 	
 	<!-- 입고결과 아이템 조회  -->