Jelajahi Sumber

constants 임시 수정

card007 5 tahun lalu
induk
melakukan
fe4b1e1bfa

+ 1 - 1
src/main/java/com/style24/admin/biz/service/TsaDeliveryService.java

@@ -13,7 +13,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.admin.support.util.TsitUtil;
 
 import com.style24.persistence.domain.Delivery;
-import com.style24.admin.support.env.TsaConstants.OrderDetailStat;
+import com.style24.core.support.env.TscConstants.OrderDetailStat;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 

+ 0 - 1
src/main/java/com/style24/admin/biz/service/TsaWithdrawService.java

@@ -32,7 +32,6 @@ import com.style24.persistence.domain.Withdraw;
 
 
 import com.style24.admin.support.env.TsaConstants;
-import com.style24.admin.support.env.TsaConstants.OrderDetailStat;
 //import com.style24.admin.support.env.TsaConstants.OrderStat;
 //import com.style24.admin.support.env.TsaConstants.PayMeans;
 //import com.style24.admin.support.env.TsaConstants.PaymentStat;

+ 39 - 2
src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -21,6 +21,7 @@ import com.style24.admin.biz.service.TsaOrderService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
@@ -277,8 +278,44 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
-	
-	
+
+	/**
+	 * 교환요청 화면
+	 *
+	 * @param ordNo - 주문번호
+	 * @return ModelAndView
+	 * @author card007
+	 * @since 2021. 01. 14
+	 */
+	@GetMapping("/exchange/request/form")
+	public ModelAndView exchangeRequestFrom(@RequestParam(value = "ordNo") int ordNo) {
+
+		Order order = new Order();
+		ModelAndView mav = new ModelAndView();
+
+		order.setOrdNo(ordNo);
+
+		// 교환가능 주문상세상탭값 설정
+		String[] ordDtlStatArr = new String[3];
+		ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
+		ordDtlStatArr[1] = TscConstants.OrderDetailStat.SHIP_COMPLETE.value();
+		ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
+		order.setOrdDtlStatArr(ordDtlStatArr);
+
+		Collection<Order> cancelRequestTargetList = orderChangeService.getCancelRequestTargetList(order);
+
+		Collection<Order> orderInfoList = orderService.getOrderInfoList(order);
+
+		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G686"));	// 반품사유
+		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);							// 반품요청대상 목록
+		mav.addObject("orderInfoList"				, orderInfoList);									// 주문정보
+		mav.addObject("ordNo"						, ordNo);
+		mav.addObject("orderDelvRtnAddrInfo"		, orderService.getDeliveryAddrList(order));			// 배송정보
+
+		mav.setViewName("order/ReturnRequestForm");
+
+		return mav;
+	}
 }
 
 

+ 0 - 26
src/main/java/com/style24/admin/support/env/TsaConstants.java

@@ -26,32 +26,6 @@ public class TsaConstants {
 		}
 	}
 
-	// 주문상세상태
-	public enum OrderDetailStat {
-		DEPOSIT_WAIT("G013_10"),			// 입금대기
-		ORDER_WAIT_PRICE("G013_18"),		// 발주대기-가격차이
-		ORDER_WAIT_POST("G013_19"),			// 발주대기-우편번호상이
-		PAYMENT_COMPLETE("G013_20"),		// 결제완료
-		GOODS_PREPARE("G013_30"),			// 상품준비중
-		DELIVERY_PREPARE("G013_40"),		// 배송준비중
-		SHIPPING("G013_50"),				// 배송중
-		SHIP_COMPLETE("G013_55"),			// 출고완료
-		DELIVERY_COMPLETE("G013_60"),		// 배송완료
-		//PURCHASE_CONFIRM("70"),			// 구매확정
-		PAYMENT_BEFORE_CANCEL("G013_98"),	// 결제전주문취소
-		PAYMENT_AFTER_CANCEL("G013_99");	// 결제후주문취소
-
-		private String value;
-
-		private OrderDetailStat(String value) {
-			this.value = value;
-		}
-
-		public String value() {
-			return value;
-		}
-	}
-	
 	// 몰구분
 	public enum MallGb {
 		SELFMALL("G011_10"),			// 자사몰