Merge remote-tracking branch 'TSIT/ST24PRJ-585' into develop

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

@@ -4461,7 +4461,8 @@
 		SET    ORD_DTL_STAT = #{ordDtlStat}
 		     , FIRST_ORD_DTL_NO = ORD_DTL_NO
 			<if test="payMeans == 'G014_20' and ordDtlStat == 'G013_20'">
-		     , SHOT_DELV_YN = CASE WHEN SHOT_DELV_YN = 'Y' AND DATE_FORMAT(NOW(), '%H') <![CDATA[>]]> 10 THEN 'N'
+		     , SHOT_DELV_YN = CASE WHEN SHOT_DELV_YN = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') <![CDATA[<>]]> DATE_FORMAT(REG_DT, '%Y-%m-%d') THEN 'N' 
+		                           WHEN SHOT_DELV_YN = 'Y' AND DATE_FORMAT(NOW(), '%H') <![CDATA[>]]> 10 THEN 'N'
 		                           ELSE SHOT_DELV_YN
 		                       END
 			</if>