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

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

@@ -4445,6 +4445,11 @@
 		UPDATE TB_ORDER_DETAIL
 		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'
+		                           ELSE SHOT_DELV_YN
+		                       END
+			</if>
 		     , UPD_NO = #{custNo}
 		     , UPD_DT = NOW()
 		WHERE  1=1