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

# Conflicts:
#	src/main/webapp/WEB-INF/views/order/OrderListForm.html

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

@@ -1048,11 +1048,13 @@ public class TsaShoplinkerService {
 
 		// 헤더 title 설정
 		String[] listTitles = { "제휴몰주문등록상태", "실패사유", "업로드실패사유", "스타일24 주문번호", "샵링커 주문번호", "쇼핑몰 주문번호", "쇼핑몰 명", "배송상태[발주확인]"
-				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가", "옵션코드", "옵션명", "주문수집일자", "제휴몰등록일"};
+				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가"
+				, "옵션코드", "옵션명", "옵션1", "옵션2", "교환접수여부", "주문수집일자", "제휴몰등록일", "등록자"};
 
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
 		String[] cellNames = {"UPLOAD_STAT", "UPLOAD_FAIL_CD", "UPLOAD_FAIL_REASON", "ORD_NO", "SHOPLINKER_ORDER_ID", "MALL_ORDER_ID", "MALL_NAME", "BAESONG_STATUS"
-				, "ORDER_PRODUCT_ID", "SHOPLINKER_PRODUCT_ID", "PARTNER_PRODUCT_ID", "PRODUCT_NAME", "QUANTITY", "ORDER_PRICE", "SALE_PRICE", "SUPPLY_PRICE", "SKU_MATCH_CODE", "SKU", "ORDER_REG_DATE", "EXTMALL_REG_DT"};
+				, "ORDER_PRODUCT_ID", "SHOPLINKER_PRODUCT_ID", "PARTNER_PRODUCT_ID", "PRODUCT_NAME", "QUANTITY", "ORDER_PRICE", "SALE_PRICE", "SUPPLY_PRICE"
+				, "SKU_MATCH_CODE", "SKU", "OPT_CD1", "OPT_CD2", "EXCHANGE_ORDER_YN", "ORDER_REG_DATE", "EXTMALL_REG_DT", "REG_NM"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
@@ -1064,7 +1066,9 @@ public class TsaShoplinkerService {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(),  GagaExcelConstants.CellType.CHAR_CENTER.name()};
+			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 		Collection<GagaMap> dataList = admShoplinkerDao.getOrderExcelList(shoplinkerOrder);
 

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

@@ -260,6 +260,7 @@ public class TsaOrderController extends TsaBaseController {
 				&& !TsaConstants.OrderDetailStat.PAYMENT_COMPLETE.value().equals(orderDetail.getOrdDtlStat())
 				&& !TsaConstants.OrderDetailStat.GOODS_PREPARE.value().equals(orderDetail.getOrdDtlStat())) {
 				allCanYn = "N";
+				break;
 			}
 		}
 

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

