Merge branch 'card007' into develop

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

@@ -12,6 +12,7 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscWmsService;
+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;
@@ -82,12 +83,8 @@ public class TsaOrderChangeService {
 	 */
 	@Transactional("shopTxnManager")
 	public void returnToReturn(OrderChange orderChange) {
-		int userNo = orderChange.getUserNo();
-		orderChange.setRegNo(userNo);
-		orderChange.setUpdNo(userNo);
-
 		// 1. 반품 철회 처리
-		this.returnCancel(orderChange);
+		GagaMap result = this.returnCancel(orderChange);
 
 		// 2. WMS 회수지시 여부 체크 후 회시지시대상여부 컬럼 정보 설정
 		orderChange.setWdTargetYn(this.getWdTargetYnInfo(orderChange));
@@ -102,6 +99,9 @@ public class TsaOrderChangeService {
 		GagaMap map = this.getReturnInfo(orderChange);
 		
 		// 6. 반품 접수 처리
+		map.setString("ordChgGb", orderChange.getOrdChgGb());
+		map.setInt("orgOrdChgSq", orderChange.getOrdChgSq());
+		map.setInt("orgAddPayCost", result.getInt("orgAddPayCost"));
 		coreOrderChangeService.returnRequest(map);
 	}
 
@@ -141,12 +141,16 @@ public class TsaOrderChangeService {
 	 * @author card007
 	 * @since 2021. 06. 21
 	 */
-	private void returnCancel(OrderChange orderChange) {
+	private GagaMap returnCancel(OrderChange orderChange) {
 		GagaMap map = new GagaMap();
 		map.setInt("ordChgSq", orderChange.getOrdChgSq());
 		map.setInt("ordNo", orderChange.getOrdNo());
+		
+		if (TscConstants.ChangeGb.RETURN_TO_RETURN.value().equals(orderChange.getOrdChgGb())) {
+			map.setString("ordChgGb", orderChange.getOrdChgGb());
+		}
 
-		coreOrderChangeService.rtnReqCancel(map, orderChange.getUserNo());
+		return coreOrderChangeService.rtnReqCancel(map, orderChange.getUserNo());
 	}
 
 	/**
@@ -161,7 +165,7 @@ public class TsaOrderChangeService {
 	}
 
 	/**
-	 * 회시지시대상여부 컬럼 정보 설정
+	 * 회수지시대상여부 컬럼 정보 설정
 	 * 
 	 * @param OrderChange
 	 * @return String

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

@@ -899,6 +899,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		orderChange.setUserNo(userNo);
 		orderChange.setRegNo(userNo);
 		orderChange.setUpdNo(userNo);
+		orderChange.setOrdChgGb(TscConstants.ChangeGb.RETURN_TO_RETURN.value());
 
 		orderChangeService.returnToReturn(orderChange);
 
@@ -920,6 +921,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		orderChange.setUserNo(userNo);
 		orderChange.setRegNo(userNo);
 		orderChange.setUpdNo(userNo);
+		orderChange.setOrdChgGb(TscConstants.ChangeGb.EXCHANGE_TO_EXCHANGE.value());
 
 		orderChangeService.exchangeToExchange(orderChange);