Merge branch 'develop' into bin2107

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

@@ -275,7 +275,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 								order.setRegNo(userNo);
 								coreNaverPayService.sendNaverPayOrderCancelConfirm(order);        // 취소 완료 데이터 송부
 							} else {
-								String addUrl = "/naverpay/send/cancel/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
+								String addUrl = "/naverpay/send/cancel/complete?ordNo=" + order.getOrdNo() + "&ordDtlNo=" + order.getOrdDtlNo() + "&npayOrdDtlNo=" + order.getNpayOrdDtlNo() + "&userNo=" + userNo;
 								coreNaverPayService.sendScmServerForNaverpay(addUrl);        // 취소 완료 데이터 송부
 							}
 						} else {
@@ -565,6 +565,12 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
+			String pgGb = refundPreInfo.getString("pgGb");
+			if(TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
+				// 네이버페이 주문형 알림톡, 메일 송부 X
+				return super.ok("성공");
+			}
+
 			// 반품 알림톡 관련 정보 조회
 			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
 

src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -60,7 +60,7 @@
 					<td>
 						<select name="goodsType" id="goodsType">
 							<option value="">[전체]</option>
-							<option th:if="${goodsTypeList}" th:each="oneData, status : ${goodsTypeList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							<option th:if="${goodsTypeList}" th:each="oneData, status : ${goodsTypeList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${oneData.cd == 'G056_N'}"></option>
 						</select>
 					</td>	
 					<th rowspan="4">키워드<em class="required" title="필수"></em></th>
@@ -86,10 +86,10 @@
 					<th>상품상태</th>
 					<td>
 						<div class="multiCheckBox"  style="width:200px">
-							<button type="button" class="sltBtn" data-name="[전체]">[전체]</button>
+							<button type="button" class="sltBtn" data-name="[전체]" th:text="'[G008_90] 승인완료'">[전체]</button>
 							<ul style="overflow:auto; height:170px" id="grpPGoodsStat">
 								<li><label class="chkBox" onclick="uifnAllCheck(this,'grpPGoodsStat')"><input type="checkbox" name="전체선택" >전체선택</label></li>
-								<li th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}"><label class="chkBox" data-group="grpPGoodsStat"><input type="checkbox" name="multiGoodsStat" th:id="${'goodsStat' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+								<li th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}"><label class="chkBox" data-group="grpPGoodsStat"><input type="checkbox" name="multiGoodsStat" th:id="${'goodsStat' + oneData.cd}" th:value="${oneData.cd}" th:checked="${oneData.cd == 'G008_90'}"><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
 							</ul>
 						</div>
 					</td>