Merge remote-tracking branch 'origin/develop' into develop

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

@@ -22,6 +22,7 @@ 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.biz.service.TscOrderChangeService;
+import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
@@ -43,9 +44,6 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@Autowired
 	private TscMessageByLocale message;
 	
-	@Autowired
-	private Environment env;
-	
 	@Autowired
 	private TsaRendererService rendererService;
 	
@@ -58,6 +56,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@Autowired
 	private TscOrderChangeService coreOrderChangeService;
 	
+	@Autowired
+	private TscOrderRefundService coreOrderRefundService;
+	
 	/**
 	 * 취소신청 (NAPY, 외부몰) (배치)
 	 * @param OrderChange - 주문취소신청정보
@@ -69,8 +70,6 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@ResponseBody
 	public GagaResponse cnclReq(@RequestBody OrderChange cnclReq) {
 		
-		GagaMap mav = new GagaMap();
-		
 		if (cnclReq== null) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
@@ -95,18 +94,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@PostMapping("/cnclReqComplete")
 	@ResponseBody
 	public GagaResponse cnclReqComplete(@RequestBody OrderChange cnclReq) {
-		GagaMap mav = new GagaMap();
 		
 		if (cnclReq== null) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 		
-		// * 필요 데이타
-		// 주문번호, 주문상세, 취소신청수량, 신청구분(취소신청, 취소완료), 몰구분(자사, NAPY, EXTMALL)
-		
-		// 1. 취소신청목록으로 변환
-		List<Order> cnclReqList = coreOrderChangeService.getCnclReqList(cnclReq);
-		
 		return super.ok("성공");
 	}
 	
@@ -146,7 +138,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 	
 	/**
-	 * 주문취소완료 (관리자)
+	 * 취소완료 (관리자)
 	 * @param Collection<Order> - 주문취소신청목록
 	 * @return
 	 * @author jsh77b
@@ -154,15 +146,15 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 */
 	@PostMapping("/cancel")
 	@ResponseBody