@@ -37,6 +37,7 @@ public class GoodsHst extends TscBaseDomain {
 	private String priceUpdDt;		//가격변경일시
 	private float dcRate;		//할인율
 	private String goodsStat;		//상품상태(공통코드G008)
+	private String selfMallYn;		//자사몰노출여부
 	private String dispYn;		//노출여부
 	private String goodsGb;		//해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다
 	private String foreignBuyYn;		//해외구매대행여부

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

@@ -592,9 +592,13 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, 'SYSTEM' AS REG_NM
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
-					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             <include refid="getSlkOrderListCondition_sql"/>
@@ -648,8 +652,14 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM 
-				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
+				TB_EXTMALL_ORDER_UPLOAD B 
+				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
@@ -740,9 +750,13 @@
 			, FN_GET_CODE_NM('G021', UPLOAD_STAT) AS UPLOAD_STAT_NM
 			, FN_GET_CODE_NM('G022', UPLOAD_FAIL_CD) AS UPLOAD_FAIL_NM
 			, FN_GET_CODE_NM('G003', A.VENDOR_ID) AS VENDOR_NM
+			, B.OPT_CD1
+			, B.OPT_CD2
 		FROM TB_EXTMALL_ORDER_UPLOAD A
+			INNER JOIN TB_OPTION B ON A.OPT_CD = B.OPT_CD
 		WHERE AGENT_ORDER_ID = #{agentOrderId}
-		AND A.UPLOAD_GB = 'S'
+		ORDER BY UPLOAD_STAT
+		LIMIT 1
 
 	</select>
 
@@ -792,15 +806,19 @@
 				, B.EXTMALL_NM
 				, B.AGENT_ORDER_ID
 				, B.EXTMALL_ORDER_ID
-				, IFNULL(B.UPLOAD_STAT, 'G021_50') AS UPLOAD_STAT
-				, B.UPLOAD_FAIL_CD
+				, FN_GET_CODE_NM('G021', IFNULL(B.UPLOAD_STAT, 'G021_50')) AS UPLOAD_STAT
+				, FN_GET_CODE_NM('G022', B.UPLOAD_FAIL_CD) AS UPLOAD_FAIL_CD
 				, B.UPLOAD_FAIL_REASON
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, 'SYSTEM' AS REG_NM
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
-					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             <include refid="getSlkOrderListCondition_sql"/>
@@ -848,14 +866,20 @@
 				, B.EXTMALL_NM
 				, B.AGENT_ORDER_ID
 				, B.EXTMALL_ORDER_ID
-				, IFNULL(B.UPLOAD_STAT, 'G021_50') AS UPLOAD_STAT
-				, B.UPLOAD_FAIL_CD
+				, FN_GET_CODE_NM('G021', IFNULL(B.UPLOAD_STAT, 'G021_50')) AS UPLOAD_STAT
+				, FN_GET_CODE_NM('G022', B.UPLOAD_FAIL_CD) AS UPLOAD_FAIL_CD
 				, B.UPLOAD_FAIL_REASON
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM 
-				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
+				TB_EXTMALL_ORDER_UPLOAD B 
+				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')

src/main/webapp/WEB-INF/views/customer/LmsPopupForm2.html

@@ -45,7 +45,9 @@
 						<tr>
 							<th>발신자번호<em class="required" title="필수"></em></th>
 							<td>
-								<input type="text" class="w150" name="callcenterTelNo" data-valid-name="발신자번호" readonly="readonly" th:value="${callBack}" maxlength="11" />
+								<input type="text" class="w150" name="callcenterTelNo" readonly="readonly" data-valid-name="발신자번호"  th:value="${callBack}" maxlength="11" />
+								<label class="rdoBtn"><input type="radio" name="selfYn" value="Y" checked="checked">자사몰 대표번호</label>
+								<label class="rdoBtn"><input type="radio" name="selfYn" value="N">제휴몰 대표번호</label>
 							</td>
 						</tr>
 						<tr>
@@ -53,8 +55,8 @@
 							<td>
 								<span name="topStr">[STYLE24]안녕하세요. 스타일24입니다.</span>
 								<textarea class="textareaR4"  style="resize: none;" name ="content" ></textarea>
-								스타일24 바로가기 : https://www.style24.com<br>
-								스타일24 고객센터 : 1544-5336<br>
+								<span name="topStr2">스타일24 바로가기 : https://www.style24.com <br>스타일24 고객센터 : 1544-5336<br></span> 
+								
 								<span name="count">0</span> / 2000 byte
 							</td>
 						</tr>
@@ -111,8 +113,6 @@
 			return;
 		}
 		
-
-		
 		mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
@@ -146,7 +146,22 @@
 			$('#lmsForm input[name=maskingCellPhnno]').val(mkCellPhno);
 		}
 	}
