Merge branch 'develop' into bin2107

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

@@ -41,8 +41,21 @@ public class TsaSocialService {
 		social.setSocialSq(param.getSocialSq());
 		social.setUseYn(param.getUseYn());
 		social.setApplyGb(param.getApplyGb());
-		if(socialDao.getSocialGoOffCount(social) > 0) {
-			throw new IllegalStateException("진행중인 소셜(핫딜)이 있습니다.");
+		social.setFrontGb(param.getFrontGb());
+		
+		String applyGb = param.getApplyGb();
+		String useYn = param.getUseYn();
+		
+		// 적용상태로 저장을 할 경우
+		if (applyGb.equals("A") && useYn.equals("Y")) {
+			if(socialDao.getSocialGoOffCount(social) > 0) {
+				throw new IllegalStateException("진행중인 소셜(핫딜)이 있습니다.");
+			}
+		// 대기상태로 저장을 할 경우 
+		}else if(applyGb.equals("P") && useYn.equals("Y")) {
+			if(socialDao.getSocialGoOffCount(social) > 0) {
+				throw new IllegalStateException("선택하신 날짜에 대기중이거나 진행중인 소셜(핫딜)이 있습니다.");
+			}
 		}
 		Integer userNo = TsaSession.getInfo().getUserNo();
 		param.setRegNo(userNo);

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

@@ -131,6 +131,7 @@ public class Delivery extends TscBaseDomain {
 	private int currPrice;
 	private int saleAmt;
 	private int realOrdAmt;
+	private int stockQty;
 	
 	private Double delvFeeRate;
 	

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

@@ -326,10 +326,10 @@
 		</if>
 		<if test='termGb == "ordDt"'>
 		    <if test='stDate != null and stDate != ""'>
-		AND   A.REG_DT >= STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s')    
+		AND   A.ORD_DT >= STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s')    
 		    </if>
 		    <if test='edDate != null and edDate != ""'>
-		AND   A.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+		AND   A.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 		    </if>
 		</if>
 		<if test='termGb == "delvDt"'>
@@ -568,10 +568,10 @@
 						AND    'D' = #{delvGb} -- 배송지시
 						</if>
 						<if test="stDate != null and stDate != ''">
-						AND    O.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
 						</if>
 						<if test="edDate != null and edDate != ''">
-						AND    O.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 						</if>
 						<if test="siteCd != null and siteCd != ''">
 						AND    O.SITE_CD = #{siteCd}
@@ -657,10 +657,10 @@
 						AND    'D' = #{delvGb} -- 배송지시
 						</if>
 						<if test="stDate != null and stDate != ''">
-						AND    O.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
 						</if>
 						<if test="edDate != null and edDate != ''">
-						AND    O.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 						</if>
 						<if test="siteCd != null and siteCd != ''">
 						AND    O.SITE_CD = #{siteCd}

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

@@ -199,13 +199,21 @@
 	<!-- 진행중인 소셜 확인 -->
 	<select id="getSocialGoOffCount" parameterType="Social" resultType="int">
 		SELECT COUNT(*)
-		FROM tb_social A
+		FROM TB_SOCIAL A
 		WHERE 1=1
-			AND A.USE_YN = 'Y'
-			AND A.APPLY_GB = 'A'
-			AND A.SOCIAL_SQ != #{socialSq}
-			AND  (A.SOCIAL_STDT <![CDATA[ <= ]]>  DATE_FORMAT(DATE_ADD(#{socialStdt}, INTERVAL 0 DAY), '%Y%m%d%H%i%S')  
-			OR A.SOCIAL_EDDT <![CDATA[ >= ]]>  DATE_FORMAT(DATE_ADD(#{socialStdt}, INTERVAL 0 DAY), '%Y%m%d%H%i%S'))  
+		AND A.USE_YN = 'Y'
+		<if test='frontGb == "P"'> <!-- PC웹 -->
+		    AND A.FRONT_GB IN ('A','P')
+		</if>
+		<if test='frontGb == "A" or frontGb == "M"'> <!-- 모바일 -->
+		    AND A.FRONT_GB IN ('A','M')
+		</if> 
+		AND A.APPLY_GB IN ('A', #{applyGb})
+		<if test="socialSq != null and socialSq != ''">
+		AND A.SOCIAL_SQ != #{socialSq}
+		</if>
+		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
+		AND A.SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
 	</select>
 	
 	

src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -491,6 +491,8 @@
 		$('#detailForm input[name=noticeSq]').val('');
 		$('#detailForm input[name=noticeStdt]').val(_today);
 		$('#detailForm input[name=noticeEddt]').val(_today);
+		
+		gagaSn.setContents('#noticeContent', ''); 
 	});
 	
 	// 저장

src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -1370,7 +1370,8 @@
 			$("#planTemplateForm input[name=goodsTitle1]").val('');
 			$("#planTemplateForm input[name=goodsUrl1]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd1]").val('');
-			gridOptions_p1.api.updateRowData();
+			//gagaAgGrid.removeRowData(gridOptions_p1, false);
+			gridOptions_p1.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p1)});
 		}
 	}		
 	function btnDeleteGridNum2(param){
@@ -1385,7 +1386,7 @@
 			$("#planTemplateForm input[name=goodsTitle2]").val('');
 			$("#planTemplateForm input[name=goodsUrl2]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd2]").val('');
-			gridOptions_p2.api.updateRowData();
+			gridOptions_p2.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p2)});
 		}			
 	}			
 	function btnDeleteGridNum3(param){
@@ -1400,7 +1401,7 @@
 			$("#planTemplateForm input[name=goodsTitle3]").val('');
 			$("#planTemplateForm input[name=goodsUrl3]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd3]").val('');
-			gridOptions_p3.api.updateRowData();
+			gridOptions_p3.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p3)});
 		}			
 	}		
 	function btnDeleteGridNum4(param){
@@ -1415,7 +1416,7 @@
 			$("#planTemplateForm input[name=goodsTitle4]").val('');
 			$("#planTemplateForm input[name=goodsUrl4]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd4]").val('');
-			gridOptions_p4.api.updateRowData();
+			gridOptions_p4.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p4)});
 		}			
 	}
 	function btnDeleteGridNum5(param){
@@ -1430,7 +1431,7 @@
 			$("#planTemplateForm input[name=goodsTitle5]").val('');
 			$("#planTemplateForm input[name=goodsUrl5]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd5]").val('');
-			gridOptions_p5.api.updateRowData();
+			gridOptions_p5.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p5)});
 		}
 	} 
 	function btnDeleteGridNum6(param){
@@ -1445,7 +1446,7 @@
 			$("#planTemplateForm input[name=goodsTitle6]").val('');
 			$("#planTemplateForm input[name=goodsUrl6]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd6]").val('');
-			gridOptions_p6.api.updateRowData();
+			gridOptions_p6.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p6)});
 		}
 	} 
 	function btnDeleteGridNum7(param){
@@ -1460,7 +1461,7 @@
 			$("#planTemplateForm input[name=goodsTitle7]").val('');
 			$("#planTemplateForm input[name=goodsUrl7]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd7]").val('');
-			gridOptions_p7.api.updateRowData();
+			gridOptions_p7.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p7)});
 		}
 	} 
 	function btnDeleteGridNum8(param){
@@ -1475,7 +1476,7 @@
 			$("#planTemplateForm input[name=goodsTitle8]").val('');
 			$("#planTemplateForm input[name=goodsUrl8]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd8]").val('');
-			gridOptions_p8.api.updateRowData();
+			gridOptions_p8.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p8)});
 		}
 	} 
 	function btnDeleteGridNum9(param){
@@ -1490,7 +1491,7 @@
 			$("#planTemplateForm input[name=goodsTitle9]").val('');
 			$("#planTemplateForm input[name=goodsUrl9]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd9]").val('');
-			gridOptions_p9.api.updateRowData();
+			gridOptions_p9.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p9)});
 		}
 	} 
 	function btnDeleteGridNum10(param){
@@ -1505,7 +1506,7 @@
 			$("#planTemplateForm input[name=goodsTitle10]").val('');
 			$("#planTemplateForm input[name=goodsUrl10]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd10]").val('');
-			gridOptions_p10.api.updateRowData();
+			gridOptions_p10.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p10)});
 		}
 	} 	
 	
