Pārlūkot izejas kodu

2/10 임시커밋

ChoiSooHwan 5 gadi atpakaļ
vecāks
revīzija
38a929218b

+ 9 - 2
src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -1034,8 +1034,15 @@ public class TsaMarketingController extends TsaBaseController {
 		
 		result = mailTemplateService.saveMktMailTemplate(mktmailManagement);
 			
-		log.info("mktmailManagement >>> {}", mktmailManagement);
-		
+		log.info("mktmailManagement : {}", mktmailManagement);
+		for(int i = 0; i < mktmailManagement.getMktmailManagementGoods().size();i++) {
+			
+			log.info("mktmailManagement.getMktmailManagementGoods() " + mktmailManagement.getMktmailManagementGoods().get(i).toString());
+			log.info("mktmailManagement.getMktmailManagementGoods2() " + mktmailManagement.getMktmailManagementGoods2().get(i).toString());
+			log.info("mktmailManagement.getMktmailManagementGoods3() " + mktmailManagement.getMktmailManagementGoods3().get(i).toString());
+			log.info("mktmailManagement.getMktmailManagementGoods4() " + mktmailManagement.getMktmailManagementGoods4().get(i).toString());
+			log.info("mktmailManagement.getMktmailManagementGoods5() " + mktmailManagement.getMktmailManagementGoods5().get(i).toString());
+		}
 		return result;
 	}
 

+ 9 - 4
src/main/java/com/style24/persistence/domain/MktmailManagement.java

