Merge remote-tracking branch 'TSIT/jmh' into style

src/main/java/com/style24/front/biz/thirdparty/EigeneaiApi.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import com.google.gson.Gson;
@@ -511,15 +512,21 @@ public class EigeneaiApi {
 		log.info("requestUrl: {}", requestUrl);
 		URI url = URI.create(requestUrl);
 
-		// GET방식으로 호출
-		ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
-		log.info("responseEntity.getStatusCode(): {} ", responseEntity.getStatusCode());
+		String responseJson = null;
+		
+		try {
+			// GET방식으로 호출
+			ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
+			log.info("responseEntity.getStatusCode(): {} ", responseEntity.getStatusCode());
 
-		String responseJson = responseEntity.getBody();
-		// log.info("responseEntity.getBody(): {}", responseJson);
+			responseJson = responseEntity.getBody();
+			// log.info("responseEntity.getBody(): {}", responseJson);
 
-		if (!responseEntity.getStatusCode().equals(HttpStatus.OK)) {
-			return null;
+			if (!responseEntity.getStatusCode().equals(HttpStatus.OK)) {
+				return new Eigeneai();
+			}
+		} catch (RestClientException e) {
+			return new Eigeneai();
 		}
 
 		Gson gson = new Gson();

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

@@ -848,7 +848,7 @@
 		                             AND B.USE_YN = 'Y'
 		                             AND G.DELV_LOC_CD = B.DELV_LOC_CD 
 		INNER JOIN TB_SHIP_COMPANY SC ON B.SHIP_COMP_CD = SC.SHIP_COMP_CD
-		                             -- AND SC.USE_YN = 'Y' /*cj대한통운 이슈로 체크제외*/
+		                              AND SC.USE_YN = 'Y'
 		WHERE G.GOODS_CD = #{goodsCd}
 		ORDER BY A.DELV_FEE_CD 
 		LIMIT 1