-
+	// 자사/입점 변경여부
+	$("#lmsForm input[name=selfYn]").bind('change', function () {
+		var selfYn = $(this).val();
+		if (selfYn == "Y"){
+			 $('#lmsForm input[name=callcenterTelNo]').val("1544-5336");
+			 $('#lmsForm span[name=topStr]').show();
+			 $('#lmsForm span[name=topStr2]').show();
+		}else{
+			 $('#lmsForm input[name=callcenterTelNo]').val("1644-5309");
+			 $('#lmsForm span[name=topStr]').hide();
+			 $('#lmsForm span[name=topStr2]').hide();
+		}
+		
+	});
+	
+	
 	$(document).ready(function() {
 		fnInitDataSet();
 	

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -198,6 +198,8 @@
 					<option value="100">100개씩 보기</option>
 					<option value="500">500개씩 보기</option>
 					<option value="1000">1000개씩 보기</option>
+					<option value="3000">3000개씩 보기</option>
+					<option value="5000">5000개씩 보기</option>
 				</select>
 				<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 			</li>

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

@@ -31,7 +31,7 @@
 
 				<div id="delvCdList">
 					<h4>배송정보</h4>
-					<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+					<div id="gridDelvCdList" style="width:100%; height: 66px;" class="ag-theme-balham"></div>
 				</div>
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">

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

@@ -278,9 +278,9 @@ var columnDefsGoodsInfo = [
 		headerName	: "주문상세정보",
 		children	: [
 			{headerName: "상세번호"	, field: "ordDtlNo"		, width: 80, cellClass: 'text-center'},
-			{headerName: "주문구분"	, field: "exchGbNm"		, width: 80, cellClass: 'text-center'},
+			{headerName: "주문구분"	, field: "exchGbNm"		, width: 70, cellClass: 'text-center'},
 			{
-				headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center', sortable: true,
+				headerName: "상품코드", field: "goodsCd", width: 110, cellClass: 'text-center', sortable: true,
 				cellRenderer: function (params) {
 					if (roleCd.indexOf("C") < 0) {
 						return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenGoodsDetailPopup('U','" + params.value + "');\">" + params.value + "</a>";
@@ -289,6 +289,7 @@ var columnDefsGoodsInfo = [
 					}
 				}
 			},
+			{headerName: "SKUCODE"	, field: "optCd"		, width: 100, cellClass: 'text-center'},
 			{
 				headerName		: "상품명"
 				, field			: "goodsNm"
@@ -298,7 +299,7 @@ var columnDefsGoodsInfo = [
 					return '<a href="javascript:void(0);" onclick="cfnOpenFrontGoodsPopup(\'' + params.data.goodsCd + '\',\'' + params.data.siteCd + '\');">' + params.value + '</a>';
 				}
 			},
-			{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 130, cellClass: 'text-center',
+			{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 80, cellClass: 'text-center',
 				cellRenderer: function (params) {
 					var option;
 					if (params.data.goodsType == 'G056_S') {
@@ -309,44 +310,14 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
-			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100, cellClass: 'text-center'},
-			{headerName: "옵션1"		, field: "colorNm"		, width: 80, cellClass: 'text-center'},
-			{headerName: "옵션2"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
-			{
-				headerName		: "정상가"
-				, field			: "listPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{
-				headerName		: "판매가"
-				, field			: "currPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{
-				headerName		: "옵션추가금액"
-				, field			: "optAddPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{headerName: "주문수량"	, field: "ordQty"		, width: 80, cellClass: 'text-center'},
-			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 80, cellClass: 'text-center'},
-			{headerName: "변경요청수량"	, field: "ordReqChgQty"	, width: 100, cellClass: 'text-center'},
-			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 120, cellClass: 'text-center', hide: true},
+			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
+			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
+			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 100, cellClass: 'text-center', hide: true},
 			{
 				headerName		: "주문상태"
 				, field			: "ordDtlStatNm"
-				, width			: 120
+				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					var retVal = "";
@@ -427,6 +398,36 @@ var columnDefsGoodsInfo = [
 					return retStr;
 				}
 			},
+			{
+				headerName		: "정상가"
+				, field			: "listPrice"
+				, width			: 80
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "판매가"
+				, field			: "currPrice"
+				, width			: 80
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "옵션금액"
+				, field			: "optAddPrice"
+				, width			: 70
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{headerName: "주문수량"	, field: "ordQty"		, width: 70, cellClass: 'text-center'},
+			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 70, cellClass: 'text-center'},
+			{headerName: "변경수량"	, field: "ordReqChgQty"	, width: 70, cellClass: 'text-center'},
 		],
 	},
 	{
@@ -718,7 +719,9 @@ var columnDefsPaymentInfo = [
 
 			return retStr;
 		}
+		, hide: true
 	},
+	{headerName: "승인번호"	, field: "pgTid"	, width: 150	, cellClass: 'text-center'},
 	{
 		headerName			: "결제일시"	
 		, field				: "payDt"

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

@@ -139,6 +139,8 @@
 								<option value="searchCustId">고객ID</option>
 								<option value="searchExtmallOrderId">외부몰주문번호</option>
 								<option value="searchAgentOrderId">에이전트주문번호</option>
+								<option value="searchExtmallOrderId">제휴몰주문번호</option>
+								<option value="searchAgentOrderId">샵링커주문번호</option>
 							</select>
 							<textarea class="textareaR3 w70p" name="condition" id="condition"></textarea>
 						</td>
@@ -377,6 +379,7 @@ var columnDefsOrderList = [
 	},
 	{headerName: "출고처"		, field: "delvLocNm"	, width: 110	, cellClass: 'text-center'	, sortable: true, hide:true},
 	{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "SKUCODE"	, field: "optCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},

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

@@ -359,9 +359,11 @@ var columnCancelReqList = [
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
-	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "상품코드"		, field: "goodsCd"			, width: 110	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션2"		, field: "optCd2"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"
 		, field			: "optAddPrice"

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -100,6 +100,7 @@
 							<!-- <button type="button" class="btn btn-primary btn-lg" id="btnInvoiceUpload">엑셀업로드</button> -->
 						</li>
 					</ul>
+					<p class="dot">'송장전송' 클릭 후 약 10분 후 확인해주세요.(실시간 확인가능/ 처리건 수가 많아질수록 소요시간 증가)</p>
 				</div>
 			</div>
 			<!-- 검색조건 영역 -->

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderDetailForm.html

@@ -21,162 +21,165 @@
 		</div>
 
 		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
-			<h4>샵링커 기본정보</h4>
-			<!-- TABLE -->
-			<table class="tableStyle">
-				<colgroup>
-					<col width="10%">
-					<col width="23%">
-					<col width="10%">
-					<col width="23%">
-					<col width="10%">
-					<col width="23%">
-				</colgroup>
-				<tbody>
-					<tr>
-						<th>주문수집차수</th>
-						<td class="aL padL10" th:text=" ${slkOrderInfo.orderIfIdx}"></td>
-						<th>샵링커주문번호</th>
-						<td class="aL padL10" th:text=" ${slkOrderInfo.shoplinkerOrderId}"></td>
-						<th>쇼핑몰주문번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallOrderId}"></td>
-					</tr>
-					<tr>
-						<th>쇼핑몰명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallName}"></td>
-						<th>배송상태[발주확인]</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongStatus}"></td>
-						<th>주문자명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderName}"></td>
-					</tr>
-					<tr>
-						<th>주문자전화번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderTel}"></td>
-						<th>주문자핸드폰번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderCel}"></td>
-						<th>주문자이메일주소</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderEmail}"></td>
-					</tr>
-					<tr>
-						<th>수취인명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receive}"></td>
-						<th>수취인전화번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveTel}"></td>
-						<th>수취인핸드폰번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveCel}"></td>
-					</tr>
-					<tr>
-						<th>수취인우편번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveZipcode}"></td>
-						<th>수취인주소</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveAddr}"></td>
-						<th>배송비결제방식</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongType}"></td>
-					</tr>
-					<tr>
-						<th>배송비</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongBi}"></td>
-						<th>배송메세지</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.deliveryMsg}"></td>
-						<th>주문상품번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderProductId}"></td>
-					</tr>
-					<tr>
-						<th>샵링커상품번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.shoplinkerProductId}"></td>
-						<th>자사상품코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.partnerProductId}"></td>
-						<th>상품명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.productName}"></td>
-					</tr>
-					<tr>
-						<th>주문수량</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.quantity}"></td>
-						<th>주문금액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.orderPrice, 0,'COMMA', 0,'POINT')}"></td>
-						<th>판매단가</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.salePrice, 0,'COMMA', 0,'POINT')}"></td>
-					</tr>
-					<tr>
-						<th>공급가</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.supplyPrice, 0,'COMMA', 0,'POINT')}"></td>
-						<th>옵션명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.sku}"></td>
-						<th>주문일자</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderdate}"></td>
-					</tr>
-					<tr>
-						<th>주문수집일자</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderRegDate}"></td>
-						<th>송장번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.deliveryInvoice}"></td>
-						<th>쇼핑몰계정</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.sellerId}"></td>
-					</tr>
-					<tr>
-						<th>필수옵션</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.onlySku}"></td>
-						<th>추가옵션</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.addSku}"></td>
-						<th>샵링커쇼핑몰코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallId}"></td>
-					</tr>
-					<tr>
-						<th>쇼핑몰부담할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceMall, 0,'COMMA', 0,'POINT')}"></td>
-						<th>판매자부담할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceSeller, 0,'COMMA', 0,'POINT')}"></td>
-						<th>쿠폰할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceCoupon, 0,'COMMA', 0,'POINT')}"></td>
-					</tr>
-					<tr>
-						<th>포인트할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPricePoint, 0,'COMMA', 0,'POINT')}"></td>
-						<th>물류배송여부</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.distributionDelivery}"></td>
-						<th>옵션매칭코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.skuMatchCode}"></td>
-					</tr>
-					<tr>
-						<th>옵션바코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.skuBarcode}"></td>
-						<th>개인고유통관번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderCustomsNumber}"></td>
-						<th>주문서타입</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderInputType}"></td>
-					</tr>
-					<tr>
-						<th>매입처아이디</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.supplyId}"></td>
-						<th>택배사코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.delivery}"></td>
-						<th>구매자계정</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderUserId}"></td>
-					</tr>
-					<tr>
-						<th>크로스픽주문</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.crspikUse}"></td>
-						<th>배송번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.shipNo}"></td>
-						<th>딜번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.dealNo}"></td>
-					</tr>
-					<tr>
-						<th>교환접수여부</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.exchangeOrderYn}"></td>
-						<th>추가상품</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderMainKey}"></td>
-						<th>네이버페이결제수단</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.panType}"></td>
-					</tr>
-					<tr>
-						<th>채널구분</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.channelType}"></td>
-						<th>배송예정일</th>
-						<td class="aL padL10" colspan="3" th:text="${slkOrderInfo.shipRsvDate}"></td>
-					</tr>
-				</tbody>
-			</table>
+			
+			<div th:if="${slkOrderInfo}">
+				<h4>샵링커 기본정보</h4>
+				<!-- TABLE -->
+				<table class="tableStyle">
+					<colgroup>
+						<col width="10%">
+						<col width="23%">
+						<col width="10%">
+						<col width="23%">
+						<col width="10%">
+						<col width="23%">
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>주문수집차수</th>
+							<td class="aL padL10" th:text=" ${slkOrderInfo.orderIfIdx}"></td>
+							<th>샵링커주문번호</th>
+							<td class="aL padL10" th:text=" ${slkOrderInfo.shoplinkerOrderId}"></td>
+							<th>쇼핑몰주문번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallOrderId}"></td>
+						</tr>
+						<tr>
+							<th>쇼핑몰명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallName}"></td>
+							<th>배송상태[발주확인]</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongStatus}"></td>
+							<th>주문자명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderName}"></td>
+						</tr>
+						<tr>
+							<th>주문자전화번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderTel}"></td>
+							<th>주문자핸드폰번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderCel}"></td>
+							<th>주문자이메일주소</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderEmail}"></td>
+						</tr>
+						<tr>
+							<th>수취인명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receive}"></td>
+							<th>수취인전화번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveTel}"></td>
+							<th>수취인핸드폰번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveCel}"></td>
+						</tr>
+						<tr>
+							<th>수취인우편번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveZipcode}"></td>
+							<th>수취인주소</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveAddr}"></td>
+							<th>배송비결제방식</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongType}"></td>
+						</tr>
+						<tr>
+							<th>배송비</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongBi}"></td>
+							<th>배송메세지</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.deliveryMsg}"></td>
+							<th>주문상품번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderProductId}"></td>
+						</tr>
+						<tr>
+							<th>샵링커상품번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.shoplinkerProductId}"></td>
+							<th>자사상품코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.partnerProductId}"></td>
+							<th>상품명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.productName}"></td>
+						</tr>
+						<tr>
+							<th>주문수량</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.quantity}"></td>
+							<th>주문금액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.orderPrice, 0,'COMMA', 0,'POINT')}"></td>
+							<th>판매단가</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.salePrice, 0,'COMMA', 0,'POINT')}"></td>
+						</tr>
+						<tr>
+							<th>공급가</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.supplyPrice, 0,'COMMA', 0,'POINT')}"></td>
+							<th>옵션명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.sku}"></td>
+							<th>주문일자</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderdate}"></td>
+						</tr>
+						<tr>
+							<th>주문수집일자</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderRegDate}"></td>
+							<th>송장번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.deliveryInvoice}"></td>
+							<th>쇼핑몰계정</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.sellerId}"></td>
+						</tr>
+						<tr>
+							<th>필수옵션</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.onlySku}"></td>
+							<th>추가옵션</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.addSku}"></td>
+							<th>샵링커쇼핑몰코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallId}"></td>
+						</tr>
+						<tr>
+							<th>쇼핑몰부담할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceMall, 0,'COMMA', 0,'POINT')}"></td>
+							<th>판매자부담할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceSeller, 0,'COMMA', 0,'POINT')}"></td>
+							<th>쿠폰할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceCoupon, 0,'COMMA', 0,'POINT')}"></td>
+						</tr>
+						<tr>
+							<th>포인트할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPricePoint, 0,'COMMA', 0,'POINT')}"></td>
+							<th>물류배송여부</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.distributionDelivery}"></td>
+							<th>옵션매칭코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.skuMatchCode}"></td>
+						</tr>
+						<tr>
+							<th>옵션바코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.skuBarcode}"></td>
+							<th>개인고유통관번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderCustomsNumber}"></td>
+							<th>주문서타입</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderInputType}"></td>
+						</tr>
+						<tr>
+							<th>매입처아이디</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.supplyId}"></td>
+							<th>택배사코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.delivery}"></td>
+							<th>구매자계정</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderUserId}"></td>
+						</tr>
+						<tr>
+							<th>크로스픽주문</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.crspikUse}"></td>
+							<th>배송번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.shipNo}"></td>
+							<th>딜번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.dealNo}"></td>
+						</tr>
+						<tr>
+							<th>교환접수여부</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.exchangeOrderYn}"></td>
+							<th>추가상품</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderMainKey}"></td>
+							<th>네이버페이결제수단</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.panType}"></td>
+						</tr>
+						<tr>
+							<th>채널구분</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.channelType}"></td>
+							<th>배송예정일</th>
+							<td class="aL padL10" colspan="3" th:text="${slkOrderInfo.shipRsvDate}"></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 			<!-- //TABLE -->
 			<br>
 
