교환배송비 미노출 수정 임시 커밋

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

@@ -16,6 +16,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gagaframework.excel.GagaExcelUtil;
+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.TsaPgService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
@@ -30,12 +35,6 @@ import com.style24.persistence.domain.OrderSample;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.GagaExcelUtil;
-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;
-
 /**
  * 주문관리 Controller
  *
@@ -269,15 +268,15 @@ public class TsaOrderController extends TsaBaseController {
 		}
 
 		// 1. 주문기본정보
-		mav.addObject("ordNo", ordNo);												// 주문번호
-		mav.addObject("userNo", TsaSession.getInfo().getUserNo());					// 관리자번호
+		mav.addObject("ordNo", ordNo);															// 주문번호
+		mav.addObject("userNo", TsaSession.getInfo().getUserNo());								// 관리자번호
 
-		mav.addObject("orderInfo", orderService.getOrderInfoList(order));				// 주문기본정보
+		mav.addObject("orderInfo", orderService.getOrderInfoList(order));						// 주문기본정보
 		mav.addObject("orderGoodsInfo", orderDetailList);										// 주문상품정보
 		mav.addObject("orderFreeGiftInfo", orderService.getOrderFreeGiftList(order));			// 주문사은품정보 2020.12.16 추가
-		mav.addObject("orderDeliveryAddrInfo", orderService.getDeliveryAddrList(order));				// 배송정보
+		mav.addObject("orderDeliveryAddrInfo", orderService.getDeliveryAddrList(order));		// 배송정보
 		mav.addObject("orderPaymentInfo", orderService.getOrderPaymentBasicInfoList(order));	// 결제정보
-		mav.addObject("orderDeliveryFeeInfo", orderService.getDeliveryFeeList(order));				// 배송비정보
+		mav.addObject("orderDeliveryFeeInfo", orderService.getDeliveryFeeList(order));			// 배송비정보
 
 		// 2. 클레임정보
 		mav.addObject("orderChangeInfo", orderService.getOrderChangeList(order));				// 취소/반품/교환 요청 정보
@@ -286,7 +285,7 @@ public class TsaOrderController extends TsaBaseController {
 		// 3. 주문메모정보
 		mav.addObject("orderCounselInfo", orderService.getOrderCounselInfo(order));				// 상담내역
 		mav.addObject("orderAdminMemoInfo", orderService.getOrderMemoList(order));				// 관리자메모목록
-		mav.addObject("allCanYn", allCanYn);											// 배송지수정가능여부
+		mav.addObject("allCanYn", allCanYn);													// 배송지수정가능여부
 
 		mav.setViewName("order/OrderDetailForm");