Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

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

@@ -423,6 +423,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("delvFeeCd"					, order.getDelvFeeCd());										// 배송정책코드
 		mav.addObject("delvFeeCdGrp"				, order.getDelvFeeCdGrp());										// 배송정책그룹코드
 		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);										// 변경신청목록 (취소/반품/교환)
+		mav.addObject("rtnLocInfo"					, coreOrderChangeService.getRtnLocInfo(order));					// 반송지주소정보
 		mav.addObject("orderDelvRtnAddrInfo"		, coreOrderService.getDeliveryAddrList(order));					// 배송정보
 		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));				// 전화번호국번
 		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));				// (휴대전화)번호국번
@@ -758,8 +759,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);										// 교환요청대상 목록
 		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);										// 변경신청목록 (취소/반품/교환)
 		mav.addObject("orderInfoList"				, orderInfoList);												// 주문정보
+		mav.addObject("rtnLocInfo"					, coreOrderChangeService.getRtnLocInfo(order));					// 반송지주소정보
 		mav.addObject("ordNo"						, order.getOrdNo());											// 주문번호
 		mav.addObject("ordChgSq"					, order.getOrdChgSq());											// 주문변경번호
+		mav.addObject("delvFeeCd"					, order.getDelvFeeCd());										// 배송정책코드
+		mav.addObject("delvFeeCdGrp"				, order.getDelvFeeCdGrp());										// 배송정책그룹코드
 		mav.addObject("orderDelvAddrInfo"			, coreOrderService.getDeliveryAddrList(order));					// 배송정보
 		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));				// 전화번호국번
 		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));				// (휴대전화)번호국번

src/main/resources/config/application-locd.yml

@@ -22,6 +22,7 @@ domain:
     batch: //ldbatch.style24.com
     image: //ldimage.style24.com
     uximage: //ldadmin.style24.com
+    scm: //ldscm.style24.com
 
 upload:
     dext.target.path: /WIDE/workspace/files/data/style24/dext

src/main/resources/config/application-style.yml

@@ -34,6 +34,7 @@ domain:
     batch: //batch.style24.com
     image: //image.istyle24.com/Upload
     uximage: //bos.style24.com
+    scm: //scm.style24.com
 
 upload:
     dext.target.path: /files/data/style24/dext

src/main/resources/config/application-tsit.yml

@@ -24,6 +24,7 @@ domain:
 #    cdnimage: //tdimage.style24.com
     cdnimage: //ts5000.ipdisk.co.kr:8999
     uximage: //tdadmin.style24.com
+    scm: //tdscm.style24.com
 
 upload:
     dext.target.path: /TSIT/servers/files/data/style24/dext

src/main/resources/config/application.yml

@@ -12,6 +12,8 @@ spring:
             max-file-size: 30MB
             max-request-size: 30MB
 
+server.site.name: bos
+
 server.error.whitelabel.enabled: false
 
 # Instagram

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

@@ -680,6 +680,7 @@
 				if(eval("gridListValue[j]." + key) == eval("result[i]." + key)) {	addChk = false;	}		// 중복체크
 			}
 
+			// 딜상품은 추가 불가. 구성상품으로 추가할것.
 			if(key == "goodsCd" && result[i].goodsType == "G056_D") {
 				if(dealCntString == "") {
 					dealCntString = "<br/>딜 상품은 추가 될 수 없습니다. 구성상품으로 등록해주세요.";

src/main/webapp/WEB-INF/views/ocm/ExtmallOrderRegisterForm.html

@@ -67,7 +67,21 @@
 		{headerName: "업로드상태",			field: "uploadStatNm",			width: 150, cellClass: 'text-center'},
 		{headerName: "업로드실패사유",		field: "uploadFailNm",			width: 150, cellClass: 'text-center'},
 		{headerName: "업로드실패사유상세",	field: "uploadFailReason",		width: 200, cellClass: 'text-center'},
-		{headerName: "주문번호",			field: "ordNo",					width: 130, cellClass: 'text-center'},
+		{
+			headerName		: "주문번호"
+			, field			: 'ordNo'
+			, width			: 130
+			, cellClass		: 'text-center'
+			, sortable		: true
+			, cellRenderer	: function (params) {
+				var roleCd = [[${sessionInfo.roleCd}]];
+				if (!roleCd.startsWith("C") && "" != params.value) {
+					return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
+				} else {
+					return params.value;
+				}
+			}
+		},
 		{headerName: "제휴몰ID",			field: "extmallId",				width: 130, cellClass: 'text-center'},
 		{headerName: "제휴몰명",			field: "extmallNm",				width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호",		field: "extmallOrderId",		width: 150, cellClass: 'text-center'},
@@ -184,6 +198,10 @@
 		gridOptions.columnApi.setColumnsVisible(['uploadStatNm','uploadFailNm','uploadFailReason','ordAmt','ordNo'], false);
 	}
 
+	var fnOpenOrderDetailPopup = function (ordNo) {
+		currOrdNo = ordNo;
+		cfnOpenOrderDetailPopup(ordNo);
+	};
 /*]]>*/
 </script>
 

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

@@ -29,8 +29,10 @@
 				<h4>주문정보</h4>
 				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
-				<h4>배송정보</h4>
-				<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+				<div id="delvCdList">
+					<h4>배송정보</h4>
+					<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+				</div>
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" th:unless="${ordChgSq > 0}" id="fnExchangeRequestSubmit" onclick="fnExchange()">교환요청</button>
@@ -203,8 +205,10 @@ var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
 var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
 var orderDelvAddrInfo		= [[${orderDelvAddrInfo}]];						// 회수지정보
 var recallExceptionInfo		= [[${recallExceptionInfo}]];					// 회수 예외 정보
+var rtnLocInfo				= [[${rtnLocInfo}]];							// 반송지주소정보
+var addPayCost				= 0;											// 추가배송비
 var addDelvFee				= 0;											// 추가배송비
-var addDelvFeeList			= [];											// 추가배송비정보
+//var addDelvFeeList			= [];											// 추가배송비정보
 var exchangeRequestList		= [];											// 교환요청목록
 var exchangeInfoList;														// 교환정보
 var wdGb;																	// 회수방법
@@ -237,6 +241,7 @@ if (ordChgSq > 0) {
 		wdGb				= exchangeInfoList[0].wdGb;					// 회수방법
 		chgOrdDtlStat		= exchangeInfoList[0].ordDtlStat;			// 교환상품상세상태값
 		delvAddrSq			= exchangeInfoList[0].delvAddrSq;			// 교환상품배송지일련번호
+		addPayCost			= exchangeInfoList[0].addPayCost;			// 추가배송비
 	}
 }
 
@@ -620,7 +625,7 @@ var fnChangeChgReason = function(reasonCd){
 	} else {
 		$("#imputeReason").text("회사");
 		
-		if (ordChgSq == null || ordChgSq <= 0) {
+		if (selfGoodsYn == 'Y' && (ordChgSq == null || ordChgSq <= 0)) {
 			$('#wdBfSendYn').attr('disabled', false);
 		}
 	}
@@ -981,7 +986,7 @@ var fnChangeOption = function(param) {
 			item.ordChgOpt = optCd2;
 		}
 	});
