Merge branch 'develop' into jmh

src/main/java/com/style24/batch/biz/job/delivery/TsbCjWithdrawInvoiceJob.java

@@ -57,8 +57,12 @@ public class TsbCjWithdrawInvoiceJob extends TsbAbstractJob<Collection<Delivery>
 		for(Delivery data : invcRcpList) {
 			try {
 			
+				
 			// 2. wms  회수요청 테이블에 등록!
-			wmsDeliveryService.updateWmsRecallInvoice(data);
+				data.setOrdChgSq(Integer.parseInt(data.getCjOrdChgSq()));
+				data.setOrdNo(Integer.parseInt(data.getCjOrdNo()));
+				
+				wmsDeliveryService.updateWmsRecallInvoice(data);
 			
 			// 3. mall tb_order_change 테이블  update 
 			deliveryService.updateTbOrderChaneInvoc(data);

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/persistence/domain/Delivery.java

@@ -159,6 +159,10 @@ public class Delivery extends TscBaseDomain {
 	private String goodsNm;
 	private String chgerBaseAddr;
 	
+	private String cjOrdChgSq;
+	private String cjOrdNo;
+	
+	
 	private Integer recallexceptionno;
 	private Integer recallexceptionitemno;
 	private Integer recallexceptionmemono;

src/main/java/com/style24/persistence/mybatis/cj/TsbCjDelivery.xml

@@ -7,17 +7,19 @@
 	<select id="getCjWdInvoiceList" resultType="Delivery">
 		/*TsbWmsDelivery.getCjWdInvoiceList*/
 		SELECT 
-		      INVC_NO     AS RECALLINVOICENO
-		      , SUBSTR(CUST_USE_NO, INSTR(CUST_USE_NO,'-')+1, LENGTH(CUST_USE_NO)) AS ORD_CHG_SQ
-		      , SUBSTR(CUST_USE_NO, 0,INSTR(CUST_USE_NO,'-')-1) AS ORD_NO
-		      , TO_DATE(SCAN_YMD||SCAN_HOUR,'YYYYMMDDHH24MISS')   AS DELIVERY_DT
-		      , CUST_USE_NO
-		  FROM V_TRACE_ISTYLE020
-		 WHERE CUST_ID = '0010046850'  -- 고객번호 
-		   AND RCPT_DV = '02' -- 반품 
-		   AND EAI_PRGS_ST = '01' 
-		   AND CRG_ST      = '01' 
-		 GROUP BY INVC_NO, TO_DATE(SCAN_YMD||SCAN_HOUR,'YYYYMMDDHH24MISS'), CUST_USE_NO
+		        A.INVC_NO     AS RECALLINVOICENO
+		      , SUBSTR(A.CUST_USE_NO, INSTR(A.CUST_USE_NO,'-')+1, LENGTH(A.CUST_USE_NO)) AS CJ_ORD_CHG_SQ
+		      , SUBSTR(A.CUST_USE_NO, 0,INSTR(A.CUST_USE_NO,'-')-1) AS CJ_ORD_NO
+		      , TO_DATE(A.SCAN_YMD||A.SCAN_HOUR,'YYYYMMDDHH24MISS')   AS DELIVERY_DT
+		      , A.CUST_USE_NO
+		  FROM V_TRACE_ISTYLE020 A, V_RCPT_ISTYLE010 B
+		 WHERE A.CUST_ID = B.CUST_ID
+       AND A.CUST_USE_NO = B.CUST_USE_NO
+       AND A.CUST_ID = '0010046850'  -- 고객번호 
+		   AND A.RCPT_DV = '02' -- 반품 
+		   AND A.EAI_PRGS_ST = '01' 
+		   AND A.CRG_ST      = '01' 
+		 GROUP BY A.INVC_NO, TO_DATE(A.SCAN_YMD||A.SCAN_HOUR,'YYYYMMDDHH24MISS'), A.CUST_USE_NO
 	</select>
 	
 	<!-- cj 회수 상태 조회    -->	

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/TsbDelivery.xml

@@ -1015,7 +1015,7 @@
 			, A.ORD_NM                            AS CustomerName
 			, A.ORD_DT                            AS DateOrdered
 			, FN_GET_CODE_NM('G110',D.CUST_GRADE) AS  Grade 
-			, E.RECIP_NM                          AS Receiver
+			, case when  B.EXTMALL_ID = 'APISHOP_0021' and E.RECIP_NM like '%주문자%' then SUBSTRING_INDEX(E.RECIP_NM,'(',1 )  else E.RECIP_NM  end as Receiver
 			, E.RECIP_TELNO                       AS ReceiverTelNum
 			, E.RECIP_PHNNO                       AS ReceiverCellNum
 			, E.RECIP_ZIPCODE                     AS DeliveryPostalCode
@@ -1170,7 +1170,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		
 		UNION ALL 
@@ -1221,7 +1221,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		
 		UNION ALL 
@@ -1276,7 +1276,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		
 		UNION ALL 
@@ -1331,7 +1331,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 		
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		) A ORDER BY OrderExceptionNo
 	</select>	
@@ -1417,7 +1417,8 @@
 			   AND A.INVOICE_NO != ''
 			   AND A.ORD_DTL_STAT  = 'G013_50'--  배송중
 			   AND NOT EXISTS (SELECT 1 FROM TB_ORDER_DETAIL_INVOICE B WHERE A.ORD_NO = B.ORD_NO AND A.ORD_DTL_NO = B.ORD_DTL_NO AND A.INVOICE_NO = B.INVOICE_NO AND B.SWT_TRC_SEND_YN ='Y')
-			 GROUP BY A.INVOICE_NO, A.SHIP_COMP_CD   
+			   AND A.REG_DT >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-09-01','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+			 GROUP BY A.INVOICE_NO, A.SHIP_COMP_CD
 			   
 			UNION ALL 
 			 

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

@@ -55,9 +55,9 @@
 	</insert>
 
 	<!-- 카테고리별재고임시 테이블 truncate -->
-	<delete id="truncateTemporaryCategoryStock" >
+	<delete id="truncateTemporaryCategoryStock" timeout="300">
 		/* TsbDisplay.truncateTemporaryCategoryStock */
-		TRUNCATE TABLE TB_CATE_STOCK_TMP
+		DELETE FROM TB_CATE_STOCK_TMP
 	</delete>
 
 	<!-- 카테고리별재고 임시테이블에 생성 -->

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

@@ -1013,7 +1013,7 @@
 			WHERE  1=1
 			GROUP  BY A.GOODS_CD
 		) B
-		) 
+		)
 		ON DUPLICATE KEY UPDATE
 		    ${colNm1} = B.COL_DATA
 	</insert>