@@ -2246,8 +2247,7 @@ $(document).ready(function() {
 					$('#planTemplateForm input[name=goodsPlanContSq'+(i+1)+']').val(goodsList[i].planContSq);
 					$('#planTemplateForm input[name=goodsPlanContItemSq'+(i+1)+']').val(goodsList[i].planContItemSq);
 					
-					if (goodsList[i].title != '' || goodsList[i].linkUrl != ''){
-						console.log(goodsList[i].dispYn);
+					if (goodsList[i].title != '' || goodsList[i].linkUrl != '' ){
 						if (goodsList[i].dispYn == 'Y') {
 							$('#planTemplateForm input:checkbox[name=goodsDispYn'+(i+1)+']').prop('checked', true);
 						}else{
@@ -2268,47 +2268,49 @@ $(document).ready(function() {
 							$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="N"]').prop('checked', true);
 						}
 						$('#btnAddGridNum' + (i + 1)).show();
-						gridOptions_p1.api.setRowData(goodsDetailList1);
-						gridOptions_p2.api.setRowData(goodsDetailList2);
-						gridOptions_p3.api.setRowData(goodsDetailList3);
-						gridOptions_p4.api.setRowData(goodsDetailList4);
-						gridOptions_p5.api.setRowData(goodsDetailList5);
-						gridOptions_p6.api.setRowData(goodsDetailList6);
-						gridOptions_p7.api.setRowData(goodsDetailList7);
-						gridOptions_p8.api.setRowData(goodsDetailList8);
-						gridOptions_p9.api.setRowData(goodsDetailList9);
-						gridOptions_p10.api.setRowData(goodsDetailList10);
-					}else if(goodsDetailList1.length > 0){
+						
+					}
+					
+					if(goodsDetailList1.length > 0){
 						gridOptions_p1.api.setRowData(goodsDetailList1);
 						$('#btnAddGridNum1').show();
-					}else if(goodsDetailList2.length > 0){
+					}
+					if(goodsDetailList2.length > 0){
 						gridOptions_p2.api.setRowData(goodsDetailList2);
 						$('#btnAddGridNum2').show();
-					}else if(goodsDetailList3.length > 0){
+					}
+					if(goodsDetailList3.length > 0){
 						gridOptions_p3.api.setRowData(goodsDetailList3);
 						$('#btnAddGridNum3').show();
-					}else if(goodsDetailList4.length > 0){
+					}
+					if(goodsDetailList4.length > 0){
 						gridOptions_p4.api.setRowData(goodsDetailList4);
 						$('#btnAddGridNum4').show();
-					}else if(goodsDetailList5.length > 0){
+					}
+					if(goodsDetailList5.length > 0){
 						gridOptions_p5.api.setRowData(goodsDetailList5);
 						$('#btnAddGridNum5').show();
-					}else if(goodsDetailList6.length > 0){
+					}
+					if(goodsDetailList6.length > 0){
 						gridOptions_p6.api.setRowData(goodsDetailList6);
 						$('#btnAddGridNum6').show();
-					}else if(goodsDetailList7.length > 0){
+					}
+					if(goodsDetailList7.length > 0){
 						gridOptions_p7.api.setRowData(goodsDetailList7);
 						$('#btnAddGridNum7').show();
-					}else if(goodsDetailList8.length > 0){
+					}
+					if(goodsDetailList8.length > 0){
 						gridOptions_p8.api.setRowData(goodsDetailList8);
 						$('#btnAddGridNum8').show();
-					}else if(goodsDetailList9.length > 0){
+					}
+					if(goodsDetailList9.length > 0){
 						gridOptions_p9.api.setRowData(goodsDetailList9);
 						$('#btnAddGridNum9').show();
-					}else if(goodsDetailList10.length > 0){
+					}
+					if(goodsDetailList10.length > 0){
 						gridOptions_p10.api.setRowData(goodsDetailList10);
 						$('#btnAddGridNum10').show();
-					}
+					} 
 						
 				}
 			}

src/main/webapp/WEB-INF/views/marketing/SocialShoppingListForm.html

@@ -445,41 +445,13 @@
 			}
 		}
 		
