취소개발중 수정

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

@@ -182,6 +182,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		// 4. 주문변경 회수지정보 추가
 		mav.set("chgerNm"		, cnclReq.getChgerNm());			// 변경자명
+		mav.set("chgerEmail"	, cnclReq.getChgerEmail());			// 변경자이메일주소
 		mav.set("chgerPhnno"	, cnclReq.getChgerPhnno());			// 변경자핸드폰번호
 		mav.set("chgerTelno"	, cnclReq.getChgerTelno());			// 변경자전화번호
 				
@@ -268,6 +269,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		// 4. 주문변경 회수지정보 추가
 		mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
+		mav.set("chgerEmail"	, rtnReq.getChgerEmail());			// 변경자이메일주소
 		mav.set("chgerZipNo"	, rtnReq.getChgerZipNo());			// 회수지우편번호
 		mav.set("chgerBaseAddr"	, rtnReq.getChgerBaseAddr());		// 회수지기본주소
 		mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
@@ -280,6 +282,28 @@ public class TsaOrderChangeController extends TsaBaseController {
 		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 = coreOrderRefundService.cnclRtnRefundAmt(cancelReqList);
+		
+		return mav;
+	}
 	
 	
 	

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

@@ -632,13 +632,13 @@ var columnDefsOrderChangeInfo = [
 		, cellRenderer	: function (params) {
 			var rtnStr = ""
 			
-				if (params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_40' ) {
+			if (params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_40' ) {
 				// 배송지 수정 (주문배송, 교환배송)
 				rtnStr += params.value;			
 				rtnStr += "<button type=\"button\" style=\"margin-left:10px\" class=\"btn btn-info\" onclick=\"fnOpenDaumAddr('" + params.node.rowIndex + "', 'CLAIM');\">POST</button>";
 				rtnStr += "<button type=\"button\" class=\"btn btn-info\" onclick=\"fnSaveChgerAddr('" + params.node.rowIndex + "');\">저장</button>";
 			} else {
-				rtnStr += params.value;
+				rtnStr = "";
 			}
 			
 			return rtnStr;