메인전시 수정

src/main/java/com/style24/admin/biz/service/TsaDisplayService.java

@@ -573,25 +573,6 @@ public class TsaDisplayService {
 			}
 		}
 
-		for (Contents contents : contentsList){
-			log.info("getGoodsCdArr contents:::::{}",contents);
-			if(contents != null && contents.getGoodsCdArr() != null){
-				contents.setContentsSq(contents.getDispOrd());
-				contents.setRegNo(TsaSession.getInfo().getUserNo());
-				displayDao.deleteContentsGoodsTemp(contents);
-
-				if(contents.getGoodsCdArr().length>0){
-					for(int i=0; i<contents.getGoodsCdArr().length; i++){
-						contents.setGoodsCd(contents.getGoodsCdArr()[i]);
-						contents.setGoodsNm(contents.getGoodsNmArr()[i]);
-						contents.setImgPath1(contents.getGoodsImgArr()[i]);
-						displayDao.saveContentsGoodsTemp(contents);
-					}
-				}
-			}
-
-		}
-
 		int ind = 1;
 		for (Contents contents : contentsList) {
 			contents.setContentsSq(null);
@@ -616,8 +597,6 @@ public class TsaDisplayService {
 					contents.setBrandGroupImg("/contents/brand/" + yearMonth + "/" + newFilename);
 				}
 
-
-
 				int cnt = 1;
 				for (String newImgFile : contents.getNewImgFileArr()) {
 					//이미지 변경이 일어났을 경우
@@ -683,6 +662,23 @@ public class TsaDisplayService {
 				displayDao.saveContentsPreview(contents);
 			}
 		}
+
+		for (Contents contents1 : contentsList){
+			if(contents1 != null && contents1.getGoodsCdArr() != null){
+				contents1.setContentsSq(contents1.getDispOrd());
+				contents1.setRegNo(TsaSession.getInfo().getUserNo());
+				displayDao.deleteContentsGoodsTemp(contents1);
+
+				if(contents1.getGoodsCdArr().length>0){
+					for(int i=0; i<contents1.getGoodsCdArr().length; i++){
+						contents1.setGoodsCd(contents1.getGoodsCdArr()[i]);
+						contents1.setGoodsNm(contents1.getGoodsNmArr()[i]);
+						contents1.setImgPath1(contents1.getGoodsImgArr()[i]);
+						displayDao.saveContentsGoodsTemp(contents1);
+					}
+				}
+			}
+		}
 	}
 
 	/**

src/main/java/com/style24/admin/biz/web/TsaDisplayController.java

@@ -647,7 +647,6 @@ public class TsaDisplayController extends TsaBaseController {
 	@PostMapping("/contents/preview/save")
 	@ResponseBody
 	public GagaResponse saveContentsPreview(@RequestBody Collection<Contents> contentsList) {
-		log.info("saveContentsPreview:::{}",contentsList);
 		displayService.saveContentsPreview(contentsList);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
@@ -661,7 +660,6 @@ public class TsaDisplayController extends TsaBaseController {
 	@PostMapping("/contents/save")
 	@ResponseBody
 	public GagaResponse saveContents(@RequestBody Contents contents) {
-		log.info("controller saveContents contents::: {}",contents);
 		displayService.saveContents(contents);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

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

@@ -1381,8 +1381,10 @@
 		DELETE FROM TB_CONTENTS_PREVIEW
 		WHERE 	CATE_NO = #{cateNo}
 		AND 	CONTENTS_LOC = #{contentsLoc}
-		<if test="brandGroupNo != null and brandGroupNo !=''">
-			AND BRAND_GROUP_NO = #{brandGroupNo}
+		<if test="cateNo != null and cateNo !='' and cateNo == '1711'">
+			<if test="brandGroupNo != null and brandGroupNo !=''">
+				AND BRAND_GROUP_NO = #{brandGroupNo}
+			</if>
 		</if>
 	</delete>
 

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -701,7 +701,7 @@
 			});
 			dataArr = dataArrSort;
 		}
-
+		console.log(dataArr);
 		var jsonData = JSON.stringify(dataArr);
 		mcxDialog.confirm('컨텐츠를 저장 하시겠습니까?', {
 			cancelBtnText: "취소",

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -96,6 +96,8 @@
 			html += '<td class="aL">';
 			if(contentsLoc=='SMM007') {
 				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddPlanRow(\'#\',this);">기획전/배너추가</button>';
+				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
+				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddSubTextPopRow(this);">서브텍스트추가</button>';
 			}
 			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
 			html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
@@ -120,9 +122,17 @@
 				for (var j = 1; j < 8; j++) {
 					var imgPath = eval("result[" + i + "].imgPath" + j);
 					var strVar = eval("result[" + i + "].strVar" + j);
+					var strTitle = eval("result["+i+"].strTitle" + j);
+					var subText = eval("result["+i+"].subText" + j);
 					if (!gagajf.isNull(strVar) || !gagajf.isNull(imgPath)) {
 						html += fnAddPlanRow(strVar, imgPath);
 					}
+					if(strTitle!=null && strTitle!='null' && strTitle!='' ){
+						html += fnAddTitlePopRow(strTitle);
+					}
+					if(subText!=null && subText!='null' && subText!='' ){
+						html += fnAddSubTextPopRow(subText);
+					}
 				}
 			}
 			if(!gagajf.isNull(result[i].goodsCdList)){
@@ -213,6 +223,8 @@
 		html += '<td class="aL">';
 		if(contentsLoc=='SMM007') {
 			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddPlanRow(\'#\',this);">기획전/배너추가</button>';
+			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
+			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddSubTextPopRow(this);">서브텍스트추가</button>';
 		}
 		html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
@@ -378,6 +390,48 @@
 		);
 	}
 
+	/**
+	 * 타이틀추가
+	 */
+	var fnAddTitlePopRow = function (param){
+		var val = typeof param=='object'?'':param;
+		var html = '<tr name="titlePopRow">';
+		html += '<th>타이틀</th>';
+		html += '<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+val+'"/></td>';
+		html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
+		html += '</tr>';
+		if(typeof param == 'object'){
+			if($(param).closest("table").find("tbody").find("tr[name=titlePopRow]").length>3){
+				mcxDialog.alert("타이틀은 4개까지 등록 가능합니다");
+				return;
+			}
+			$(param).closest("table").find("tbody").append(html);
+		}else{
+			return html;
+		}
+	}
+
+	/**
+	 * 서브텍스트추가
+	 */
+	var fnAddSubTextPopRow = function (param){
+		var val = typeof param=='object'?'':param;
+		var html = '<tr name="subTextPopRow">'
+		html += '<th>서브텍스트</th>';
+		html += '<td><input type="text" name="subText" maxlength="200" value="'+val+'"/></td>';
+		html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
+		html += '</tr>';
+		if(typeof param == 'object'){
+			if($(param).closest("table").find("tbody").find("tr[name=subTextPopRow]").length>3){
+				mcxDialog.alert("서브텍스트는 4개까지 등록 가능합니다");
+				return;
+			}
+			$(param).closest("table").find("tbody").append(html);
+		}else{
+			return html;
+		}
+	}
+
 	// 컨텐츠 행삭제
 	var fnDeleteBrandRow = function (obj){
 		$(obj).closest("table").remove();
@@ -480,6 +534,18 @@
 				eval("strVar" + i + "='"+val+"'");
 				i++;
 			});
+			i = 1;
+			$(this).find('input[name=title]').each(function(){
+				var title = $(this).val().replace(/[\']/gi, "\\'");
+				eval("strTitle" + i + "='"+title+"'");
+				i++;
+			});
+			i = 1;
+			$(this).find('input[name=subText]').each(function(){
+				var subText = $(this).val().replace(/[\']/gi, "\\'");
+				eval("subText" + i + "='"+subText+"'");
+				i++;
+			});
 
 			$(this).find('input[name=goodsImgPath]').each(function(){
 				goodsImgArr.push($(this).val());
@@ -586,12 +652,13 @@
 			dataArr = dataArrSort;
 		}
 
+		console.log(dataArr);
 		var jsonData = JSON.stringify(dataArr);
 		mcxDialog.confirm('컨텐츠를 저장 하시겠습니까?', {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function(){
-				gagajf.ajaxJsonSubmit('/display/contents/preview/save', jsonData, fnGetMultiContentsPreviewList);
+			gagajf.ajaxJsonSubmit('/display/contents/preview/save', jsonData, fnGetMultiContentsPreviewList);
 			}
 		});
 	});