@@ -1778,7 +1778,7 @@
 				  FROM TB_GOODS_IMG
 				  WHERE GOODS_CD = G.GOODS_CD
 			    ) > 0)
-			    
+
 		    </when>
 		    <otherwise>
 				AND ((SELECT COUNT(1)
@@ -1797,7 +1797,7 @@
 			    )
 		    </otherwise>
 		</choose>
-		
+
 	</select>
 
 	<!-- TB_IF_PRODUCTSKU 삭제 -->
@@ -2515,7 +2515,7 @@
 		                     AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		                     AND OD.GOODS_CD = G.GOODS_CD
 		                     AND G.SELF_GOODS_YN ='Y'
-		                     AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
+		                     AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)
 		                    )
 		]]>
 	</insert>
@@ -2557,7 +2557,7 @@
 		      WHERE OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		      AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		      AND EXISTS (SELECT 1 FROM TB_OPTION X WHERE X.GOODS_CD = ODI.ITEM_CD AND X.OPT_CD = ODI.OPT_CD)
-		      AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
+		      AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)
 		      GROUP BY ODI.ITEM_CD, ODI.OPT_CD, OD.ORD_DTL_NO, OD.AGENT_ORDER_ID, OD.EXTMALL_ORDER_ID
 		     ) A
 		WHERE NOT EXISTS (SELECT 1
@@ -2659,9 +2659,9 @@
 	</insert>
 
 	<!-- 상품혜택임시 테이블 truncate -->
-	<delete id="truncateTemporaryGoodsBenefit">
+	<delete id="truncateTemporaryGoodsBenefit" timeout="600">
 		/* TsbGoods.truncateTemporaryGoodsBenefit */
-		TRUNCATE TABLE TB_GOODS_BENEFIT_TMP
+		DELETE FROM TB_GOODS_BENEFIT_TMP
 	</delete>
 
 	<!-- 상품혜택임시- 쿠폰할인 생성(적용범위 개별) -->
@@ -3304,13 +3304,13 @@
 		  , UPD_DT = NOW()
 		WHERE RINBD_INFO_SQ = #{rinbdInfoSq}
 	</update>
-	
+
 	<!-- VW_STOCK임시 테이블 truncate -->
 	<delete id="truncateVwStockTemporary">
 		/* TsbGoods.truncateVwStockTemporary */
 		TRUNCATE TABLE VW_STOCK_TMP
 	</delete>
-	
+
 	<!-- VW_STOCK임시 테이블 생성 -->
 	<insert id="createVwStockTemporary" timeout="900">
 		/* TsbGoods.createVwStockTemporary */
@@ -3361,13 +3361,13 @@
 		                            AND S.OPT_CD = SQ.OPT_CD
 		       ) A
 	</insert>
