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

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

@@ -73,6 +73,7 @@ public class WithdrawExc extends TscBaseDomain {
 	private String wdBfSendYn;
 	private String Ifstat;
 	private String newOrdChgSqYn;
+	private String mallGb;
 	
 	private int chargeAmount;          // 요금총액
 	private int exceptionQty;          // 수량

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

@@ -928,6 +928,23 @@
 	              </when>
 	            </choose>
 	        </if>
+	        
+	        <if test='conditionOne != null'>
+	            <choose>
+	              <when test='searchOne != null and searchOne == "mallOrderId"'>
+	                AND UPPER(IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID)) like CONCAT('%',UPPER(#{conditionOne}),'%')
+	                
+	              </when>
+
+	              <when test='searchOne != null and searchOne == "orderName"'>
+	              	AND UPPER(IFNULL(A.ORDER_NAME, B.ORD_NM)) like CONCAT('%',UPPER(#{conditionOne}),'%')
+	              </when>
+
+	              <when test='searchOne != null and searchOne == "orderCel"'>
+	              	AND replace(IFNULL(A.ORDER_CEL, B.ORD_TELNO), '-', '') like CONCAT('%',replace(#{conditionOne}, '-', ''),'%')
+	              </when>
+	            </choose>
+	        </if>
 	</sql>
 
 	<!-- 송장전송-전송 목록 건수 cnt -->

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

@@ -261,8 +261,10 @@ var columnCnclRtnCompleteList = [
 	{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
+	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, 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			: "ordQty"

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

@@ -356,8 +356,10 @@ var columnCancelReqList = [
 	{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: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"		
 		, field			: "optAddPrice"			

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

@@ -361,9 +361,9 @@ var columnCancelReqList = [
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{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: "goodsTypeNm"		, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, 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/ShoplinkerOrderForm.html

@@ -111,7 +111,7 @@
 					</tr>
 					<tr>
 						<th>벤더/제휴몰</th>
-						<td colspan="4">
+						<td>
 							<select name="vendorId" required="required" data-valid-name="벤더">
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>/
@@ -120,6 +120,15 @@
 								<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
 							</select>
 						</td>
+						<th>단건 키워드</th>
+						<td>
+							<select name="searchOne" id="searchOne">
+								<option value="mallOrderId">쇼핑몰주문번호</option>
+								<option value="orderName">주문자명</option>
+								<option value="orderCel">주문자연락처</option>
+							</select>
+							<input type="text" class="w40p" name="conditionOne" id="conditionOne">
+						</td>
 					</tr>
 					<tr>
 						<th>제휴몰 주문등록 상태</th>
@@ -269,6 +278,8 @@
 		},
 		{headerName: "쇼핑몰 주문번호", field: "mallOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰 명", field: "mallName", width: 130, cellClass: 'text-center'},
+		{headerName: "주문자명", field: "orderName", width: 130, cellClass: 'text-center'},
+		{headerName: "주문자연락처", field: "orderCel", width: 130, cellClass: 'text-center'},
 		{headerName: "배송상태[발주확인]", field: "baesongStatus", width: 130, cellClass: 'text-center'},
 		{headerName: "주문 상품번호", field: "orderProductId", width: 130, cellClass: 'text-center'},
 		{headerName: "샵링커 상품번호", field: "shoplinkerProductId", width: 130, cellClass: 'text-center'},

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

@@ -177,6 +177,9 @@ var fnChangeChgReason = function(reasonCd) {
 				if(wdGb == "W" && spanRefundAmt < rtnDelvFee ){  // 회수요청 
 					changeYn = "Y";
 					addPayCost = rtnDelvFee;
+				} else {
+					changeYn = "Y";
+					addPayCost = rtnDelvFee;
 				}
 			}
 			

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

@@ -212,19 +212,26 @@
 							paramData 		+= '@' + params.data.delvFeeCd;
 							paramData 		+= '@' + 'WMS';
 							
-							// 반품접수, 반품대기, 회수요청, 상품검수중, 결제대기, 반품진행중
-							if (params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51' 
-									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_33') {
-								rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
-							}
-							// 교환접수, 교환대기, 회수요청, 상품검수중, 결제대기, 교환진행중
-							else if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' 
-									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_34') {
-								rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
-							} 
-							else {
-								rtnStr = params.value;
+							if(params.data.chgGb == 'G680_30' ){
+								// 반품접수, 반품대기, 회수요청, 상품검수중, 결제대기, 반품진행중
+								if (params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51' 
+										|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_33') {
+									rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+								}else {
+									rtnStr = params.value;
+								}
+							} else {
+								// 교환접수, 교환대기, 회수요청, 상품검수중, 결제대기, 교환진행중
+								if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' 
+										|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_34') {
+									rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+								} 
+								else {
+									rtnStr = params.value;
+								}
 							}
+
+
 						}
 					} else {
 						rtnStr = params.value;
@@ -291,7 +298,13 @@
 								}
 							}
 						} else if(params.data.reasonCode == '04' ){ // 배송비 미동봉 
-							btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
+							
+							if(params.data.mallGb  == 'G011_10' ){
+								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
+							} else {
+								btnText= '';
+							}
+							
 						} else if(params.data.reasonCode == '05'){ // 다른상품 반품
 							if(params.data.recallExceptionNo != null){
 								if(params.data.chgGb == 'G680_30' && params.data.newOrdChgSqYn == 'N'){
@@ -602,11 +615,13 @@
 							cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 						}
 					} else if(event.data.reasonCode == '04'){ // 배송비 미동봉
-						
-						if(event.data.chgReason == "G688_10" || event.data.chgReason == "G689_10"){
+						if(event.data.mallGb  == 'G011_10'){
 							actionUrl = "/withdraw/exception/change/form?ordChgSq=" + event.data.ordChgSq + '&chgGb=' + event.data.chgGb;
 							cfnOpenModalPopup(actionUrl, 'popupWithdrawChangeForm');
 						}
+						//if(event.data.chgReason == "G688_10" || event.data.chgReason == "G689_10"){
+
+						//}
 					} else if(event.data.reasonCode == '05' ){ // 다른상품 반품 
 						refreshFlag  = "ban";
 						param += "&ordNo=" 			+ event.data.orderNo;