@@ -31,17 +31,21 @@ public class MktmailManagement extends TscBaseDomain{
 	private String searchTxt;				// 검색어
 	
 	List<MktmailManagementGoods> mktmailManagementGoods; //메일 전시
+	List<MktmailManagementGoods> mktmailManagementGoods2; //메일 전시
+	List<MktmailManagementGoods> mktmailManagementGoods3; //메일 전시
+	List<MktmailManagementGoods> mktmailManagementGoods4; //메일 전시
+	List<MktmailManagementGoods> mktmailManagementGoods5; //메일 전시
+	
+	List<MktmailManagementTc> mktmailManagementTc; //메일템플릿 구분자
+	// 메일 템플릿 코너 
 	// 메일 템플릿 코너 
 	private Integer mailtcSq;				// 메일템플릿 코너번호
 	private String mailtcNm;				// 메일템플릿 코너명
 	private Integer goodsCpr;				// 상품 노출건수
 	private String mailtcLink;				// 메일템플릿 코너 링크
-	
 
-	private String goodsCd;					// 상품코드(상품)
-	private Integer dispOrd;				// 표시순서
 	
-	List<MktmailManagementTc> mktmailManagementTc; //메일템플릿 구분자
+
 	//상품정보
 	private String brandKnm;				// 브랜드명
 	private String goodNms;					// 상품명
@@ -49,6 +53,7 @@ public class MktmailManagement extends TscBaseDomain{
 	private String listPrice;				// 정상가
 	private String currPrice;				// 판매가
 
+
 	
 
 	

+ 80 - 52
src/main/webapp/WEB-INF/views/marketing/MktmailmanagementDetailForm.html

@@ -96,7 +96,7 @@
 						</li>
 					</ul>
 						<!-- 구분 1 -->
-						<div class="inner-panelContent" id="btnAddGridNum">
+						<div class="inner-panelContent" id="btnAddGridNum" style="display:none;">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -132,11 +132,11 @@
 															</div>
 														</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr"/>1개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name="goodsCpr"/>4개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr"/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -176,23 +176,23 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name="" placeholder="자동생성" readonly="readonly"/>
+															<input type="text" name="mailtcNm"/>
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name=""/>								
+															<input type="text" name="mailtcLink"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name=""/>1개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name=""/>4개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -232,23 +232,23 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name="" placeholder="자동생성" readonly="readonly"/>								
+															<input type="text" name="mailtcNm"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name=""/>								
+															<input type="text" name="mailtcLink"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name=""/>1개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name=""/>4개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -288,23 +288,23 @@
 													<tr>
 														<th class="w100">번호</th>
 														<td>
-															<input type="text" name="" placeholder="자동생성" readonly="readonly"/>								
+															<input type="text" name="mailtcNm"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name=""/>								
+															<input type="text" name="mailtcLink"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name=""/>1개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name=""/>4개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -344,7 +344,7 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name="" placeholder="자동생성" readonly="readonly"/>								
+															<input type="text" name=""/>								
 														</td>
 													</tr>
 													<tr>
@@ -356,11 +356,11 @@
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name=""/>1개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name=""/>4개</label>
-															<label class="rdoBtn"><input type="radio" name=""/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -432,6 +432,24 @@
 			{headerName: "순번", field: "dispOrd" , width: 120, cellClass: 'text-center'}
 		]
 		
+		// Add on options
+		var gridOptions_c1 = gagaAgGrid.getGridOptions(columnDefs);
+		var gridOptions_c2 = gagaAgGrid.getGridOptions(columnDefs);
+		var gridOptions_c3 = gagaAgGrid.getGridOptions(columnDefs);
+		var gridOptions_c4 = gagaAgGrid.getGridOptions(columnDefs);
+		var gridOptions_c5 = gagaAgGrid.getGridOptions(columnDefs);
+		
+		// 표시순번 수정가능
+		gridOptions_c1.defaultColDef.editable = true;
+		gridOptions_c2.defaultColDef.editable = true;
+		gridOptions_c3.defaultColDef.editable = true;
+		gridOptions_c4.defaultColDef.editable = true;
+		gridOptions_c5.defaultColDef.editable = true;
+		gridOptions_c1.suppressRowClickSelection = true;
+		gridOptions_c2.suppressRowClickSelection = true;
+		gridOptions_c3.suppressRowClickSelection = true;
+		gridOptions_c4.suppressRowClickSelection = true;
+		gridOptions_c5.suppressRowClickSelection = true;
 		
 		///저장
 		$('#btnSaveMktMail').on('click', function() {
@@ -444,24 +462,45 @@
 				return false;
 			}
 			
+			let arrayData = gagaAgGrid.getAllRowData(gridOptions_c1)
+			let arrayData2 = gagaAgGrid.getAllRowData(gridOptions_c2)
+			let arrayData3 = gagaAgGrid.getAllRowData(gridOptions_c3)
+			let arrayData4 = gagaAgGrid.getAllRowData(gridOptions_c4)
+			let arrayData5 = gagaAgGrid.getAllRowData(gridOptions_c5)
+			
+			let arrayDataTc = $('#btnAddGridNum input[name=mailtcNm]').val();
+			
+			
 			mcxDialog.confirm("내용을 등록 하시겠습니까?", {
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					let data = {};
+					
+					let data = {
+					};
+
+// 					data.mktmailManagementTc = $('#btnAddGridNum input[name=mailtcLink]').val();
+// 					data.mktmailManagementTc = $('#btnAddGridNum input[name=goodsCpr]').val();
+
+					data.mktmailManagementTc = arrayDataTc;
+					console.log(data);
+					alert(1);
+					data.mktmailManagementGoods = arrayData;
+					data.mktmailManagementGoods2 = arrayData2;
+					data.mktmailManagementGoods3 = arrayData3;
+					data.mktmailManagementGoods4 = arrayData4;
+					data.mktmailManagementGoods5 = arrayData5;
+// 					data.mailtcNm = $('#mailManagementForm input[name=mailtcNm]').val(),
+// 					data.mailtcLink = $('#mailManagementForm input[name=mailtcLink]').val(),
+// 					data.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr]').val()
+
 					data.mktHeader = $('#mailManagementForm select[name=mailHsq]').val();
 					data.mktFooter = $('#mailManagementForm select[name=mailFsq]').val();
 					data.mailtNm = $('#mailManagementForm input[name=mailtNm]').val();
 					data.mailContent = $('#mailManagementForm textarea[name=mailContent]').val();
 					
-					data.gridOptions_c1 = gagaAgGrid.selectedRowData(gridOptions_c1);
-					data.gridOptions_c2 = gagaAgGrid.selectedRowData(gridOptions_c2);
-					data.gridOptions_c3 = gagaAgGrid.selectedRowData(gridOptions_c3);
-					data.gridOptions_c4 = gagaAgGrid.selectedRowData(gridOptions_c4);
-					data.gridOptions_c5 = gagaAgGrid.selectedRowData(gridOptions_c5);
-					
 					let jsonData = JSON.stringify(data);
-					console.log(data);
+					console.log(jsonData);
 					
 					gagajf.ajaxJsonSubmit($('#mailManagementForm').prop('action'), jsonData, function(data){
 						uifnPopupClose('popupMktMail');
@@ -492,17 +531,6 @@
 			}
 		});
 		
-		// Add on options
-		var gridOptions_c1 = gagaAgGrid.getGridOptions(columnDefs);
-		var gridOptions_c2 = gagaAgGrid.getGridOptions(columnDefs);
-		var gridOptions_c3 = gagaAgGrid.getGridOptions(columnDefs);
-		var gridOptions_c4 = gagaAgGrid.getGridOptions(columnDefs);
-		var gridOptions_c5 = gagaAgGrid.getGridOptions(columnDefs);
-		
-		// 표시순번 수정가능
-		gridOptions_c1.defaultColDef.editable = true;
-		gridOptions_c1.suppressRowClickSelection = true;
-		
 		// 버튼별 상품추가 팝업
 		var fnOpenGoodsPopup = function(param) {
 			switch (param){