반품/교환 택배사 추가 임시 커밋

src/main/java/com/style24/front/biz/dao/TsfRendererDao.java

@@ -23,4 +23,11 @@ public interface TsfRendererDao {
 	 */
 	Collection<CommonCode> getCommonCodeList(CommonCode commoncode);
 
+	/**
+	 * 택배사명 목록 조회
+	 * @return CommonCode
+	 * @author moon
+	 * @since 2020. 11. 05
+	 */
+	Collection<CommonCode> getShipCompanyList(CommonCode data);
 }

src/main/java/com/style24/front/biz/service/TsfRendererService.java

@@ -108,4 +108,15 @@ public class TsfRendererService {
 		return this.getCommonCodeList(commoncode);
 	}
 
+	/**
+	 * 택배사명 목록 조회
+	 * @return CommonCode
+	 * @author moon
+	 * @since 2020. 11. 05
+	 */
+	public Collection<CommonCode> getShipCompanyList() {
+		CommonCode data = new CommonCode();
+		data.setUseYn("Y");
+		return rendererDao.getShipCompanyList(data);
+	}
 }

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -7,7 +7,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.gagaframework.web.parameter.GagaParameterUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -23,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.parameter.GagaParameterUtil;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.gagaframework.web.util.GagaCookieUtil;
@@ -736,6 +736,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 2021.05.03 은행목록추가
 		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
 
+		// 2021.08.26 card007 택배사목록 추가
+		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
+
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageReturnForm"));
 
 		return mav;

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

@@ -31,4 +31,14 @@
 		ORDER  BY CD_GB, DISP_ORD
 	</select>
 
+	<!-- 택배사명 목록 조회 -->
+	<select id="getShipCompanyList" resultType="CommonCode">
+		/* TsaDelivery.getShipCompanyList */
+		SELECT SHIP_COMP_CD  AS CD
+		     , SHIP_COMP_NM  AS CD_NM
+		FROM   TB_SHIP_COMPANY
+		WHERE  1 = 1
+		AND    USE_YN = 'Y'
+		AND    SWT_SHIP_COMP_CD IS NOT NULL
+	</select>
 </mapper>

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -220,6 +220,25 @@
 											</th>
 											<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
 										</tr>
+										<tr>
+											<th>
+												택배사 선택
+											</th>
+											<td>
+												<div class="form_field">
+													<div class="select_custom select_courier">
+														<div class="combo">
+															<div class="select">택배사를 선택하세요.</div>
+															<ul class="list">
+																<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
+																<!-- <li class="selected">택배사를 선택하세요.</li> -->
+																<li th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></li>
+															</ul>
+														</div>
+													</div>
+												</div>
+											</td>
+										</tr>
 										<tr>
 											<th>
 												반송 송장번호

src/main/webapp/WEB-INF/views/web/mypage/NoMemberReturnFormWeb.html

@@ -218,6 +218,25 @@
 											</th>
 											<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
 										</tr>
+										<tr>
+											<th>
+												택배사 선택
+											</th>
+											<td>
+												<div class="form_field">
+													<div class="select_custom select_courier">
+														<div class="combo">
+															<div class="select">택배사를 선택하세요.</div>
+															<ul class="list">
+																<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
+																<!-- <li class="selected">택배사를 선택하세요.</li> -->
+																<option th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+															</ul>
+														</div>
+													</div>
+												</div>
+											</td>
+										</tr>
 										<tr>
 											<th>
 												반송 송장번호