반품TO교환 임시 커밋

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

@@ -1,32 +1,30 @@
 package com.style24.admin.biz.service;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.style24.admin.biz.dao.TsaDeliveryDao;
 import com.style24.admin.biz.dao.TsaWithdrawDao;
 import com.style24.admin.support.security.session.TsaSession;
-import com.style24.persistence.domain.Order;
-import com.style24.persistence.domain.OrderChange;
-import com.style24.persistence.domain.Withdraw;
-import com.style24.persistence.domain.WithdrawExc;
-import com.style24.persistence.domain.WmsWithdraw;
-import com.style24.core.support.env.TscConstants.OrderChangeStat;
-import com.style24.core.support.env.TscConstants;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.support.env.TscConstants.OrderChangeGb;
+import com.style24.core.support.env.TscConstants.OrderChangeStat;
+import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.util.CryptoUtils;
+import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.OrderChange;
+import com.style24.persistence.domain.Withdraw;
+import com.style24.persistence.domain.WithdrawExc;
+import com.style24.persistence.domain.WmsWithdraw;
 
-import com.style24.core.support.message.TscMessageByLocale;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 회수관리 Service
@@ -182,9 +180,9 @@ public class TsaWithdrawService {
 		orderChange.setDelvFeeCd(item.getDelvFeeCd());
 		orderChange.setChgGb(item.getChgGb());
 		
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList"); 
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
 		return result;
 	}
 	

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

@@ -181,12 +181,12 @@ public class TsaOrderChangeController extends TsaBaseController {
 		cnclReq.setUserNo(userNo);
 				
 		// 2021.05.14 FRONT 정보 선주문정보조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(cnclReq);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(cnclReq);
 		List<Order> cnclReqList = (List<Order>) refundPreInfo.get("cnclReqList");
 		
 		// 2. 환불금액계산
 		// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현
-		GagaMap map = coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
+		GagaMap map = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		// 3. 주문변경 기본정보 설정
 		map.set("ordNo"						, cnclReq.getOrdNo());						// 주문번호
@@ -239,7 +239,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		}
 		// 취소완료
 		else {
-			result = coreOrderChangeService.partialCancelTemp(map, userNo);
+			result = coreOrderChangeService.partialCancel(map, userNo);
 		}
 		
 		// 5. 취소 알림톡 및 메일 발송
@@ -350,13 +350,13 @@ public class TsaOrderChangeController extends TsaBaseController {
 		rtnReq.setIpAddress(TsaSession.getIpAddress());
 
 		// 2021.05.14 FRONT 정보 선주문정보조회
-		GagaMap refundPreInfo 		= coreOrderChangeService.getRefundPreInfo2(rtnReq);
+		GagaMap refundPreInfo 		= coreOrderChangeService.getRefundPreInfo(rtnReq);
 		List<Order> cnclReqList 	= (List<Order>) refundPreInfo.get("cnclReqList");
 		
 		GagaMap map = new GagaMap();
 		
 		// 3. 환불예상금액계산
-		map = coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
+		map = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		// 4. 주문변경기본정보설정
 		map.set("ordNo"						, rtnReq.getOrdNo());						// 주문번호
@@ -467,11 +467,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 		cnclReq.setRegNo(userNo);
 
 		// 1. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(cnclReq);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(cnclReq);
 		List<Order> cnclReqList = (List<Order>) refundPreInfo.get("cnclReqList");
 		
 		// 2. 환불금액정보 계산 & 조회
-		mav = coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
+		mav = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		return mav;
 	}
@@ -626,7 +626,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("orderInfoList"				, orderInfoList);									// 주문정보
 		mav.addObject("ordNo"						, order.getOrdNo());								// 주문번호
 		mav.addObject("ordChgSq"					, order.getOrdChgSq());								// 주문변경번호
-		mav.addObject("orderDelvAddrInfo"			, coreOrderService.getDeliveryAddrList(order));			// 배송정보
+		mav.addObject("orderDelvAddrInfo"			, coreOrderService.getDeliveryAddrList(order));		// 배송정보
 		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));	// 전화번호국번
 		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));	// (휴대전화)번호국번
 
