마이페이지 단테 수정 커밋

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

@@ -278,54 +278,95 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @author jsh77b
 	 * @since 2020. 12. 29
 	 */
+	@SuppressWarnings("unchecked")
 	@PostMapping("/rtnReq")
 	@ResponseBody
 	public GagaResponse rtnReq(@RequestBody OrderChange rtnReq) {
 		
-		GagaMap mav = new GagaMap();
+		GagaMap map = new GagaMap();
 		
 		if (rtnReq== null) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		List<Order> cancelReqList = rtnReq.getCancelReqList(); // 변경요청정보
-		
-		// TODO
-		// @ 주문취소시 상태값 체크
-		// @ 취소, 반품시 배송비 체크 로직 (선결제 로직)
-		
+		List<Order> cnclReqList = rtnReq.getCancelReqList(); // 변경요청정보
+		int[] ordDtlNoArr 		= new int[cnclReqList.size()];
+		int[] cnclRtnReqQtyArr 	= new int[cnclReqList.size()];
+
+		for (int i=0 ; i<cnclReqList.size() ; i++) {
+			Order vo = (Order)cnclReqList.get(i);
+			ordDtlNoArr[i] 			= vo.getOrdDtlNo();
+			cnclRtnReqQtyArr[i] 	= vo.getOrdCanChgQty();
+		}
+
 		// 1. 세션회원조회
 		int userNo = TsaSession.getInfo().getUserNo();
+
+		rtnReq.setOrdDtlNoArr(ordDtlNoArr);
+		rtnReq.setCnclRtnReqQtyArr(cnclRtnReqQtyArr);
+		rtnReq.setIpAddress(TsaSession.getIpAddress());
+		rtnReq.setRegNo(userNo);
+
+		// 2021.05.14 FRONT 정보 선주문정보조회
+		GagaMap refundPreInfo = orderChangeService.getRefundPreInfo(rtnReq);
+		cnclReqList = (List<Order>) refundPreInfo.get("cnclReqList");
 		
 		// 2. 환불금액계산
-		mav = orderRefundService.cnclRtnRefundAmt(cancelReqList);
+		map = orderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		// 3. 주문변경 기본정보 설정
-		mav.set("ordNo"			, rtnReq.getOrdNo());				// 주문번호
-		mav.set("ordChgSq"		, rtnReq.getOrdChgSq());			// 주문변경번호
-		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());			// 변경사유 (고객, 회사)
-		mav.set("wdGb"			, rtnReq.getWdGb());				// 회수방법
+		map.set("ordNo"					, rtnReq.getOrdNo());						// 주문번호
+		map.set("ordChgSq"				, rtnReq.getOrdChgSq());					// 주문변경번호
+		map.set("chgReason"				, rtnReq.getChgReason());					// 변경사유
+		map.set("chgReasonNm"			, rtnReq.getChgReasonNm());					// 변경사유명 (2021.05.13 추가)
+		map.set("chgMemo"				, rtnReq.getChgMemo());						// 변경메모
+		map.set("accountNo"				, rtnReq.getAccountNo());					// 환불계좌번호
+		map.set("accountNm"				, rtnReq.getAccountNm());					// 환불계좌예금주명
+		map.set("bankCd"				, rtnReq.getBankCd());						// 환불계좌은행코드
+		map.set("allCanYnBeforePayment"	, rtnReq.getAllCanYnBeforePayment());		// 무통장입금전 전체취소 여부
+		map.set("allCanYn"				, rtnReq.getAllCanYn());					// 전체취소 여부
+		map.set("allLastCanYn"			, refundPreInfo.get("allLastCanYn"));		// 전체 마지막 취소 여부 (2021.05.13 추가)
+		map.set("isCustomer"			, rtnReq.getIsCustomer());					// 변경사유 (고객, 회사)
+		map.set("chgerNm"				, rtnReq.getChgerNm());						// 변경자명
+		map.set("chgerEmail"			, rtnReq.getChgerEmail());					// 변경자이메일주소
+		map.set("chgerPhnno"			, rtnReq.getChgerPhnno());					// 변경자핸드폰번호
+		map.set("chgerTelno"			, rtnReq.getChgerTelno());					// 변경자전화번호
+		map.set("reqGbn"				, rtnReq.getReqGbn());						// 신청구분
+		map.set("ipAddress"				, rtnReq.getIpAddress());					// IP주소 (2021.05.13 추가)
+		map.set("custNo"				, rtnReq.getCustNo());						// 고객번호 (2021.05.13 추가)
+
+		map.set("pgTid"					, refundPreInfo.getString("pgTid"));		// PG거래ID
+		map.set("payMeans"				, refundPreInfo.getString("payMeans"));		// 결제수단
+		map.set("pgGb"					, refundPreInfo.getString("pgGb"));			// PG구분
+		map.set("cashAuthNo"			, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호
 		
-		// 4. 주문변경 회수지정보 추가
-		mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
-		mav.set("chgerEmail"	, rtnReq.getChgerEmail());			// 변경자이메일주소
-		mav.set("chgerZipcode"	, rtnReq.getChgerZipcode());		// 회수지우편번호
-		mav.set("chgerBaseAddr"	, rtnReq.getChgerBaseAddr());		// 회수지기본주소
-		mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
-		mav.set("chgerPhnno"	, rtnReq.getChgerPhnno());			// 변경자핸드폰번호
-		mav.set("chgerTelno"	, rtnReq.getChgerTelno());			// 변경자전화번호
-		mav.set("chgerRtnMemo"	, rtnReq.getChgerRtnMemo());		// 반품메모
+		// mav.set("ordNo"			, rtnReq.getOrdNo());				// 주문번호
+		// mav.set("custNo"		, userNo);							// 회원번호
+		// mav.set("ordChgSq"		, rtnReq.getOrdChgSq());			// 주문변경번호
+		// 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());			// 변경사유 (고객, 회사)
+		// mav.set("wdGb"			, rtnReq.getWdGb());				// 회수방법
+		//
+		// // 4. 주문변경 회수지정보 추가
+		// mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
+		// mav.set("chgerEmail"	, rtnReq.getChgerEmail());			// 변경자이메일주소
+		// mav.set("chgerZipcode"	, rtnReq.getChgerZipcode());		// 회수지우편번호
+		// mav.set("chgerBaseAddr"	, rtnReq.getChgerBaseAddr());		// 회수지기본주소
+		// mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
+		// mav.set("chgerPhnno"	, rtnReq.getChgerPhnno());			// 변경자핸드폰번호
+		// mav.set("chgerTelno"	, rtnReq.getChgerTelno());			// 변경자전화번호
+		// mav.set("chgerRtnMemo"	, rtnReq.getChgerRtnMemo());		// 반품메모
 		
 		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-		orderChangeService.rtnReq(mav, userNo);
+		// orderChangeService.rtnReq(mav, userNo);
+		orderChangeService.returnRequest(map);
 		
 		return super.ok("성공");
 	}

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -124,8 +124,8 @@
 						<tr>
 							<th>추가 반품배송 금액</th>
 							<td><span id="spanTotRtnDelvFee"></span>원</td>
