샵링커수정

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

@@ -450,9 +450,19 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
 				
-				
 				, B.VENDOR_ID
 				, B.EXTMALL_ID
 				, B.EXTMALL_NM
@@ -496,6 +506,17 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
 				
 				, B.VENDOR_ID
@@ -547,6 +568,17 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
 				
 				, B.VENDOR_ID
@@ -592,6 +624,17 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
 				
 				, B.VENDOR_ID
@@ -731,8 +774,19 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
-				
+								
 				, B.VENDOR_ID
 				, B.EXTMALL_ID
 				, B.EXTMALL_NM
@@ -776,6 +830,17 @@
 				, A.ORDER_REG_DATE
 				, A.BAESONG_STATUS /*배송상태*/
 				, A.ORDER_PRODUCT_ID /*주문상품번호*/
+				, IFNULL(A.MALL_ID, B.EXTMALL_ID ) AS MALL_ID
+				, IFNULL(A.BAESONG_BI, B.DELV_FEE) AS BAESONG_BI				
+				, IFNULL(A.ORDER_TEL, B.ORD_PHNNO) AS ORDER_TEL
+				, IFNULL(A.ORDER_CEL, B.ORD_TELNO) AS ORDER_CEL
+				, IFNULL(A.ORDER_EMAIL, B.ORD_EMAIL) AS ORDER_EMAIL
+				, IFNULL(A.RECEIVE_TEL, B.RECIP_PHNNO) AS RECEIVE_TEL
+				, IFNULL(A.RECEIVE_CEL, B.RECIP_TELNO) AS RECEIVE_CEL
+				, IFNULL(A.RECEIVE_ZIPCODE, B.RECIP_ZIPCODE) AS RECEIVE_ZIPCODE
+				, IFNULL(B.RECIP_BASE_ADDR, A.RECEIVE_ADDR) AS RECEIVE_ADDR
+				, B.RECIP_DTL_ADDR
+				, IFNULL(A.DELIVERY_MSG, B.DELV_MEMO) AS DELIVERY_MSG
 				, IFNULL(A.REG_DT, B.REG_DT) AS REG_DT
 				
 				, B.VENDOR_ID

src/main/webapp/WEB-INF/views/ocm/ExtmallForm.html

@@ -37,7 +37,6 @@
 						<th>제휴몰벤더</th>
 						<td>
 							<select name="vendorId">
-								<option value="">[전체]</option>
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
@@ -89,7 +88,6 @@
 						<th>제휴몰벤더<i class="required" title="필수"></i></th>
 						<td>
 							<select name="vendorId" required="required" data-valid-name="제휴몰벤더">
-								<option value="">[선택]</option>
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>