Merge branch 'sowon' into develop

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

@@ -225,6 +225,9 @@ public interface TsfReviewDao {
 	 */
 	void createReviewPointHst(Point point);
 	
+
+
+	
 	
 	
 }

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

@@ -445,5 +445,16 @@ public class TsfReviewService {
 		return reviewDao.getReviewPointGiveCount(review);
 	}
 	
+	/**
+	 * 상품평 첨부파일 목록
+	 * @param review
+	 * @return 
+	 * @author eskim
+	 * @since 2021. 3. 15
+	 */
+	public Collection<ReviewAttach> getReviewAttachList(Review review){
+		return reviewDao.getReviewAttachList(review);
+	}
+	
 	
 }

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

@@ -1662,9 +1662,11 @@ public class TsfMypageController extends TsfBaseController {
 
 		GagaMap result = new GagaMap();
 		review.setCustNo(TsfSession.getInfo().getCustNo());
-		if (reviewService.reviewDeleteConfirm(review).getCount() > 0) {
-			review.setReviewSq(reviewService.reviewDeleteConfirm(review).getReviewSq());
-		}
+		/*
+		 * if (reviewService.reviewDeleteConfirm(review).getCount() > 0) {
+		 * review.setReviewSq(reviewService.reviewDeleteConfirm(review).getReviewSq());
+		 * }
+		 */
 
 		reviewService.updateMypageReview(review);
 		result.set("status", "200");

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

@@ -382,6 +382,7 @@
 let reviewList = [[${reviewInfo}]];
 let reviewStat = [[${reviewStat}]];
 let reviewAttach = [[${alreadyReviewAttach}]];
+console.log(reviewAttach);
 let reviewUrl =[[${@environment.getProperty('upload.image.view')}]];
 // 별점 class="on"
 var $starEls = $('#star button#starBtn');
@@ -523,36 +524,33 @@ var reviewUpdate = function() {
 }
 var fnSaveCallback = function (result) {
 	if(result.status == "200"){
-		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
-			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
+		if (document.getElementsByName("kufKeyArr").length>0 || document.getElementsByName("orgFileNmArr").length>0) {
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 350P 적립 예정입니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() { 
 					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
 				}
 			});
 		}else{
-			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 350P 적립 예정입니다.", {
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() { 
 					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
 				}
 			});
 		}
-		
-	
 	}
 }
 
 var fnUpdateCallback = function (result) {
 	if(result.status == "200"){
-		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
-			mcxDialog.confirm("상품 리뷰를 수정하였습니다.", {
-				sureBtnText: "확인",
-				sureBtnClick: function() { 
-					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
-				}
-			});
-		}
+		mcxDialog.confirm("상품 리뷰를 수정하였습니다.", {
+			sureBtnText: "확인",
+			sureBtnClick: function() { 
+				cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+			}
+		}); 
+		
 	}
 }
 