-		$(formId + ' input[name=socialStdt]').val($(formId + ' input[name=stDate]').val() + ' ' + stTime);
-		$(formId + ' input[name=socialEddt]').val($(formId + ' input[name=edDate]').val() + ' ' + '23:59:59');
+		$(formId + ' input[name=socialStdt]').val($(formId + ' input[name=stDate]').val() + ' ' + stTime + ':00:00');
+		$(formId + ' input[name=socialEddt]').val($(formId + ' input[name=edDate]').val() + ' ' + edTime + ':59:59');
 		
 		//fnPlanCheck(planSq, msg);
 		fnSocialSave(msg);
 	}
-	
-	// 기획전 체크
-	/* var fnPlanCheck = function(planSq, msg) {
-		if (gagajf.isNull(planSq)) {
-			fnSocialSave(msg);
-			return;
-		}
-		
-		var params = new Object();
-		params.planSq = planSq;
-		var jsonData = JSON.stringify(params);
-		
-		gagajf.ajaxJsonSubmit('marketing/social/list', jsonData, function(result) {
-			if (result.length > 0) {
-				
-				var checkFlag = false;
-				var socialSq = $('#detailForm input[name=socialSq]').val();
-				$(result).each(function(idx, data) {
-					if (data.socialSq != socialSq) checkFlag = true;
-				});
-				
-				if (checkFlag) {
-					mcxDialog.alert('선택한 기획전은 이미 다른 소셜에 적용되어있습니다.');
-					return;
-				}
-			} 
-			fnSocialSave(msg);
-		});
-	} */
+
 	
 	// 소셜 저장
 	var fnSocialSave = function(msg) {

src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -108,7 +108,7 @@
 			</div>
 		</div>
 
-		<div class="panelStyle">
+		<!--<div class="panelStyle">
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF020');">입점송장번호등록다운로드</button>
@@ -123,7 +123,7 @@
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridList" style="width: 100%; height: 600px;" class="ag-theme-balham lh30"></div>
 			</div>
-		</div>
+		</div>-->
 		
 		<!-- //리스트 영역 -->
 		<label class="off">
@@ -169,19 +169,14 @@ var columnDefs = [
 	{headerName: "수령자상세주소",		field:"recipDtlAddr",		width:120, cellClass: 'text-center'},
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-	{headerName: "상품명",				field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "사이즈",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
+	{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
+	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
 	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
 	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",			field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
-		, editable 			: true
-		, cellEditor		: 'agRichSelectCellEditor'
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
-		, cellEditorParams	: {
-			values: gagaAgGrid.extractValues(shipCompanyList)
-		}
 		, valueFormatter: function (params) {
 			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
 		}
@@ -189,8 +184,7 @@ var columnDefs = [
 			return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
 		}
 	},
-	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left', editable : true
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}	}
+	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left'}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);