Merge branch 'stage_tsit' of https://dev.azure.com/style24/style24/_git/style24.batch into stage_tsit

src/main/java/com/style24/batch/biz/web/TsbDeliveryController.java

@@ -71,7 +71,7 @@ public class TsbDeliveryController extends TscBaseController {
 	@GetMapping("/loc/assign")
 	@ResponseBody
 	public String deliveryLocAssignJob() throws Exception {
-		deliveryOrderJob.run("cron.delivery.loc.assign");
+		deliveryOrderJob.runById("cron.delivery.loc.assign");
 		return "OK";
 	}
 

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

@@ -610,6 +610,7 @@
 	       , ORD_EXCH_GB
 	       , PG_GB
 	       , GIFT_YN
+	       , SHOT_DELV_YN
 	    FROM (
 	        SELECT A.ORD_NO
 	             , B.ORD_EXCH_GB
@@ -618,6 +619,7 @@
 	                WHERE  ORD_NO= A.ORD_NO 
 	                AND    PAY_GB ='O') AS PG_GB /* 주문 상품 */
 	             , CASE WHEN (SELECT COUNT(1) FROM TB_ORD_FREEGIFT ODF WHERE ODF.ORD_NO = A.ORD_NO) > 0 THEN 'Y' ELSE 'N' END AS GIFT_YN
+	             , B.SHOT_DELV_YN
 			  FROM TB_ORDER        A
 			  JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS        C ON B.GOODS_CD = C.GOODS_CD 
@@ -631,7 +633,7 @@
 			                  ELSE 'Y' 
 			                  END 
 			   AND A.ORD_DT <= DATE_ADD(NOW(), INTERVAL -30 SECOND) -- 30초 DELAY
-			   AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY = DATE_FORMAT(NOW(),'%Y%m%d'))
+			   #AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY = DATE_FORMAT(NOW(),'%Y%m%d'))
 			   AND NOT EXISTS (
 			                SELECT 1
 			                  FROM TB_DELIVERY_ASSIGN
@@ -641,6 +643,7 @@
 			                   AND DELV_AR_GB  = 'N')
 			 GROUP BY A.ORD_NO
 			     , B.ORD_EXCH_GB
+			     , B.SHOT_DELV_YN
 			UNION ALL /* 교환  상품 */
 			SELECT A.ORD_NO
 			     , B.ORD_EXCH_GB
@@ -649,6 +652,7 @@
 			        WHERE  ORD_NO = A.ORD_NO 
 			        AND    PAY_GB ='O') AS PG_GB
 			     , 'N'AS GIFT_YN
+			     , 'N'AS SHOT_DELV_YN
 			  FROM TB_ORDER        A
 			  JOIN TB_ORDER_DETAIL B        ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS        C        ON B.GOODS_CD = C.GOODS_CD 
@@ -661,7 +665,7 @@
 			   AND 2 >= FN_GET_BIZDAYS(DATE_FORMAT(CASE WHEN E.WD_BF_SEND_YN = 'Y' THEN B.REG_DT ELSE D.COMPLETE_DT END, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
 			   AND CASE WHEN E.WD_BF_SEND_YN = 'Y' THEN B.REG_DT ELSE D.COMPLETE_DT END <= DATE_ADD(NOW(), INTERVAL -30 SECOND)
 			   AND NOT EXISTS (SELECT 1 FROM TB_EXCHANGE_DELV_FAIL WHERE ORD_NO = A.ORD_NO AND ORD_DTL_NO= D.CHG_ORD_DTL_NO AND ORD_CHG_SQ = D.ORD_CHG_SQ AND DELV_CNCL_YN ='N')
-			   AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY  = DATE_FORMAT(NOW(),'%Y%m%d'))
+			   #AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY  = DATE_FORMAT(NOW(),'%Y%m%d'))
 			   AND NOT EXISTS (
 			                SELECT 1
 			                  FROM TB_DELIVERY_ASSIGN
@@ -680,6 +684,7 @@
 			        WHERE  ORD_NO= A.ORD_NO 
 			        AND    PAY_GB ='O') AS PG_GB  -- 예약상품 
 			     , CASE WHEN (SELECT COUNT(1) FROM TB_ORD_FREEGIFT ODF WHERE ODF.ORD_NO = A.ORD_NO) > 0 THEN 'Y' ELSE 'N' END AS GIFT_YN
+			     , 'N'AS SHOT_DELV_YN
 			  FROM TB_ORDER          A
 			  JOIN TB_ORDER_DETAIL   B ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS          C ON B.GOODS_CD = C.GOODS_CD 
@@ -690,7 +695,7 @@
 			   AND B.ORD_EXCH_GB   = 'O'       -- 주문 
 			   AND 2 >= FN_GET_BIZDAYS(DATE_FORMAT(CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
 			   AND 'Y' = CASE WHEN B.GIFT_PACK_YN ='Y' AND B.GIFT_ADDR_INP_YN = 'N' THEN 'N' ELSE 'Y' END 
-			   AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY  = DATE_FORMAT(NOW(),'%Y%m%d'))
+			   #AND 'Y' = (SELECT BI.BIZDAY_YN FROM TB_BIZDAY BI WHERE BIZDAY  = DATE_FORMAT(NOW(),'%Y%m%d'))
 			   AND NOT EXISTS (
 			                SELECT 1
 			                  FROM TB_DELIVERY_ASSIGN
@@ -707,7 +712,7 @@
 		                 THEN 'N' 
 		                 ELSE 'Y' 
 		                 END   --  오픈시점 주석풀기  네이버 주문형은 14시까지 
-		ORDER BY ORD_NO
+		ORDER BY SHOT_DELV_YN DESC, ORD_NO
 		LIMIT 0, 400
 		]]>
 	</select>