@@ -577,6 +575,16 @@ var fnChooseFile = function(obj) {
 	
 	// multiple 속성이 있으면 files에는 다수의 객체가 할당됨
 	var file = obj.files[0];
+	
+/* 	if (!gagajf.isNull(file.size) && Number(file.size) > (10 * 1000000)) {        
+		mcxDialog.alertC('이미지는 최대 10MB 이하 파일만 가능합니다.', {                          
+			sureBtnText: "확인",                                                    
+			sureBtnClick: function() {                                            
+				$(obj).parent('.imgUpload').find('.removes').trigger('click');    
+			}                                                                     
+		});                                                                       
+		return false;                                                             
+	}                 */                                                             
 
 	if (!gagajf.isNull(file.name)) {
 		var extension = "\.(jpg|jpeg|png)$";
@@ -605,15 +613,7 @@ var fnChooseFile = function(obj) {
 		}
 	}
 	// 이거 왜 안먹히지 
-//	if (!gagajf.isNull(file.size) && Number(file.size) > (10 * 1000000)) {
-//		mcxDialog.alertC('이미지는 최대 10MB 이하 파일만 가능합니다.', {
-//			sureBtnText: "확인",
-//			sureBtnClick: function() {
-//				$(obj).parent('.imgUpload').find('.removes').trigger('click');
-//			}
-//		});
-//		return false;
-//	} 
+
 	
 	// 파일 업로드
 /* 	 gagajf.ajaxFileUpload('/common/file/upload?subDir=/review'
@@ -693,20 +693,23 @@ $(document).ready(function() {
 		
 		if(reviewAttach.length>0){
 			for (var i = 0; i < reviewAttach.length; i++) {
-				if(reviewAttach[i].fileGb == "I"){
-					$("<span class=\"pics\">" +
-							"<img class=\"picsThumbs\" src=\"" + reviewUrl + '/' + reviewAttach[i].sysFileNm + "\" />" +
-							"<input type='hidden' name='orgFileNmArr' value='"+reviewAttach[i].orgFileNm+"'>" +
-							"<input type='hidden' name='sysFileNmArr' value='"+reviewAttach[i].sysFileNm+"'>" +
-							"<br/><span class=\"removes\">Removes image</span>" +
-							"</span>").insertAfter("#fileAdd");
-				}else{
-					$("<span class=\"pics\">" +
-							"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/' + attachList[i].kmcKey + "\" />" +
-							"<input type='hidden' name='kufKeyArr' value='" + attachList[i].kmcKey + "'>" + 
-							"<br/><span class=\"removes\">Removes image</span>" +
-							"</span>").insertAfter("#fileAdd");
+				if(reviewAttach[i].reviewSq == reviewList.reviewSq){
+					if(reviewAttach[i].fileGb == "I"){
+						$("<span class=\"pics\">" +
+								"<img class=\"picsThumbs\" src=\"" + reviewUrl + '/' + reviewAttach[i].sysFileNm + "\" />" +
+								"<input type='hidden' name='orgFileNmArr' value='"+reviewAttach[i].orgFileNm+"'>" +
+								"<input type='hidden' name='sysFileNmArr' value='"+reviewAttach[i].sysFileNm+"'>" +
+								"<br/><span class=\"removes\">Removes image</span>" +
+								"</span>").insertAfter("#fileAdd");
+					}else{
+						$("<span class=\"pics\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/' + attachList[i].kmcKey + "\" />" +
+								"<input type='hidden' name='kufKeyArr' value='" + attachList[i].kmcKey + "'>" + 
+								"<br/><span class=\"removes\">Removes image</span>" +
+								"</span>").insertAfter("#fileAdd");
+					}
 				}
+				
 			}
 			$(".removes").click(function(){
 				$(this).parent(".pics").remove();

src/main/webapp/WEB-INF/views/web/planning/PlanningShotGuideFormWeb.html

@@ -33,24 +33,24 @@
                         <h3>총알배송</h3>
                     </div>
 				</div>
-				<div class="cont_body" th:utext="${#strings.replace(#strings.replace(shotHtml.fsrcPc,'<','<'),'>','>')}">
-                     <div class="bulletship">
-                        <div class="bulletship_head">
+				<div class="cont_body">
+				    <div class="bulletship">
+						<div class="bulletship_head">
                             <img src="/images/pc/thumb/bullet_bg1.png" alt="10시까지 주문하면 당일도착">
                         </div>
                         <div class="bulletship_body" id="shotHtml">
                          			<!--   비로그인 상태 or 로그인을 했지만 주소정보를 못 가져오는 경우 -->
-                            <div class="txt_result">
+                       <!--     <div class="txt_result">
                                 <p>오전10시 이전 주문 당일도착</p>
                                 <p><span>총알배송이 가능한 지역</span>인지<br>확인해보세요!</p>
                                 <div class="bulletshop_btn">
                                     <button type="button" class="btn btn_default btn_block"><span>내 배송지 확인하기</span></button>
                                 </div>
-                                <p>서울&middot;경기&middot;인천 중 일부지역은 총알배송이 불가합니다.</p>
-                            </div>
+                                <p>서울·경기·인천 중 일부지역은 총알배송이 불가합니다.</p>
+                            </div> -->
                             		<!-- 비로그인 상태 or 로그인을 했지만 주소정보를 못 가져오는 경우 -->                      
                         </div>
-                        <div class="bulletship_foot">
+                        <div class="bulletship_foot"><div class="bulletship_foot"><br></div></div><div class="bulletship_foot"><br></div><div class="bulletship_foot">
                             <img src="/images/pc/thumb/bullet_bg2.png" alt="주문/도착, 배송일, 대상상품">
                         </div>
                     </div>