클래스 메서드명 정리중

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaOrderDao.java

@@ -113,7 +113,7 @@ public interface TsaOrderDao {
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	Collection<Order> orderRefundInfo(Order order);
+	Collection<Order> getOrderRefundInfo(Order order);
 	
 	/**
 	 * 상담내역
@@ -123,7 +123,7 @@ public interface TsaOrderDao {
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	Collection<Order> orderCounselInfo(Order order);
+	Collection<Order> getOrderCounselInfo(Order order);
 	
 	/**
 	 * 변경내역 > 주문요청 관리자 메모
@@ -133,7 +133,7 @@ public interface TsaOrderDao {
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	Collection<Order> getOrderTsainMemoList(Order order);
+	Collection<Order> getOrderMemoList(Order order);
 	
 	/**
 	 * 입점업체미발주 주문목록

style24.admin/src/main/java/com/style24/admin/biz/service/TsaOrderService.java

@@ -78,29 +78,29 @@ public class TsaOrderService {
 	public Collection<Order> getOrderInfoList(Order order) {
 		return orderDao.getOrderInfoList(order);
 	}
-	
+
 	/**
-	 * 주문상세 > 사은품목록
+	 * 주문상품정보 목록
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	public Collection<Order> getOrderFreeGiftList(Order order) {
-		return orderDao.getOrderFreeGiftList(order);
+	public Collection<Order> getOrderDetailList(Order order) {
+		return orderDao.getOrderDetailList(order);
 	}
 	
 	/**
-	 * 주문상품정보 목록
+	 * 주문상세 > 사은품목록
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	public Collection<Order> getOrderDetailList(Order order) {
-		return orderDao.getOrderDetailList(order);
+	public Collection<Order> getOrderFreeGiftList(Order order) {
+		return orderDao.getOrderFreeGiftList(order);
 	}
 	
 	/**
@@ -116,7 +116,7 @@ public class TsaOrderService {
 	}
 	
 	/**
-	 * 결제내역 > 결제 기본정보
+	 * 결제내역 > 결제정보
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
@@ -159,8 +159,8 @@ public class TsaOrderService {
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	public Collection<Order> orderRefundInfo(Order order) {
-		return orderDao.orderRefundInfo(order);
+	public Collection<Order> getOrderRefundInfo(Order order) {
+		return orderDao.getOrderRefundInfo(order);
 	}
 	
 	/**
@@ -171,21 +171,21 @@ public class TsaOrderService {
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	public Collection<Order> orderCounselInfo(Order order) {
-		return orderDao.orderCounselInfo(order);
+	public Collection<Order> getOrderCounselInfo(Order order) {
+		return orderDao.getOrderCounselInfo(order);
 	}
 	
 	/**
-	 * 변경내역 > 주문요청 관리자 메모
+	 * 변경내역 > 주문요청 관리자 메모 목록 조회
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 18
 	 */
-	public Collection<Order> getOrderTsainMemoList(Order order) {
+	public Collection<Order> getOrderMemoList(Order order) {
 		order.setDelYn("N");
-		return orderDao.getOrderTsainMemoList(order);
+		return orderDao.getOrderMemoList(order);
 	}
 	
 	/**

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

@@ -66,7 +66,7 @@ public class TsaOrderController extends TsaBaseController {
 	//private TsaMessageByLocale message;
 	
 	/**
-	 * 주문 조회 화면
+	 * 주문목록조회
 	 *
 	 * @return ModelAndView
 	 * @author jsh77b
@@ -94,7 +94,7 @@ public class TsaOrderController extends TsaBaseController {
 	}
 	
 	/**
-	 * 주문 목록
+	 * 주문목록
 	 *
 	 * @param order - 주문정보
 	 * @return Collection<Order>
@@ -137,7 +137,7 @@ public class TsaOrderController extends TsaBaseController {
 	}
 	
 	/**
-	 * 주문 목록 엑셀 조회
+	 * 주문목록엑셀조회
 	 *
 	 * @param order - 주문정보
 	 * @return Collection<Order>
@@ -206,11 +206,11 @@ public class TsaOrderController extends TsaBaseController {
 		
 		// 2. 클레임정보
 		mav.addObject("orderChangeInfo"			, orderService.getOrderChangeList(order));				// 취소/반품/교환요청 정보
-		mav.addObject("orderRefundInfo"			, orderService.orderRefundInfo(order));					// 환불정보
+		mav.addObject("orderRefundInfo"			, orderService.getOrderRefundInfo(order));				// 환불정보
 		
 		// 3. 주문메모정보
-		mav.addObject("orderCounselInfo"		, orderService.orderCounselInfo(order));				// 상담내역
-		mav.addObject("orderAdminMemoInfo"		, orderService.getOrderTsainMemoList(order));			// 관리자메모
+		mav.addObject("orderCounselInfo"		, orderService.getOrderCounselInfo(order));				// 상담내역
+		mav.addObject("orderAdminMemoInfo"		, orderService.getOrderMemoList(order));				// 관리자메모목록
 
 		mav.setViewName("order/OrderDetailForm");
 		
@@ -467,7 +467,7 @@ public class TsaOrderController extends TsaBaseController {
 	public Collection<Order> getOrderTsainMemoList(@PathVariable(value = "ordNo") int ordNo) {
 		Order order = new Order();
 		order.setOrdNo(ordNo);
-		return orderService.getOrderTsainMemoList(order);
+		return orderService.getOrderMemoList(order);
 	}
 	
 	/**

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -699,8 +699,8 @@
 	</select>
 	
 	<!-- 주문상세 > 환불정보 -->
-	<select id="orderRefundInfo" parameterType="Order" resultType="Order">
-		/* order.orderRefundInfo */
+	<select id="getOrderRefundInfo" parameterType="Order" resultType="Order">
+		/* order.getOrderRefundInfo */
 		SELECT P.PAY_MEANS
 		     , FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
 		     , P.CARD_NM
@@ -725,8 +725,8 @@
 	</select>
 	
 	<!-- 주문상세 > 상담내역 -->
-	<select id="orderCounselInfo" parameterType="Order" resultType="Order">
-		/* order.orderCounselInfo */
+	<select id="getOrderCounselInfo" parameterType="Order" resultType="Order">
+		/* order.getOrderCounselInfo */
 		SELECT CS.COUNSEL_CLSF
 			 , FN_GET_CODE_NM('G059', CS.COUNSEL_CLSF) AS COUNSEL_CLSF_NM
 		     , CS.REL_GOODS_CD