Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

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

@@ -105,10 +105,12 @@ public class TsaOrderChangeService {
 		GagaMap map = this.getReturnInfo(orderChange);
 		
 		// 6. 반품 접수 처리
-		map.setString("ordChgGb", orderChange.getOrdChgGb());
-		map.setInt("orgOrdChgSq", orderChange.getOrdChgSq());
-		map.setString("wdTargetYn", orderChange.getWdTargetYn());
-		map.setInt("orgAddPayCost", result.getInt("orgAddPayCost"));
+		map.setString("ordChgGb"	, orderChange.getOrdChgGb());
+		map.setInt("orgOrdChgSq"	, orderChange.getOrdChgSq());
+		map.setString("wdTargetYn"	, orderChange.getWdTargetYn());
+		map.setInt("orgAddPayCost"	, result.getInt("orgAddPayCost"));
+		map.setInt("regNo"			, orderChange.getRegNo());
+		map.setInt("updNo"			, orderChange.getUpdNo());
 		coreOrderChangeService.returnRequest(map);
 	}
 

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

@@ -602,11 +602,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 		map.set("payMeans"					, refundPreInfo.getString("payMeans"));		// 결제수단
 		map.set("pgGb"						, refundPreInfo.getString("pgGb"));			// PG구분
 		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호
-		map.set("regNo"						, userNo);	
-		map.set("updNo"						, userNo);	
-		
-		
-		
+		map.set("regNo"						, userNo);
+		map.set("updNo"						, userNo);
+
 		// 4. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
 		GagaMap result = coreOrderChangeService.returnRequest(map);
 		int ordChgSq = result.getInt("ordChgSq");