Merge remote-tracking branch 'origin/develop' into develop

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

@@ -1,26 +1,23 @@
 package com.style24.admin.biz.service;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.style24.admin.biz.dao.TsaCouponDao;
-import com.style24.admin.biz.dao.TsaMarketingDao;
-import com.style24.admin.support.security.session.TsaSession;
-import com.style24.core.biz.thirdparty.NaverLowestPriceApi;
-import com.style24.core.biz.thirdparty.SafetyKoreaApi;
-import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.persistence.domain.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.style24.admin.biz.dao.TsaCouponDao;
+import com.style24.admin.support.security.session.TsaSession;
+import com.style24.persistence.domain.Coupon;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 쿠폰 Service
  *
@@ -112,9 +109,6 @@ public class TsaCouponService {
 			e.printStackTrace();
 		}
 
-		params.setsup
-
-
 
 		return params;
 	}

style24.admin/src/main/webapp/WEB-INF/views/order/CancelRequestForm.html

@@ -26,13 +26,13 @@
 				<input type="hidden" name="chgReason" value=""/>
 				<input type="hidden" name="chgReasonDesc" value=""/>
 				
-				<h3>주문정보</h3>
+				<h4>주문정보</h4>
 				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
-				<h3>취소정보</h3>
+				<h4>취소정보</h4>
 				<div id="gridOrderCancelRequestToBeList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 				
-				<h3>배송비정보</h3>
+				<h4>배송비정보</h4>
 				<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