-	public GagaResponse orderCancel(@RequestBody OrderChange cancelReq) {
+	public GagaResponse orderCancel(@RequestBody OrderChange cnclReq) {
 		
 		GagaMap mav = new GagaMap();
 		
-		if (cancelReq== null) {
+		if (cnclReq== null) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 		
-		List<Order> cnclReqList = cancelReq.getCancelReqList(); // 취소요청정보
+		List<Order> cnclReqList = cnclReq.getCancelReqList(); // 취소요청정보
 		
 		// To Do List
 		// @ 결품취소로직 추가
@@ -172,53 +164,35 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 1. 세션회원조회
 		int userNo = TsaSession.getInfo().getUserNo();
 		
-		// 1. 환불금액정보 계산 & 조회
-		// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현		
-		mav = coreOrderChangeService.cnclRtnRefundAmt(cnclReqList);
+		// 2. 환불금액계산
+		// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현
+		mav = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
-		// 2. 주문변경기본정보 설정
-		mav.set("ordNo"			, cancelReq.getOrdNo());
-		mav.set("chgReason"		, cancelReq.getChgReason());
-		mav.set("chgMemo"		, cancelReq.getChgMemo());
+		// 3. 주문변경 기본정보 설정
+		mav.set("ordNo"			, cnclReq.getOrdNo());				// 주문번호
+		mav.set("chgReason"		, cnclReq.getChgReason());			// 변경사유
+		mav.set("chgMemo"		, cnclReq.getChgMemo());			// 변경메모
 		
-		mav.set("accountNo"		, cancelReq.getAccountNo());
-		mav.set("accountNm"		, cancelReq.getAccountNm());
-		mav.set("bankCd"		, cancelReq.getBankCd());
+		mav.set("accountNo"		, cnclReq.getAccountNo());			// 환불계좌번호
+		mav.set("accountNm"		, cnclReq.getAccountNm());			// 환불계좌예금주명
+		mav.set("bankCd"		, cnclReq.getBankCd());				// 환불계좌은행코드
 		
-		mav.set("allCanYn"		, cancelReq.getAllCanYn());
-		mav.set("isCustomer"	, cancelReq.getIsCustomer());
+		mav.set("allCanYn"		, cnclReq.getAllCanYn());			// 무통장입금전 전체취소 여부
+		mav.set("isCustomer"	, cnclReq.getIsCustomer());			// 변경사유 (고객, 회사)
 		
-		// 3. 주문변경 DB 등록 (주문정보, 배송정보)
+		// 4. 주문변경 회수지정보 추가
+		mav.set("chgerNm"		, cnclReq.getChgerNm());			// 변경자명
+		mav.set("chgerPhnno"	, cnclReq.getChgerPhnno());			// 변경자핸드폰번호
+		mav.set("chgerTelno"	, cnclReq.getChgerTelno());			// 변경자전화번호
+				
+		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL)
 		coreOrderChangeService.cnclComplete(mav, userNo);
 		
 		return super.ok("성공");
 	}
 	
 	/**
-	 * 주문 취소/반품 신청환불금액 계산
-	 * @param Collection<Order>- 주문취소신청목록
-	 * @return
-	 * @author jsh77b
-	 * @since 2020. 12. 29
-	 */
-	@PostMapping("/cancel/refundAmt")
-	@ResponseBody
-	public GagaMap orderCancelRefundAmt(@RequestBody List<Order> cancelReqList) {
-		
-		GagaMap mav = new GagaMap();
-		
-		if (cancelReqList == null || cancelReqList.isEmpty()) {
-			throw new IllegalStateException(message.getMessage("FAIL_1001"));
-		}
-		
-		// 1. 환불금액정보 계산 & 조회
-		mav = coreOrderChangeService.cnclRtnRefundAmt(cancelReqList);
-		
-		return mav;
-	}
-	
-	/**
-	 * 반품요청 화면
+	 * 반품요청 화면 (관리자)
 	 * 
 	 * @param ordNo - 주문번호
 	 * @param cncWait - 취소대기요청 구분
@@ -256,7 +230,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 	
 	/**
-	 * 주문반품신청
+	 * 반품신청 (관리자)
 	 * @param Collection<Order> - 주문취소신청목록
 	 * @return
 	 * @author jsh77b
@@ -264,48 +238,43 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 */
 	@PostMapping("/returnRequest")
 	@ResponseBody
-	public GagaResponse orderReturnRequest(@RequestBody OrderChange cancelReq) {
+	public GagaResponse orderReturnRequest(@RequestBody OrderChange rtnReq) {
 		
 		GagaMap mav = new GagaMap();
 		
-		if (cancelReq== null) {
+		if (rtnReq== null) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		List<Order> cancelReqList = cancelReq.getCancelReqList(); // 취소요청정보
-		
-		// To Do List
-		// @ 결품취소로직 현재는 일반취소로직만존재
-		// @ 주문취소 취소시 상태값 체크
-		// @ 취소, 반품시 배송비 체크 로직 
+		List<Order> cancelReqList = rtnReq.getCancelReqList(); // 취소요청정보
 		
 		// 1. 세션회원조회
 		int userNo = TsaSession.getInfo().getUserNo();
 		
-		// 1. 환불금액정보 계산 & 조회
-		mav = coreOrderChangeService.cnclRtnRefundAmt(cancelReqList);
-		
-		// 2. 주문변경기본정보 설정
-		mav.set("ordNo"			, cancelReq.getOrdNo());
-		mav.set("chgReason"		, cancelReq.getChgReason());
-		mav.set("chgMemo"		, cancelReq.getChgMemo());
-		
-		mav.set("accountNo"		, cancelReq.getAccountNo());
-		mav.set("accountNm"		, cancelReq.getAccountNm());
-		mav.set("bankCd"		, cancelReq.getBankCd());
-		
-		mav.set("allCanYn"		, cancelReq.getAllCanYn());
-		mav.set("isCustomer"	, cancelReq.getIsCustomer());
-		
-		//3. 회수지정보추가
-		mav.set("chgerNm"		, cancelReq.getChgerNm());
-		mav.set("chgerZipNo"	, cancelReq.getChgerZipNo());
-		mav.set("chgerBaseAddr"	, cancelReq.getChgerBaseAddr());
-		mav.set("chgerDtlAddr"	, cancelReq.getChgerDtlAddr());
-		mav.set("chgerPhnno"	, cancelReq.getChgerPhnno());
-		mav.set("chgerTelno"	, cancelReq.getChgerTelno());
-		
-		// 4. 주문변경 DB 등록 (주문정보, 배송정보)
+		// 2. 환불금액계산
+		mav = coreOrderRefundService.cnclRtnRefundAmt(cancelReqList);
+		
+		// 3. 주문변경 기본정보 설정
+		mav.set("ordNo"			, rtnReq.getOrdNo());				// 주문번호
+		mav.set("chgReason"		, rtnReq.getChgReason());			// 변경사유
+		mav.set("chgMemo"		, rtnReq.getChgMemo());				// 변경메모
+			
+		mav.set("accountNo"		, rtnReq.getAccountNo());			// 환불계좌번호
+		mav.set("accountNm"		, rtnReq.getAccountNm());			// 환불계좌예금주명
+		mav.set("bankCd"		, rtnReq.getBankCd());				// 환불계좌은행코드
+		
+		mav.set("allCanYn"		, rtnReq.getAllCanYn());			// 무통장입금전 전체취소 여부 
+		mav.set("isCustomer"	, rtnReq.getIsCustomer());			// 변경사유 (고객, 회사)
+		
+		// 4. 주문변경 회수지정보 추가
+		mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
+		mav.set("chgerZipNo"	, rtnReq.getChgerZipNo());			// 회수지우편번호
+		mav.set("chgerBaseAddr"	, rtnReq.getChgerBaseAddr());		// 회수지기본주소
+		mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
+		mav.set("chgerPhnno"	, rtnReq.getChgerPhnno());			// 변경자핸드폰번호
+		mav.set("chgerTelno"	, rtnReq.getChgerTelno());			// 변경자전화번호
+		
+		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
 		coreOrderChangeService.rtnReq(mav, userNo);
 		
 		return super.ok("성공");
@@ -313,6 +282,20 @@ public class TsaOrderChangeController extends TsaBaseController {
 	
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	/**
 	 * 환불계좌목록
 	 *

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

@@ -0,0 +1,69 @@
+package com.style24.admin.biz.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.gagaframework.web.parameter.GagaMap;
+import com.style24.admin.support.controller.TsaBaseController;
+import com.style24.core.biz.service.TscOrderRefundService;
+import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.domain.Order;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 취소관리 Controller
+ *
+ * @author jsh77b
+ * @since 2020. 11. 16
+ */
+@Controller
+@RequestMapping("/refund")
+@Slf4j
+public class TsaOrderRefundController extends TsaBaseController {
+	
+	@Autowired
+	private TscMessageByLocale message;
+	
+	@Autowired
+	private TscOrderRefundService coreOrderRefundService;
+
+	/**
+	 * 주문 취소/반품 신청환불금액 계산
+	 * @param Collection<Order>- 주문취소신청목록
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 12. 29
+	 */
+	@PostMapping("/refundAmt")
+	@ResponseBody
+	public GagaMap orderCancelRefundAmt(@RequestBody List<Order> cancelReqList) {
+		
+		GagaMap mav = new GagaMap();
+		
+		if (cancelReqList == null || cancelReqList.isEmpty()) {
+			throw new IllegalStateException(message.getMessage("FAIL_1001"));
+		}
+		
+		// 1. 환불금액계산
+		mav = coreOrderRefundService.cnclRtnRefundAmt(cancelReqList);
+		
+		return mav;
+	}
+}
+
+
+
+
+
+
+
+
+
+