-							<th>추가 교환배송 금액</th>
-							<td><span id="spanTotExcDelvFee"></span>원 </td>
+<!--							<th>추가 교환배송 금액</th>-->
+<!--							<td><span id="spanTotExcDelvFee"></span>원 </td>-->
 						</tr>
 						
 						<tr>
@@ -893,9 +893,31 @@ var fnCalculateRefundAmt = function (obj) {
 		uifnPopupClose('popupReturnRequestForm');
 		return false;
 	}
+
+	// 5. 추가정보설정
+	var chgerNm 	= orderInfoList[0].ordNm;
+	var chgerEmail 	= orderInfoList[0].ordEmail;
+	var chgerPhnno 	= orderInfoList[0].ordPhnno;
+	var chgerTelno 	= orderInfoList[0].ordTelno;
+	var custNo		= orderInfoList[0].custNo;
+	var delvFeeCd	= orderInfoList[0].delvFeeCd;
 	
 	// 환불금액계산호출
-	var jsonData = JSON.stringify(cancelRequestTargetList);
+	var jsonObj = {
+		"ordNo"					: ordNo
+		,"cancelReqList" 		: cancelRequestTargetList
+		,"isCustomer" 			: isCustomer
+		,"chgerNm"				: chgerNm
+		,"chgerEmail"			: chgerEmail
+		,"chgerPhnno"			: chgerPhnno
+		,"custNo"				: custNo
+		,"ordNm"				: chgerNm
+		,"ordPhnno"				: chgerPhnno
+		,"delvFeeCd"			: delvFeeCd
+	}
+
+	// 환불금액계산호출
+	var jsonData = JSON.stringify(jsonObj);
 	gagajf.ajaxJsonSubmit(
 		'/orderChange/cancel/refundAmt'
 		, jsonData
@@ -982,6 +1004,7 @@ var fnChangeChgReason = function(reasonCd){
 // 반품요청
 var fnCnclReq = function (reqGbn) {
 	var temp 			= false;
+	var custNo			= cancelRequestTargetList[0].custNo;
 	var ordDtlStat		= cancelRequestTargetList[0].ordDtlStat; 
 	var allCanYn 		= "N";
 	
@@ -1105,7 +1128,7 @@ var fnCnclReq = function (reqGbn) {
 	// 6. 취소신청, 취소완료 여부 체크
 	// 반품신청
 	if (reqGbn == "rtnReq") {
-		confirmStr 		= "취소신청하시겠습니까?";
+		confirmStr 		= "반품신청하시겠습니까?";
 		cnclUrl 		= '/orderChange/rtnReq/';
 	}
 	// 반품신청승인
@@ -1123,6 +1146,7 @@ var fnCnclReq = function (reqGbn) {
 		,"chgReason" 		: $('#cancelRequestFrm input[name=chgReason]').val()
 		,"chgMemo"			: $('#chgMemo').val()
 		,"cancelReqList" 	: cancelRequestTargetList
+		,"custNo"			: custNo
 		,"accountNo" 		: accountNo
 		,"accountNm" 		: accountNm
 		,"bankCd" 			: bankCd