@@ -214,7 +214,7 @@ var columnCancelReqList = [
 				}
 			},
 			{
-				headerName		: "취소"		
+				headerName		: "취소/반품"		
 				, field			: "ordCanChgQty"			
 				, width			: 100		
 				, cellClass		: 'text-center'
@@ -484,7 +484,7 @@ var columnCancelReqToBeList = [
 				}
 			},
 			{
-				headerName		: "취소"		
+				headerName		: "취소/반품"		
 				, field			: "ordCanChgQty"			
 				, width			: 100		
 				, cellClass		: 'text-center'
@@ -881,13 +881,15 @@ var fnCalculateRefundAmt = function (obj) {
 			$("#spanTotRtnDelvFee").text(result.spanTotRtnDelvFee.addComma());		//반품 환불 배송 금액
 			$("#spanTotExcDelvFee").text(result.spanTotExcDelvFee.addComma());		//교환 환불 배송 금액
 			
-			// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
-			if (isCustomer) {
-				result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee;
-			} 
-			// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
-			else {
-				result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
+			if (result.spanRealCnclRtnAmt > 0) {
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if (isCustomer) {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee;
+				} 
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
+				}
 			}
 			
 			$("#spanRefundAmt").text(result.spanRefundAmt.addComma());				//환불 금액 합계

style24.admin/src/main/webapp/WEB-INF/views/order/ReturnRequestForm.html

@@ -26,19 +26,15 @@
 				<input type="hidden" name="chgReason" value=""/>
 				<input type="hidden" name="chgReasonDesc" value=""/>
 				
-				<h3>주문정보</h3>
+				<h4>주문정보</h4>
 				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
-				<h3>반품정보</h3>
+				<h4>반품정보</h4>
 				<div id="gridOrderCancelRequestToBeList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 				
-				<h3>배송비정보</h3>
+				<h4>배송비정보</h4>
 				<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
 				
-				<h3>회수지정보</h3>
-				<button type="button" style="margin-left:10px;" class="btn btnRight btn-base btn-sm off" id="btnUpdateOrderAddr">수정</button>
-				<div id="gridDelvRtnAddrInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
-				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" id="btnCancelRequestPartOk" onclick="fnCancelRequestPartOk();">요청</button>
 				</div>
@@ -129,6 +125,51 @@
 					</tbody>
 				</table>
 				
+				<h4>회수지 정보</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:160px;" />
+						<col style="width:320px;" />
+						<col style="width:160px;" />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>보내는사람 <i class="star"></i></th>
+							<td colspan="3"><input type="text" name ="chgerNm" class="" /></td>
+						</tr>
+						<tr>
+							<th>회수지주소 <i class="star"></i></th>
+							<td colspan="3">
+								<input type="text" name ="chgerPostNo" class="w100" readonly="readonly" />
+								<button type="button" class="btn btn-info" onclick="cfnOpenPostFindPopup('returnRequest');">우편번호찾기</button>
+								<input type="text" name ="chgerBaseAddr" class="w300" />
+								<input type="text" name ="chgerDtlAddr" class="w300" />
+							</td>
+						</tr>
+						<tr>
+							<th>일반전화</th>
+							<td>
+								<select name="chgerTelno1" class="w100">
+									<option value="">[선택하세요]</option>
+									<option th:if="${TelExcNoList}" th:each="oneData, status : ${TelExcNoList}" th:value="${oneData.cd}" th:text="${oneData.cd}"></option>
+								</select>
+								- <input type="text" name ="chgerTelno2" class="w60" value="0000" />
+								- <input type="text" name ="chgerTelno3" class="w60" value="0000" />
+							</td>
+							<th>휴대전화 <i class="star"></i></th>
+							<td>
+								<select name="chgerPhnno1" class="w100">
+									<option value="">[선택하세요]</option>
+									<option th:if="${PhnExcNoList}" th:each="oneData, status : ${PhnExcNoList}" th:value="${oneData.cd}" th:text="${oneData.cd}"></option>
+								</select>
+								- <input type="text" name ="chgerPhnno2" class="w60" value="0000" />
+								- <input type="text" name ="chgerPhnno3" class="w60" value="0000" />
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				
 				<div id="wrapRefundAccount" style="width:50%;">
 					<h4>환불계좌정보</h4>
 					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
@@ -147,7 +188,6 @@ var cancelRequestTargetList = [[${cancelRequestTargetList}]];				// 취소대상
 var ordNo 					= [[${ordNo}]];									// 주문번호
 var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
 var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
-var orderDelvRtnAddrInfo	= [[${orderDelvRtnAddrInfo}]];					// 주문배송정보
 
 var temp1 = true;
 var temp2 = false;
@@ -226,7 +266,7 @@ var columnCancelReqList = [
 				}
 			},
 			{
-				headerName		: "반품"		
+				headerName		: "취소/반품"		
 				, field			: "ordCanChgQty"			
 				, width			: 100		
 				, cellClass		: 'text-center'
@@ -519,7 +559,7 @@ var columnCancelReqToBeList = [
 				}
 			},
 			{
-				headerName		: "취소"		
+				headerName		: "취소/반품"		
 				, field			: "cnclRtnAmt"			
 				, width			: 80		
 				, cellClass		: 'text-right'
@@ -788,27 +828,6 @@ var columnDefsRefundAccountInfo = [
 ];
 
 var gridOptionsRefundAccountInfo = orderAgGrid.getGridOptions(columnDefsRefundAccountInfo);
-
-// 5 .배송정보(회수지)
-var columnDefsDeliveryInfo = [
-	{headerName: "배송지번호"		, field: "delvAddrSq"	, width: 100, cellClass: 'text-center'},
-	{headerName: "받는분"			, field: "recipNm"		, width: 80, cellClass: 'text-left', editable: true},
-	{headerName: "핸드폰번호"		, field: "recipPhnno"	, width: 120, cellClass: 'text-left', editable: true},
-	{headerName: "전화번호"		, field: "recipTelno"	, width: 120, cellClass: 'text-left', editable: true},
-	{
-		headerName		: "우편번호"		
-		, field			: "recipZipNo"
-		, width			: 200
-		, cellClass		: 'text-left'
-		, cellRenderer	: function (params) {
-			return params.value + "<button type=\"button\" style=\"margin-left:10px\" class=\"btn btn-info\" onclick=\"fnOpenDaumAddr('grid');\">우편번호찾기</button>";
-		}
-	},
-	{headerName: "주소(기본)"		, field: "recipBaseAddr"	, width: 350, cellClass: 'text-left'},
-	{headerName: "주소(상세)"		, field: "recipDtlAddr"		, width: 200, cellClass: 'text-left', editable: true},
-	{headerName: "배송메모"		, field: "delvMemo"			, width: 280, cellClass: 'text-left', editable: true, hide: true}
-];
-var gridOptionsDelvRtnInfo = orderAgGrid.getGridOptions(columnDefsDeliveryInfo);
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
@@ -913,14 +932,16 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			$("#spanTotRtnDelvFee").text(result.spanTotRtnDelvFee.addComma());		//반품 환불 배송 금액
 			$("#spanTotExcDelvFee").text(result.spanTotExcDelvFee.addComma());		//교환 환불 배송 금액
-						
-			// 고객사유 : 환불금액게산 = (취소금액 + 배송비) - 추가배송비 - 반품배송비
-			if (isCustomer) {
-				result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee - result.spanTotRtnDelvFee;
-			} 
-			// 회사사유 : 환불금액게산 = (취소금액 + 배송비)
-			else {
-				result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
+
+			if (result.spanRealCnclRtnAmt > 0) {
+				// 고객사유 : 환불금액게산 = (취소금액 + 배송비) - 추가배송비 - 반품배송비
+				if (isCustomer) {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee - result.spanTotRtnDelvFee;
+				} 
+				// 회사사유 : 환불금액게산 = (취소금액 + 배송비)
+				else {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
+				}
 			}
 			
 			$("#spanRefundAmt").text(result.spanRefundAmt.addComma());				//환불 금액 합계
@@ -1051,8 +1072,7 @@ var fnBindOrderRfAccountInfo = function () {
 	)
 };
 
-
-// DAUM을 이용한 우편번호 팝업 레이어 
+// 우편번호 DAUM을 이용한 우편번호 팝업 레이어
 var fnOpenDaumAddr = function() {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {
@@ -1080,9 +1100,6 @@ $(document).ready(function() {
 	
 	gagaAgGrid.createGrid('gridRefundAccountInfo'			, gridOptionsRefundAccountInfo);		// 환불계좌정보
 	
-	gagaAgGrid.createGrid('gridDelvRtnAddrInfo'				, gridOptionsDelvRtnInfo);				// 배송지정보
-	gridOptionsDelvRtnInfo.api.setRowData(orderDelvRtnAddrInfo);
-	
 	// 취소정보계산
 	fnCalculateRefundAmt(null);
 	

style24.scm/src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1205,7 +1205,7 @@ public class TssGoodsService {
 	private Goods createSelfGoodsInfo(GoodsMass goodsMass, String procJob) {
 
 		Goods goods = new Goods();
-		goods.setGoodsStat("40"); // 상품상태
+		goods.setGoodsStat("G008_40"); // 상품상태
 		goods.setGoodsRegMsg("승인대기");
 
 		// 품번정보 확인 (FRJ 는 11, 그외는 10)
@@ -1540,7 +1540,7 @@ public class TssGoodsService {
 			for (GoodsNotiInfo goodsNotiInfo : goodsNotiList) {
 				if ("Y".equals(goodsNotiInfo.getReqYn()) && StringUtils.isEmpty(goodsNotiInfo.getNiContent())) {
 					goods.setGoodsRegMsg("고시항목 오류");
-					goods.setGoodsStat("20");
+					goods.setGoodsStat("G008_20");
 					return goods;
 				}
 			}

style24.scm/src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -779,6 +779,21 @@ public class TssGoodsController extends TssBaseController {
 		return mav;
 	}
 
+	/**
+	 * 상품 대량등록 결과 조회
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 13
+	 */
+	@PostMapping("/reg/log/list")
+	@ResponseBody
+	public Collection<GoodsMass> getGoodsRegLogList(@RequestBody GoodsSearch goodsSearch) {
+		//return goodsService.getGoodsRegLogList(goodsSearch);
+		return null;
+	}
+
 	/**
 	 * 상품대량등록 엑셀 저장
 	 *

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -143,7 +143,7 @@
 		{headerName: "작업일시", field: "regDt", width: 150, cellClass: 'text-center'},
 		{headerName: "상품등록여부", field: "regSuccYn", width: 100, cellClass: 'text-center'},
 		{headerName: "등록결과메세지", field: "regFailRsn", width: 200, cellClass: 'text-left'},
-		{headerName: "등록브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
+		{headerName: "브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
 		{headerName: "업체코드", field: "supplyCompCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-left'},
@@ -151,27 +151,6 @@
 		{headerName: "검색어", field: "goodsSnm1", width: 150, cellClass: 'text-left'},
 		{headerName: "제조국", field: "makeNm", width: 100, cellClass: 'text-center'},
 		{headerName: "제조일", field: "makeYmd", width: 100, cellClass: 'text-center'},
-		{headerName: "이지미타입", field: "imgType", width: 100, cellClass: 'text-center'},
-		{headerName: "이미지경로1", field: "imgPath1", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로2", field: "imgPath2", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로3", field: "imgPath3", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로4", field: "imgPath4", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로5", field: "imgPath5", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로6", field: "imgPath6", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로7", field: "imgPath7", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로8", field: "imgPath8", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로9", field: "imgPath9", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로10", field: "imgPath10", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로11", field: "imgPath11", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로12", field: "imgPath12", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로13", field: "imgPath13", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로14", field: "imgPath14", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로15", field: "imgPath15", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로16", field: "imgPath16", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로17", field: "imgPath17", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로18", field: "imgPath18", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로19", field: "imgPath19", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로20", field: "imgPath20", width: 200, cellClass: 'text-left'},
 		{headerName: "고시분류코드", field: "niClsfCd", width: 200, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(niClsfCdList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(niClsfCdList, params.value); },
@@ -205,7 +184,6 @@
 		{headerName: "고시내용26", field: "niContent26", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용27", field: "niContent27", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'},
-		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
 		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
 		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
 		{headerName: "시즌", field: "seasonCd", width: 80, cellClass: 'text-center'},
@@ -233,30 +211,14 @@
 	
 	//자사상품대량등록 클릭시
 	$('#btnGoodsSelfCreate').on('click', function() {
-		cfnExcelUploadPopup('createSelfGoods', 'createSelfGoods');
+		cfnExcelUploadPopup('createGoods', 'createSelfGoods');
 	});
 	
-	var createSelfGoods = function(result){
-		var data = {procJob : result.procJob
-					,excelFileNm : result.excelFileNm
-					};
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/goods/mass/excelupload/create', jsonData, fnGoodsSelfCreateCallBack);
-	}
-	
-	var fnGoodsSelfCreateCallBack = function(result){
-		
-		var date = new Date();
-		$("#massForm input[name=stDate]").val(date.format("YYYY-MM-DD"));
-		$("#massForm input[name=edDate]").val(date.format("YYYY-MM-DD"));
-		fnGoodsListSearch();
-	}
-	
 	//입점상품대량등록 클릭시
 	$('#btnGoodsCreate').on('click', function() {
 		cfnExcelUploadPopup('createGoods', 'createGoods');
 	});
-	
+
 	var createGoods = function(result){
 		var data = {procJob : result.procJob
 					,excelFileNm : result.excelFileNm