@@ -232,6 +235,15 @@
 							<th>옵션명</th>
 							<td class="aL padL10" th:text="${extOrderInfo.sku}"></td>
 						</tr>
+						<tr>
+							<th>옵션코드</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd}"></td>
+							<th>옵션1</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd1}"></td>
+							<th>옵션2</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd2}"></td>
+						</tr>
+						
 						<tr>
 							<th>현재판매가</th>
 							<td class="aL padL10" th:text="${#numbers.formatDecimal(extOrderInfo.currPrice, 0,'COMMA', 0,'POINT')}"></td>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -298,12 +298,16 @@
 		},
 		{headerName: "옵션코드", field: "skuMatchCode", width: 130, cellClass: 'text-center'},
 		{headerName: "옵션명", field: "sku", width: 130, cellClass: 'text-center'},
+		{headerName: "옵션1", field: "optCd1", width: 100, cellClass: 'text-center'},
+		{headerName: "옵션2", field: "optCd2", width: 100, cellClass: 'text-center'},
+		{headerName: "교환접수여부", field: "exchangeOrderYn", width: 100, cellClass: 'text-center'},
 		{headerName: "주문수집일자", field: "orderRegDate", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "제휴몰등록일", field: "extmallRegDt", width: 130, cellClass: 'text-center'}
+		{headerName: "제휴몰등록일", field: "extmallRegDt", width: 130, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNm", width: 80, cellClass: 'text-center'}
 	];
 
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -133,6 +133,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>

src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -136,6 +136,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -124,6 +124,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>