Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/dao/TsfReviewDao.java

@@ -225,6 +225,15 @@ public interface TsfReviewDao {
 	 */
 	void createReviewPointHst(Point point);
 	
+	/**
+	 * 마이페이지 CONFIRM_YN 업데이트
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 5. 10
+	 */
+	void updateMypageReviewConfimYn(Review review);
+	
 
 
 	

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

@@ -172,6 +172,7 @@ public class TsfReviewService {
 	public void saveMypageReview(Review review) {
 		review.setDispYn("Y");
 		review.setDelYn("N");
+		review.setConfirmYn("Y");
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());
 		if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) {
@@ -181,10 +182,12 @@ public class TsfReviewService {
 		}else {
 			review.setPntGiveStat("G043_10");
 		}
+		
 		reviewDao.saveMypageReview(review);
 		
 		//이미지등록
 		if(review.getOrgFileNmArr() != null) {
+			review.setConfirmYn("Y");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
@@ -220,6 +223,7 @@ public class TsfReviewService {
 		}
 		
 		if(review.getKufKeyArr() != null) {
+			review.setConfirmYn("N");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
@@ -255,6 +259,7 @@ public class TsfReviewService {
 				point.setReviewSq(review.getReviewSq());
 				reviewDao.createReviewPointHst(point);
 			}else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
+				
 				// 상품평 + 사진
 				point.setCustNo(TsfSession.getInfo().getCustNo());
 				point.setGvPntAmt(photoReviewPnt);
@@ -264,9 +269,14 @@ public class TsfReviewService {
 				point.setReviewSq(review.getReviewSq());
 				reviewDao.createReviewPointHst(point);
 			}
-			
 		}
+		
+		if (review.getConfirmYn()=="Y") {
+			reviewDao.updateMypageReviewConfimYn(review);
+		}
+		
 	}
+		
 	
 	/**
 	 * 마이페이지 리뷰 업데이트

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

@@ -840,6 +840,14 @@
 		AND   GOODS_CD   = #{goodsCd}
 	</update>
 	
+	<update id="updateMypageReviewConfimYn" parameterType="Review">
+		/* TsfReivew.updateMypageReviewConfimYn */
+		UPDATE TB_REVIEW
+		SET CONFIRM_YN = 'N'
+		   ,CONFIRM_DT = NOW()
+		WHERE REVIEW_SQ  = #{reviewSq}
+	</update>
+	
 	
 	
 	
@@ -884,6 +892,7 @@
 				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -90 DAY), '%Y%M%D%H%I%S')
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
+				AND R.CONFIRM_YN = 'Y'
  				AND O.SITE_CD = #{siteCd}
 			GROUP BY O.ORD_NO 
 			      ,O.ORD_NM 
@@ -1112,6 +1121,7 @@
 		   AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 		   AND O.CUST_NO =  #{custNo}
 		   AND O.DISP_YN = 'Y'
+		   AND R.CONFIRM_YN = 'Y'
 		   AND O.SITE_CD =  #{siteCd}
 		   	) Z
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
@@ -1176,7 +1186,7 @@
 		 AND RA.DEL_YN = 'N'
 		 AND (RA.FILE_GB  = 'I'
 		      OR
-		      RA.FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'  AND  RA.KMC_KEY IS NOT NULL
+		      RA.FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'  AND  NULLIF(RA.KMC_KEY,'') IS NOT NULL
 		     )
 	</select>
 	

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

@@ -68,9 +68,10 @@
 						if (reviewAttach.fileGb == "M") fileGbClass = "mov";
 				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="'+_kollusMediaUrl+'/'+reviewAttach.kmcKey + 'player_version=html5" type="video/mp4">\n';
-				tag +='			</video>\n';
+			    tag +='<iframe width="100%" height="100%" src="'+_kollusMediaUrl+'/'+reviewAttach.kmcKey + '/player_version=html5" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>';
+				//tag +='			<video poster="'+_kollusMediaUrl+'/'+reviewAttach.kmcKey + '/player_version=html5" muted="muted" preload="metadata" controls="controls">\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';	
 						}