-	
+
 	<!-- VW_STOCK 테이블 삭제 -->
 	<delete id="deleteVwStock" timeout="300">
 		/* TsbGoods.deleteVwStock */
 		DELETE FROM VW_STOCK
 	</delete>
-	
+
 	<!-- VW_STOCK 테이블 생성 -->
 	<insert id="createVwStock" timeout="900">
 		/* TsbGoods.createVwStock */

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

@@ -82,7 +82,7 @@ cron:
         secede.transform: 0 20 2 * * *         #탈퇴처리 (1일 1회)
         privacy.info.notify: 0 30 2 * * *      #개인정보이용내역안내(가입일로부터 1년 시점에 발송) (1일 1회)
         marketing.info.notify: 0 40 2 * * *    #마케팅정보수신동의내역안내(마케팅 정보 수신자에 한해 발송. 가입일로부터 2년 시점에 발송) (1일 1회)
-        grade.change: 0 50 2 * * *             #회원등급변경(매월1일) (1월 1회)
+        grade.change: 0 50 2 1 * *             #회원등급변경(매월1일) (1월 1회)
         netpathy.mail.sync: 0 0 3 * * *        #넷퍼시메일솔루션에 회원정보 연동(1일 1회)
         auto.buy.confirm: 0 5 3 * * *          #자동구매확정(예정포인트 지급) (1일 1회)
         birth.coupon.notify: 0 10 3 1 * *      #생일쿠폰 다운로드 안내(당월 생일인 회원을 대상으로 해당 월 1일에 발송) (1일 1회)
@@ -118,11 +118,11 @@ cron:
         shot.deliveryzone.refresh: 0 10 2 * * *        #총알배송 권역정보 갱신(매일 11시) (1일 1회)
         loc.assign: 0 0/10 7-16 * * MON-FRI            #출고처 지정 및 배송(출고) 지시 (1시간 1회)
         wms:
-            outgoing.exception.receive: 0 0/10 * * * MON-FRI #WMS 출고예외 수신 (1시간 1회)
-            outgoing.result.receive: 0 5/10 * * * MON-FRI    #WMS 출고결과 수신 (1시간 1회)
-            invoice.receive: 0 7/10 * * * MON-FRI     #WMS 운송장번호 수신(1시간 1회)
+            outgoing.exception.receive: 0 0/10 7-20 * * MON-FRI #WMS 출고예외 수신 (1시간 1회)
+            outgoing.result.receive: 0 5/10 7-22 * * MON-FRI    #WMS 출고결과 수신 (1시간 1회)
+            invoice.receive: 0 7/10 7-20 * * MON-FRI     #WMS 운송장번호 수신(1시간 1회)
         sweettracker.invoice.retrieve: 2 22 2 29 2 ?   #스윗트래커 배송추적 요청 (1시간 1회). public 배치에서 실행
-        auto.soldout.cancel: 0 8/10 8-23 * * MON-FRI  #자동품절취소 (1시간 1회)
+        auto.soldout.cancel: 0 8/10 10-23 * * MON-FRI  #자동품절취소 (1시간 1회)
 
     #회수
     withdraw: