Merge remote-tracking branch 'origin/style' into jsh77b

src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -352,7 +352,9 @@ public class TsfGoodsController extends TsfBaseController {
 				// 비슷한 상품
 //				log.info("[상품상세  비슷한 상품] =={}", eigeneaiApi.getSameCategoryRelatedGoodsList(15,goods.getGoodsCd()));
 				if( null != goodsNavigation ) {
-					mav.addObject("likeGoodsList", eigeneaiApi.getSameCategoryRelatedGoodsList(15,goods.getGoodsCd(), goodsNavigation.getCate3No(), TsfSession.getFrontGb()));
+					if( null != goodsNavigation.getCate3No()) {
+						mav.addObject("likeGoodsList", eigeneaiApi.getSameCategoryRelatedGoodsList(15,goods.getGoodsCd(), goodsNavigation.getCate3No(), TsfSession.getFrontGb()));
+					}
 				}
 			}
 			
@@ -1080,7 +1082,9 @@ public class TsfGoodsController extends TsfBaseController {
 		goods.setCateGb("G032_101"); 		//by item
 		Cate4Srch goodsNavigation = goodsService.getGoodsNavigation(goods);
 		if(null != goodsNavigation) {
-			mav.addObject("goodsList", eigeneaiApi.getSameCategoryRelatedGoodsList(15,goods.getGoodsCd(), goodsNavigation.getCate3No(), TsfSession.getFrontGb()));
+			if( null != goodsNavigation.getCate3No()) {
+				mav.addObject("goodsList", eigeneaiApi.getSameCategoryRelatedGoodsList(15,goods.getGoodsCd(), goodsNavigation.getCate3No(), TsfSession.getFrontGb()));
+			}
 		}
 		goods.setIthrCd("IN15_05");
 		mav.addObject("params", goods);
@@ -1577,7 +1581,11 @@ public class TsfGoodsController extends TsfBaseController {
 		goods.setSiteCd("G000_10");
 		goods.setCateGb("G032_101"); 		//by item
 		Cate4Srch goodsNavigation = goodsService.getGoodsNavigation(goods);
-		return eigeneaiApi.getSameCategoryRelatedGoodsList(10, goodsCd, goodsNavigation.getCate3No(), TsfSession.getFrontGb());
+		if( null != goodsNavigation.getCate3No()) {
+			return eigeneaiApi.getSameCategoryRelatedGoodsList(10, goodsCd, goodsNavigation.getCate3No(), TsfSession.getFrontGb());
+		}else {
+			return null;
+		}
 	}
 
 }

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -539,7 +539,7 @@
 					}
 					// 환불진행중
 					if (cre.chgStat == 'G685_33') {
-						tag += '									<div class="order_text"><p>환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p></div>\n';
+						tag += '									<div class="order_text"><p>환불을 진행하고 있습니다.</p></div>\n';
 					}
 					// 반품완료
 					if (cre.chgStat == 'G685_60') {

src/main/webapp/WEB-INF/views/web/mypage/MypageCreReturnDetailFormWeb.html

@@ -106,7 +106,7 @@
 									<!-- 반품상품검수중 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}"><p>고객님이 반품하신 상품을 검수 중에 있습니다.</p></div>
 									<!-- 반품진행중 -->
-									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p></div>
+									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다.</p></div>
 									<!-- 반품완료 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_60'}"><p>반품이 완료되었습니다.</p></div>
 									<!-- 반품철회 -->