Merge branch 'develop' into jsshin

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

@@ -510,7 +510,7 @@ public interface TsbDeliveryDao {
 	 * @author moon
 	 * @since 2021. 05. 06
 	 */
-	Collection<Delivery> getSoldoutOrderExcDtlNoList();
+	Collection<Delivery> getSoldoutOrderExcNoList();
 	
 	/**
 	 * 품절대상 출고예외 주문상세 목록 조회   
@@ -528,7 +528,7 @@ public interface TsbDeliveryDao {
 	 * @author moon
 	 * @since 2021. 05. 06
 	 */
-	Collection<Delivery> getSoldoutOrderRecallDtlNoList();
+	Collection<Delivery> getSoldoutOrderRecallNoList();
 	
 	/**
 	 * 품절대상 회수예외 주문상세 목록 조회   

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

@@ -61,7 +61,7 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		}
 		
 		// 2. (출고예외 -- 재고부족)               품절 대상 조회     core 취소 서비스호출  처리완료 업데이트 
-		Collection<Delivery> excOrdnoList = deliveryService.getSoldoutOrderExcDtlNoList();
+		Collection<Delivery> excOrdnoList = deliveryService.getSoldoutOrderExcNoList();
 		try {
 			for(Delivery data2 : excOrdnoList) {
 				deliveryService.SoldoutCancel(data2,"E");
@@ -72,7 +72,7 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		}
 		
 		// 3. (회수예외 -- 확정전 품절, 확정전 불량 )   품절 대상 조회    core 취소 서비스호출   처리완료 업데이트 
-		Collection<Delivery> recallOrdnoList = deliveryService.getSoldoutOrderRecallDtlNoList();
+		Collection<Delivery> recallOrdnoList = deliveryService.getSoldoutOrderRecallNoList();
 		try {
 			for(Delivery data3 : recallOrdnoList) {
 				deliveryService.SoldoutCancel(data3,"R");

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

@@ -1016,9 +1016,9 @@ public class TsbDeliveryService {
 	 * @author moon
 	 * @since  2021. 05. 06
 	 */
-	public Collection<Delivery> getSoldoutOrderExcDtlNoList() {
+	public Collection<Delivery> getSoldoutOrderExcNoList() {
 
-		Collection<Delivery> list = deliveryDao.getSoldoutOrderExcDtlNoList();
+		Collection<Delivery> list = deliveryDao.getSoldoutOrderExcNoList();
 		return list ;
 	}
 	
@@ -1029,9 +1029,9 @@ public class TsbDeliveryService {
 	 * @author moon
 	 * @since  2021. 05. 06
 	 */
-	public Collection<Delivery> getSoldoutOrderRecallDtlNoList() {
+	public Collection<Delivery> getSoldoutOrderRecallNoList() {
 
-		Collection<Delivery> list = deliveryDao.getSoldoutOrderRecallDtlNoList();
+		Collection<Delivery> list = deliveryDao.getSoldoutOrderRecallNoList();
 		return list ;
 	}
 	

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

@@ -120,7 +120,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	//@Scheduled(cron = "${cron.delivery.tsbDeliveryOrderJob}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbDeliveryOrderJob() throws Exception {
 		deliveryOrderJob.run("cron.delivery.tsbDeliveryOrderJob");

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

@@ -117,7 +117,7 @@
 			  #{recallexceptionitemno}
 			, #{recallexceptionno}
 			, #{deliveryorderitemno}
-			, CASE WHEN #{orderdtlno} IS NULL THEN (SELECT ORD_DTL_NO FROM TB_ORDER_DETAIL_ITEM WHERE ORD_NO = #{orderno} AND OPT_CD = #{skucode} ) ELSE #{orderdtlno} END
+			, CASE WHEN #{orderdtlno} IS NULL THEN (SELECT D.ORD_DTL_NO FROM TB_ORDER_DETAIL_ITEM D WHERE D.ORD_NO = #{orderno} AND D.OPT_CD = #{skucode} ) ELSE #{orderdtlno} END
 			, #{productno}
 			, #{productcode}
 			, #{productname}
@@ -251,7 +251,7 @@
 				, #{exceptionqty} 
 				, #{reasoncd}
 				, #{orderno}
-				, CASE WHEN #{orderdtlno} IS NULL THEN (SELECT ORD_DTL_NO FROM TB_ORDER_DETAIL_ITEM WHERE ORD_NO = #{orderno} AND OPT_CD = #{skucode} ) ELSE #{orderdtlno} END 
+				, CASE WHEN #{orderdtlno} IS NULL THEN (SELECT D.ORD_DTL_NO FROM TB_ORDER_DETAIL_ITEM D WHERE D.ORD_NO = #{orderno} AND D.OPT_CD = #{skucode} ) ELSE #{orderdtlno} END 
 				, #{giftyn}
 				, #{productno}
 				, #{productcode}
@@ -555,7 +555,7 @@
 			   AND B.ORD_EXCH_GB   = 'O'       -- 주문
 			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)
 			   AND NOT EXISTS (SELECT '1' FROM TB_GOODS_RES_SELL WHERE GOODS_CD = B.GOODS_CD AND USE_YN ='Y') 
-			--   AND A.REG_NO = 100025
+			   -- AND A.REG_NO = 100025
 			 GROUP BY A.ORD_NO
 			
 			UNION ALL /* 교환  상품 */
@@ -572,7 +572,7 @@
 			   AND D.CHG_STAT     IN ('G685_30','G685_32')
 			   AND DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY) 
 			       <= CASE WHEN E.WD_BF_SEND_YN = 'Y' THEN B.REG_DT ELSE D.COMPLETE_DT END
-			--   AND A.REG_NO = 100025
+			   -- AND A.REG_NO = 100025
 			 GROUP BY A.ORD_NO
 			 
 			UNION ALL  
@@ -587,7 +587,7 @@
 			   AND D.DELV_RES_DT  <= NOW()
 			   AND DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)
 			       < CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END 
-			--   AND A.REG_NO = 100025    
+			   -- AND A.REG_NO = 100025    
 			 GROUP BY A.ORD_NO
 			
 		) A
@@ -1485,8 +1485,8 @@
 		
 	
 	<!-- 품절대상 출고예외 주문 목록 조회         -->	
-	<select id="getSoldoutOrderExcDtlNoList" resultType="Delivery">
-		/*TsbDelivery.getSoldoutOrderExcDtlNoList*/
+	<select id="getSoldoutOrderExcNoList" resultType="Delivery">
+		/*TsbDelivery.getSoldoutOrderExcNoList*/
 		SELECT A.ORD_NO 
 		  FROM TB_ORDER_DELIVERY_EXCEPTION A 
 		  JOIN TB_ORDER_DELIVERY_EXCEPTION_ITEM B ON A.DELIVERY_EXCEPTION_SQ = B.DELIVERY_EXCEPTION_SQ 
@@ -1520,8 +1520,8 @@
 	</select>	
 	
 	<!-- 품절대상 회수예외 주문 목록 조회         -->	
-	<select id="getSoldoutOrderRecallDtlNoList" resultType="Delivery">
-		/*TsbDelivery.getSoldoutOrderRecallDtlNoList*/
+	<select id="getSoldoutOrderRecallNoList" resultType="Delivery">
+		/*TsbDelivery.getSoldoutOrderRecallNoList*/
 		SELECT A.ORDER_NO 
 		  FROM TB_ORDER_RECALL_EXCEPTION A 
 		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO