이태영 - 20210722 시리얼쿠폰 밸리데이션 추가 및 조회 정렬 방법 수정, 네이버페이 수정중

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

@@ -490,14 +490,14 @@ public class TsaWithdrawService {
 
 								if(i == exceptions.size() - 1) {
 									// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
-									addUrl = "/naverpay/send/return/complete?ordChgSq=" + exception.getOrdChgSq() + "&userNo=" + userNo;
+									addUrl = "/naverpay/send/return/complete?ordDtlNo=" + exception.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);						// 반품완료
 								}
 							}
 						} else {								// 정상 반품 완료
 							if(i < 1) {
 								// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);            // 반품완료
-								String addUrl = "/naverpay/send/return/complete?ordChgSq=" + exception.getOrdChgSq() + "&userNo=" + userNo;
+								String addUrl = "/naverpay/send/return/complete?ordDtlNo=" + exception.getOrdDtlNo() + "&userNo=" + userNo;
 								coreNaverPayService.sendScmServerForNaverpay(addUrl);							// 반품완료
 							}
 						}

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

@@ -110,7 +110,7 @@
 										<tr class="serialCpnArea" style="display:none;">
 											<th>시리얼쿠폰키워드<em class="required" title="필수"></em></th>
 											<td>
-												<input type="text" name="serialCpnNm" class="w300" maxlength="10" data-valid-name="시리얼쿠폰키워드">
+												<input id="serialCpnNm" type="text" name="serialCpnNm" class="w300" maxlength="10" data-valid-name="시리얼쿠폰키워드">
 											</td>
 											<th>시리얼쿠폰발급수량<em class="required" title="필수"></em></th>
 											<td>
@@ -2386,6 +2386,15 @@
 
 	}
 
+	$("#serialCpnNm").bind("keyup",function(){
+		re = /[~!@\#$%^&*\()\-=+_']/gi;
+		var temp=$("#serialCpnNm").val();
+		if(re.test(temp)){ //특수문자가 포함되면 삭제하여 값으로 다시셋팅
+			$("#serialCpnNm").val(temp.replace(re,""));
+		}
+	});
+
+
 	$(document).ready(function() {
 		gagaAgGrid.createGrid('inComGridList', inComGridOptions);
 		gagaAgGrid.createGrid('brandGridList', brandGridOptions);