-	
+
 	gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 }
 
@@ -1044,16 +1049,21 @@ var fnAddDelvFee = function (exchangeRequestTargetList) {
 	});
 
 	addDelvFee = delvFee;
-	addDelvFeeList = delvFeeList;
+	//addDelvFeeList = delvFeeList;
 
 	// 회수방법 > 직접발송일 경우 그리드 표시
-	if ($('#wdGb:checked').val() == 'D') {
-		gridOptionsDelvCdList.api.setRowData(addDelvFeeList);
+	// 2021.07.19 그리드 표시 여부 처리 변경
+	//if ($('#wdGb:checked').val() == 'D') {
+	//	gridOptionsDelvCdList.api.setRowData(addDelvFeeList);
+	//} else {
+	//	gridOptionsDelvCdList.api.setRowData();
+	//}
+	
+	if (ordChgSq > 0) {
+		$('#addDelvFee').text(addPayCost.addComma() + '원');
 	} else {
-		gridOptionsDelvCdList.api.setRowData();
+		$('#addDelvFee').text(addDelvFee.addComma() + '원');
 	}
-	
-	$('#addDelvFee').text(addDelvFee.addComma() + '원');
 }
 
 // 회수방법 라디오 클릭 이벤트
@@ -1063,8 +1073,10 @@ var fnChangeWdGb = function(param) {
 	// 회수지정보 히든 처리
 	if (wdGb == 'D') {
 		$('.chger').css('display', 'none');
+		$('#delvCdList').css('display', '');
 	} else {
 		$('.chger').css('display', '');
+		$('#delvCdList').css('display', 'none');
 	}
 
 	// 추가배송비 계산
@@ -1192,8 +1204,10 @@ $(document).ready(function() {
 	// 1. 그리드생성
 	gagaAgGrid.createGrid('gridOrderCancelRequestList'		, gridOptionsExchangeReqList);			// 주문정보
 	gagaAgGrid.createGrid('gridDelvCdList'					, gridOptionsDelvCdList);				// 배송정보
+
 	gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
-	
+	gridOptionsDelvCdList.api.setRowData(rtnLocInfo);
+
 	// 2.1 TOTAL ROWS 없애기
 	gagaAgGrid.hideStatusBar('gridOrderCancelRequestList');
 	gagaAgGrid.hideStatusBar('gridOrderCancelRequestToBeList');
@@ -1204,12 +1218,13 @@ $(document).ready(function() {
 	
 	// 4. 교환지정보설정
 	fnSetExchangeAddr();
-	
+
 	// 5. 회수방법 라디오 체크 처리
 	if (ordChgGb == 'G681_50') {
 		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 		$('.chger').css('display', 'none');
 		$('input:radio[name=wdGb]').attr('disabled', true);
+		$('#delvCdList').css('display', 'none');
 	}
 	// 2021.07.15 입점업체인 경우에는 회수요청만 해당
 	else if (selfGoodsYn == "N") {
@@ -1217,11 +1232,13 @@ $(document).ready(function() {
 		$('.chger').css('display', 'none');
 		$('input:radio[name=wdGb]').attr('disabled', true);
 	} else {
+		alert(wdGb);
 		if (wdGb == 'D') {
 			$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 			$('.chger').css('display', 'none');
 		} else {
 			$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+			$('#delvCdList').css('display', 'none');
 		}
 	}
 

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

@@ -248,6 +248,7 @@ var recallExceptionInfo		= [[${recallExceptionInfo}]];					// 회수 예외 정
 var payGb 					= orderInfoList[0].payGb;						// 결제수단
 var payMeans 				= orderInfoList[0].payMeans;					// 결제방법
 var pgGb					= orderInfoList[0].pgGb;						// PG구분
+var selfGoodsYn 			= cancelRequestTargetList[0].selfGoodsYn;		// 자사,입점여부
 var chgReason				= "";											// 변경사유코드
 var chgMemo					= "";											// 변경사유메모
 var wdGb					= "";											// 회수방법