Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -1993,11 +1993,22 @@
 	<!-- 총알배송 가능시간 조회 -->
 	<select id="getDailyDeliveryTimeInfo" resultType="int">
 		/* order.getDailyDeliveryTimeInfo */
-		SELECT CASE WHEN TIME_FORMAT(NOW(), '%H%i%S') > 100000
-		            THEN 0
-		            ELSE 1
-		            END  SHOT_DELV_ABLE_YN
-		FROM   DUAL
+		SELECT IFNULL(SUM(A.SHOT_DELV_ABLE_YN), 0) AS SHOT_DELV_ABLE_YN
+		FROM (
+			SELECT CASE WHEN TIME_FORMAT(NOW(), '%H') <![CDATA[<]]> ENV.STR_SET_VAL4 AND BIZ.BIZDAY_YN IN ('Y')
+			            THEN 1
+			            ELSE 0
+			            END  SHOT_DELV_ABLE_YN
+			FROM   TB_ENVSET ENV
+			LEFT   OUTER JOIN TB_BIZDAY BIZ
+			ON     1=1
+			AND    BIZ.BIZDAY = DATE_FORMAT(NOW(), '%Y%m%d')
+			WHERE  1=1
+			AND    ENV.SITE_CD = 'G000_10'
+			AND    ENV.ENVSET_TYPE = 'O15'
+			ORDER  BY ENV.REG_DT DESC
+			LIMIT  1
+		) A
 	</select>
 	
 	<!-- 총알배송 가능지역 조회 -->