Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -137,10 +137,6 @@ public class TsfPlanningService {
 			}
 		}
 
-		// 신규회원접근가능여부 조회
-		if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
-			msg = "신규회원만 접근 가능합니다.";
-		}
 		
 		if (!TsfSession.isLogin()) {
 			if (planningDao.getNonmemberGradeAccessible(plan) > 0) {
@@ -149,6 +145,12 @@ public class TsfPlanningService {
 		}
 		
 		if (TsfSession.isLogin()) {
+			
+			// 신규회원접근가능여부 조회
+			if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
+				msg = "신규회원만 접근 가능합니다.";
+			}
+			
 			// 고객구분접근가능여부 조회
 			plan.setCustGb(TsfSession.getCustGb());
 			if ("N".equals(planningDao.getCustomerGubunAccessibleYn(plan))) {

src/main/java/com/style24/persistence/domain/Review.java

@@ -52,6 +52,7 @@ public class Review extends TscBaseDomain {
 	private String admRplDt;		// 관리자댓글등록일시
 	private String frontGb;
 	private String custGb;
+	private String brandNm;
 
 	private String custId;			// 고객ID
 	private String sysImgNm;		// 상품대표이미지

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

@@ -354,7 +354,9 @@
 		SELECT CASE WHEN NEW_CUST_YN = 'N' THEN
 		                'Y' /*접근가능*/
 		            ELSE
-		                CASE WHEN NOW() BETWEEN CUST_JOIN_STDT AND CUST_JOIN_EDDT THEN
+		                CASE WHEN (SELECT JOIN_DT 
+		                           FROM TB_CUSTOMER C
+		                           WHERE C.CUST_NO = #{custNo}) BETWEEN CUST_JOIN_STDT AND CUST_JOIN_EDDT THEN
 		                         'Y' /*접근가능*/
 		                     ELSE
 		                         'N' /*접근불가*/

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

@@ -425,7 +425,9 @@
 					 , OD.CHANGEABLE_YN
 					 , OD.RETURNABLE_YN
 					 , G.SELF_GOODS_YN
-			         , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)							AS BRAND_NM
+			         , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+		                       ELSE BG.BRAND_GROUP_KNM
+		               END                                                             AS BRAND_NM
 			         , B.BRAND_ENM
 					 , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
 					 , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
@@ -446,6 +448,8 @@
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
 				    ON B.BRAND_CD = G.BRAND_CD
+				 INNER JOIN TB_BRAND_GROUP BG
+		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 				 LEFT JOIN TB_ITEMKIND I 
 				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
 				  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
@@ -1014,7 +1018,9 @@
 		                  , OD.CHANGEABLE_YN
 		                  , OD.RETURNABLE_YN
 		                  , G.SELF_GOODS_YN
-		                  , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)							AS BRAND_NM
+		                  , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+		                       ELSE BG.BRAND_GROUP_KNM
+		                        END                                                             AS BRAND_NM
 		                  , B.BRAND_ENM
 		                  , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
 		                  , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
@@ -1082,6 +1088,8 @@
 		      ON OD.GOODS_CD = G.GOODS_CD
 		   INNER JOIN TB_BRAND B
 		      ON B.BRAND_CD = G.BRAND_CD
+		    INNER JOIN TB_BRAND_GROUP BG
+		      ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		   INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
 		  	AND R.ORD_NO = O.ORD_NO
 		  	AND R.ORD_DTL_NO = OD.ORD_DTL_NO 

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

@@ -69,7 +69,7 @@
 				tag +='		<span class="thumb" class="'+fileGbClass+'">\n';<!-- 동영상의 썸네일일 경우 mov 클래스 추가-->
 						if (reviewAttach.fileGb == "M") {
 				tag +='			<video poster="http://cdn.011st.com/11dims/resize/1999x1999/quality/75/11src/review/10201202/3121412332/2e66698576d64c5c9977a6fe6606008d.jpg" muted="muted" preload="metadata" controls="controls">\n';
-				tag +='				<source src="http://snsvideo.11st.co.kr/movie/item/www/675/67518524_06_1_C1.mp4" type="video/mp4">\n';
+				tag +='				<source src="'+_kollusMediaUrl+'/'+reviewAttach.kmcKey + 'player_version=html5" type="video/mp4">\n';
 				tag +='			</video>\n';
 						}else{
 				tag +='			<img src="'+ _imgUrl + reviewAttach.sysFileNm +'" alt="">\n';	

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

@@ -158,7 +158,7 @@
 				html += '								<span class="buy_date"><em>'+item.payDt+'</em>&nbsp;구매</span>             ';
 				html += '							</p>                                                                                          ';
 				html += '							<p>                                                                                           ';
-				html += '								<span class="brand">'+item.brandEnm+'</span>                               ';
+				html += '								<span class="brand">'+item.brandNm+'</span>                               ';
 				html += '							</p>                                                                                          ';
 				html += '							<p>                                                                                           ';
 				html += '								<span class="name">'+item.goodsNm+'</span>									';
@@ -222,7 +222,7 @@
 				html+='									<span class="buy_date"><em>'+item.payDt+'</em>&nbsp;구매</span>';
 				html+='								</p>';
 				html+='								<p>';
-				html+='									<span class="brand">'+item.brandEnm+'</span>';
+				html+='									<span class="brand">'+item.brandNm+'</span>';
 				html+='								</p>';
 				html+='								<p>';
 				html+='									<span class="name">'+item.goodsNm+'</span>																';