제휴몰검색기능

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

@@ -427,53 +427,11 @@ public class TsaWithdrawController extends TsaBaseController {
 		
 		GagaMap result = new GagaMap();
 		
-		// 2021.10.06 샾링커 관련 주문번호
-		if (!StringUtils.isBlank(wmsWithdraw.getCondition()) || !StringUtils.isBlank(wmsWithdraw.getExtmallId())) {
-			if (StringUtils.isBlank(wmsWithdraw.getCondition())) {
-				wmsWithdraw.setSearch("");
-			} else {
-				wmsWithdraw.setConditions(wmsWithdraw.getCondition().replaceAll("\r", "").trim().split("\n"));
-			}
-
-			// 외부몰 주문번호 조회
-			Collection<WmsWithdraw> widthdrawExtmallList = deliveryService.getWithdrawExtmallList(wmsWithdraw);
-			
-			if (widthdrawExtmallList != null && widthdrawExtmallList.size() > 0) {
-				int [] ordNoList = new int[widthdrawExtmallList.size()];
-				int idx = 0;
-				for (WmsWithdraw vo : widthdrawExtmallList) {
-					ordNoList[idx] = vo.getOrdNo();
-					idx++;
-				}
-				wmsWithdraw.setOrdNoList(ordNoList);
-			} else {
-				int [] ordNoList = new int[1];
-				ordNoList[0] = 123;
-				wmsWithdraw.setOrdNoList(ordNoList);
-			}
-		}
-		
-		// 2021.10.06 샾링커 관련 주문번호
-		if (!StringUtils.isBlank(wmsWithdraw.getCondition()) || !StringUtils.isBlank(wmsWithdraw.getExtmallId())) {
-			
-			if (StringUtils.isBlank(wmsWithdraw.getCondition())) {
-				wmsWithdraw.setSearch("");
-			} else {
-				wmsWithdraw.setConditions(wmsWithdraw.getCondition().replaceAll("\r", "").trim().split("\n"));
-			}
-			
-			// 외부몰 주문번호 조회
-			Collection<WmsWithdraw> widthdrawExtmallList = deliveryService.getWithdrawExtmallList(wmsWithdraw);
-			
-			if (widthdrawExtmallList != null && widthdrawExtmallList.size() > 0) {
-				int [] ordNoList = new int[widthdrawExtmallList.size()];
-				int idx = 0;
-				for (WmsWithdraw vo : widthdrawExtmallList) {
-					ordNoList[idx] = vo.getOrdNo();
-					idx++;
-				}
-				wmsWithdraw.setOrdNoList(ordNoList);
-			}
+		// 2021.11.19
+		if (StringUtils.isBlank(wmsWithdraw.getCondition())) {
+			wmsWithdraw.setSearch("");
+		} else {
+			wmsWithdraw.setConditions(wmsWithdraw.getCondition().replaceAll("\r", "").trim().split("\n"));
 		}
 
 		wmsWithdraw.setPageable(new TscPageRequest(wmsWithdraw.getPageNo() - 1, wmsWithdraw.getPageSize()));

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

@@ -99,12 +99,25 @@ public class WmsWithdraw extends TscBaseDomain {
 	private String extmallId;
 	private String search;				// 검색어
 	private String condition;			//
-	private int ordNo;					// 주문번호
 	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] conditions = null;	//
+	private String[] conditions;	//
 	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private int[] ordNoList;			// 주문번호배열
 	
+	// 2021.11.17 제휴몰검색정보 추가
+	private String agentOrderId;
+	private String chgRegDt;
+	private String npayOrdYn;
+	private String extmallOrderId;
+	private String extmallNm;
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] optCdArr;		// 옵션코드
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] optCd1Arr;		// 옵션코드
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] optCd2Arr;		// 옵션코드
+	
 }

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

@@ -37,8 +37,7 @@
 				</span>
 			</div>
 			<!-- //TITLE -->
-			<div class="panelContent">	
-				
+			<div class="panelContent">
 					<table class="frmStyle">
 						<colgroup>
 							<col style="width:8%;"/>