제휴몰검색기능

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

@@ -21,14 +21,17 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.gagaframework.web.util.GagaFileUtil;
+import com.style24.admin.biz.service.TsaOcmService;
 import com.style24.admin.biz.service.TsaPgService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscOrderService;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.Extmall;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderSample;
@@ -63,6 +66,9 @@ public class TsaOrderController extends TsaBaseController {
 
 	@Autowired
 	private ObjectMapper mapper;
+	
+	@Autowired
+	private TsaOcmService ocmService;
 
 	/**
 	 * 주문목록조회
@@ -92,6 +98,12 @@ public class TsaOrderController extends TsaBaseController {
 
 		// CTI 접속을 통해 접근 시
 		mav.addObject("cellPhnno", cellPhnno);
+		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
 
 		mav.setViewName("order/OrderListForm");
 

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

@@ -132,8 +132,8 @@
 										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th rowspan="5">키워드<i class="star"></i></th>
-						<td rowspan="5">
+						<th rowspan="6">키워드<i class="star"></i></th>
+						<td rowspan="6">
 							<select name="search" id="search">
 								<option value="searchOrdNo">주문번호</option>
 								<option value="searchCustId">고객ID</option>
@@ -203,6 +203,24 @@
 							</select>
 						</td>
 					</tr>
+					<tr>
+						<th>제휴몰명</th>
+						<td>
+							<input type="hidden" class="w40p" name="vendorId" placeholder="" maxlength="20" th:value="${vendorId}"/>
+							<select name="extmallId">
+								<option value="">선택안함</option>
+								<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>
+							<input type="text" name="extmallOrderId" placeholder="" maxlength="40"/>
+						</td>
+						<th>SKU-CODE</th>
+						<td>
+							<input type="text" name="optCd" placeholder="" maxlength="40"/>
+						</td>
+					</tr>
 					<tr>
 						<th>조회일자</th>
 						<td colspan="7">
@@ -405,7 +423,7 @@ var columnDefsOrderList = [
 			return gagaAgGrid.lookupValue(vendorList, params.data.vendorId);
 		}
 	},
-	{headerName: "외부몰주문번호"	, field: "extmallOrderId"	, width: 120, cellClass: 'textFormat', sortable: true},
+	{headerName: "제휴몰주문번호"	, field: "extmallOrderId"	, width: 120, cellClass: 'textFormat', sortable: true},
 	{headerName: "샵링커주문번호"	, field: "agentOrderId"		, width: 120, cellClass: 'textFormat', sortable: true},
 	{
 		headerName		: "주문수량"