@@ -739,91 +739,13 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 
 	/**
-	 * 취소요청 (ADMIN, NAPY, 외부몰) (배치) (사용안함)
+	 * 반품TO교환 처리
 	 * 
-	 * @param OrderChange - 주문취소신청정보
-	 * @return
-	 * @author jsh77b
-	 * @since 2021. 01. 20
-	 */
-	// @PostMapping("/cnclReq")
-	// @ResponseBody
-	// public GagaResponse cnclReq(@RequestBody OrderChange cnclReq) {
-	//	
-	// 	GagaMap mav = new GagaMap();
-	//	
-	// 	if (cnclReq== null) {
-	// 		throw new IllegalStateException(message.getMessage("FAIL_1001"));
-	// 	}
-	//	
-	// 	List<Order> cnclReqList = cnclReq.getCancelReqList(); // 취소요청정보목록
-	//	
-	// 	// TODO
-	// 	// @ 결품취소로직 추가
-	// 	// @ 주문취소시 상태값 체크
-	// 	// @ 취소, 반품시 배송비 체크 로직 (선결제 로직)
-	//	
-	// 	// 1. 세션회원조회
-	// 	int userNo = TsaSession.getInfo().getUserNo();
-	//	
-	// 	// 2. 환불금액계산
-	// 	// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현
-	// 	mav = coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
-	//	
-	// 	// 3. 주문변경 기본정보 설정
-	// 	mav.set("ordNo"			, cnclReq.getOrdNo());				// 주문번호
-	// 	mav.set("chgReason"		, cnclReq.getChgReason());			// 변경사유
-	// 	mav.set("chgMemo"		, cnclReq.getChgMemo());			// 변경메모
-	//	
-	// 	mav.set("accountNo"		, cnclReq.getAccountNo());			// 환불계좌번호
-	// 	mav.set("accountNm"		, cnclReq.getAccountNm());			// 환불계좌예금주명
-	// 	mav.set("bankCd"		, cnclReq.getBankCd());				// 환불계좌은행코드
-	//	
-	// 	mav.set("allCanYn"		, cnclReq.getAllCanYn());			// 무통장입금전 전체취소 여부
-	// 	mav.set("isCustomer"	, cnclReq.getIsCustomer());			// 변경사유 (고객, 회사)
-	//	
-	// 	// 4. 주문변경 회수지정보 추가
-	// 	mav.set("chgerNm"		, cnclReq.getChgerNm());			// 변경자명
-	// 	mav.set("chgerEmail"	, cnclReq.getChgerEmail());			// 변경자이메일주소
-	// 	mav.set("chgerPhnno"	, cnclReq.getChgerPhnno());			// 변경자핸드폰번호
-	// 	mav.set("chgerTelno"	, cnclReq.getChgerTelno());			// 변경자전화번호
-	//	
-	// 	mav.set("reqGbn"		, cnclReq.getReqGbn());				// 신청구분
-	//					
-	// 	// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-	// 	coreOrderChangeService.cnclComplete(mav, userNo);
-	//	
-	// 	return super.ok("성공");
-	// }
-	
-	/**
-	 * 취소요청승인 (관리자)
-	 * @param OrderChange - 주문취소신청정보
-	 * @return
-	 * @author jsh77b
-	 * @since 2021. 01. 20
+	 * @param OrderChange
+	 * @return GagaResponse
+	 * @author card007
+	 * @since 2021. 06. 17
 	 */
-	// @PostMapping("/cnclReqComplete")
-	// @ResponseBody
-	// public GagaResponse cnclReqComplete(@RequestBody OrderChange cnclReq) {
-	//	
-	// 	if (cnclReq== null) {
-	// 		throw new IllegalStateException(message.getMessage("FAIL_1001"));
-	// 	}
-	//	
-	// 	// 1. 세션회원조회
-	// 	int userNo = TsaSession.getInfo().getUserNo();
-	//	
-	// 	GagaMap mav = new GagaMap();
-	// 	mav.set("ordNo"			, cnclReq.getOrdNo());
-	// 	mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
-	//	
-	// 	// 2.취소요청철회 
-	// 	mav = coreOrderChangeService.cnclComplete(mav, userNo);
-	//	
-	// 	return super.ok("성공");
-	// }
-	
 	@PostMapping("/return/to/exchange")
 	@ResponseBody
 	public GagaResponse returnToExchange(@RequestBody OrderChange orderChange) {

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

@@ -52,7 +52,7 @@ public class TsaOrderRefundController extends TsaBaseController {
 		}
 		
 		// 1. 환불금액계산
-		mav = orderRefundService.cnclRtnRefundAmt2(cancelReqList);
+		mav = orderRefundService.cnclRtnRefundAmt(cancelReqList);
 		
 		return mav;
 	}

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

@@ -48,13 +48,13 @@
 					<tbody>
 						<tr>
 							<th>교환사유 <i class="star"></i></th>
-							<td th:unless="${ordChgSq > 0}">
+							<td th:if="${ordChgSq <= 0 or chgGb == 'G680_30'}">
 								<select name="selectChgReason" onchange="fnChangeChgReason($(this).val());">
 									<option value="">[선택하세요]</option>
 									<option th:if="${chgReasonList}" th:each="oneData, status : ${chgReasonList}" th:value="|${oneData.cd}:${oneData.cdNm}|" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 								</select>
 							</td>
-							<td th:if="${ordChgSq > 0}" th:id="chgReason"></td>
+							<td th:if="${ordChgSq > 0 and chgGb == 'G680_40'}" th:id="chgReason"></td>
 							<th>귀책사유</th>
 							<td><span id="imputeReason"></span></td>
 						</tr>
@@ -634,8 +634,8 @@ var fnExchange = function () {
 	}
 
 	// 2. 교환사유 체크
-	//var chgReason = $("#exchangeRequestFrm select[name=selectChgReason]").val();
-	var chgReason = $('#exchangeRequestFrm input[name=chgReason]').val();
+	var chgReason = $("#exchangeRequestFrm select[name=selectChgReason]").val();
+	//var chgReason = $('#exchangeRequestFrm input[name=chgReason]').val();
 
 	if (gagajf.isNull(chgReason)) {
 		mcxDialog.alert("교환사유를 입력하세요."); 
@@ -1051,7 +1051,7 @@ $(document).ready(function() {
 		$('input[name=chgerPhnno3]').attr('readOnly', true);			// 8-7. 회수지정보 > 휴대전화
 		$('#chgerRtnMemo').attr('readOnly', true);						// 8-8. 회수지정보 > 반품메모
 		
-		if (chgGb == 'G685_40') {
+		if (chgGb == 'G680_40') {
 			$('#chgMemo').attr('readOnly', true);							// 8-2. 요청메모
 			$('input[name=recipNm]').attr('readOnly', true);				// 8-9. 교환지정보 > 받는사람
 			$('input[name=recipBaseAddr]').attr('readOnly', true);			// 8-10. 교환지정보 > 기본주소