관리자 주문취소 개발중 ... 언제 끝날려나

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaOrderDao.java

@@ -35,15 +35,6 @@ public interface TsaOrderDao {
 	 */
 	Collection<Order> getOrderList(Order order);
 	
-	/**
-	 * 주문리스트 합계
-	 *
-	 * @param Order
-	 * @author jsh77b
-	 * @since 2020. 11. 18
-	 */
-	Order getOrderListSumInfo(Order order);
-	
 	/**
 	 * 주문기본정보
 	 *
@@ -399,6 +390,16 @@ public interface TsaOrderDao {
 	 */
 	int createOrderDetailItemHst(Order order);
 	
+	/**
+	 * 주문상세 > 주문취소신청 > 주문상세정보(취소,반품) 이력 등록
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 12. 22
+	 */
+	int createOrderDetailHstCnclRtn(Order order);
+
 	/**
 	 * 주문상세 > 주문취소신청 > 주문상세정보 수정
 	 *
@@ -410,14 +411,64 @@ public interface TsaOrderDao {
 	int updateOrderDetail(Order order);
 	
 	/**
-	 * 주문상세 > 주문취소신청 > 주문상세정보 수정
+	 * 주문상세 > 주문취소신청 > 주문 환불 정보 등록
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 12. 22
+	 */
+	int createRefund(Order order);
+	
+	/**
+	 * 주문상세 > 주문취소신청 > 주문 환불 금액 정보 등록
 	 *
 	 * @param Order - 주문 정보
 	 * @return
 	 * @author jsh77b
 	 * @since 2020. 12. 22
 	 */
-	int createOrderDetailhst(Order order);
+	int createPayment(Order order);
+	
+	/**
+	 * 주문상세 > 주문취소신청 > 주문 추가 배송 금액 등록
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 01. 06
+	 */
+	int createDeliveryFee(Order order);
+	
+	/**
+	 * 고객환불계좌 정보 조회
+	 *
+	 * @param order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 01. 04
+	 */
+	Collection<Order> getRefundAccount(Order order);
+	
+	/**
+	 * 환불계좌 존재 유무 체크
+	 *
+	 * @param order
+	 * @return int
+	 * @author jsh77b
+	 * @since 2021. 01. 05
+	 */
+	int getRefundAccountCheck(Order order);
+	
+	/**
+	 * 환불계좌 저정
+	 *
+	 * @param order
+	 * @return int
+	 * @author jsh77b
+	 * @since 2021. 01. 05
+	 */
+	int saveRefundAccount(Order order);
 	
 	
 }

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

@@ -66,32 +66,7 @@ public class TsaOrderService {
 	public Collection<Order> getOrderList(Order order) {
 		return orderDao.getOrderList(order);
 	}
-	
-	/**
-	 * 주문리스트 합계
-	 *
-	 * @param order
-	 * @return Order - 합계정보
-	 * @author jsh77b
-	 * @since 2020. 11. 18
-	 */
-	public Order getOrderListSumInfo(Order order) {
-		// multi row 검색관련 처리
-		if (StringUtils.isNotBlank(order.getCondition())) {
-			TsitUtil tsitUtil = new TsitUtil();
-			String searchCondition = tsitUtil.replaceMultiSelectParamsArr(order.getCondition());
-			order.setConditions(searchCondition.split(","));
-		}
 
-		// 외부몰권한일 때 외부몰벤더ID 설정
-		//if (TsaSession.getInfo().getRoleCd().startsWith("C")) {
-			//order.setMallGb(TsaConstants.MallGb.EXTMALL.value());
-			//order.setVendorId(TsaSession.getInfo().getVendorId());
-		//}
-		
-		return orderDao.getOrderListSumInfo(order);
-	}
-	
 	/**
 	 * 주문기본정보
 	 *
@@ -592,7 +567,7 @@ public class TsaOrderService {
 	}
 	
 	/**
-	 * 주문상세 > 주문취소대상목록
+	 * 주문상세 > 주문취소 환불 금액 계산
 	 * @param Order
 	 * @return Order
 	 * @author jsh77b
@@ -601,6 +576,7 @@ public class TsaOrderService {
 	public GagaMap orderCancelRefundAmt(List<Order> cancelReqList) {
 		GagaMap mav = new GagaMap();
 		
+		// 1. 변수설정
 		int spanPayAmt			= 0; // 총 결제 금액
 		int spanSumRealOrdAmt	= 0; // 상품 실결제 금액
 		int spanSumDeliveryFee	= 0; // 배송금액
@@ -621,14 +597,14 @@ public class TsaOrderService {
 		int spanTotDeliveryFee	= 0; // 환불 배송 금액
 		int spanRefundAmt		= 0; // 환불 금액 합계
 		
-		List<Order> cancelOrderRefundList = new ArrayList<Order>();		// 주문환불금액목록
+		List<Order> cancelOrderRefundList 	= new ArrayList<Order>();	// 주문환불금액목록
 		List<Order> cancelDelvRefundList 	= new ArrayList<Order>();	// 주문환불배송금액목록
 		
 		Order orderObj	= new Order();
 		Order delvObj	= new Order();
 		int k 			= 0 ;
 		
-		// 최초의 배송정보를 설정
+		// 2. 초기 배송정보 설정
 		delvObj.setOrdAmt(0);
 		delvObj.setCnclRtnAmt(0);
 		delvObj.setRealOrdAmt(0);
@@ -639,11 +615,12 @@ public class TsaOrderService {
 		delvObj.setDelvFeeCd(cancelReqList.get(k).getDelvFeeCd());
 		delvObj.setAllCanYn(cancelReqList.get(k).getAllCanYn());
 		cancelDelvRefundList.add(delvObj);
-
+		
+		// 3. 취소신청수량 정보를 취소 환불 금액 계산
 		for (Order oneData : cancelReqList) {
 			orderObj	= new Order();
 			
-			// 주문정보설정
+			// 3.1 주문기본정보 설정
 			orderObj.setItemQty(oneData.getItemQty());
 			orderObj.setOrdQty(oneData.getOrdQty());
 			orderObj.setCnclRtnQty(oneData.getCnclRtnQty());
@@ -663,22 +640,26 @@ public class TsaOrderService {
 			orderObj.setOptCd1(oneData.getOptCd1());
 			orderObj.setOptCd2(oneData.getOptCd2());
 			
+			// 3.2 주문취소수량으로 취소율 정보 설정
 			int ordQty 			= oneData.getOrdQty();
 			int itemQty 		= oneData.getItemQty();
 			int ordCanChgQty 	= oneData.getOrdCanChgQty();
 			
-			// 취소금액계산
+			float _appQty		= (float)ordCanChgQty / (float)ordQty;
+			
+			// 3.3 주문취소금액 & 취소할인금액 계산
 			orderObj.setCnclRtnAmt(((oneData.getItemPrice() + oneData.getOptAddPrice()) * itemQty) * ordCanChgQty);
-			orderObj.setCpn1DcAmt(oneData.getCpn1DcAmt() 			* (ordCanChgQty/ordQty));
-			orderObj.setTmtb1DcAmt(oneData.getTmtb1DcAmt() 			* (ordCanChgQty/ordQty));
-			orderObj.setTmtb2DcAmt(oneData.getTmtb2DcAmt() 			* (ordCanChgQty/ordQty));
-			orderObj.setGoodsCpnDcAmt(oneData.getGoodsCpnDcAmt() 	* (ordCanChgQty/ordQty));
-			orderObj.setCartCpnDcAmt(oneData.getCartCpnDcAmt() 		* (ordCanChgQty/ordQty));
-			orderObj.setPntDcAmt(oneData.getPntDcAmt() 				* (ordCanChgQty/ordQty));
-			orderObj.setPrePntDcAmt(oneData.getPrePntDcAmt() 		* (ordCanChgQty/ordQty));
-			orderObj.setGfcdUseAmt(oneData.getGfcdUseAmt() 			* (ordCanChgQty/ordQty));
+			orderObj.setCpn1DcAmt((int)(oneData.getCpn1DcAmt() 				* _appQty));
+			orderObj.setTmtb1DcAmt((int)(oneData.getTmtb1DcAmt() 			* _appQty));
+			orderObj.setTmtb2DcAmt((int)(oneData.getTmtb2DcAmt() 			* _appQty));
+			orderObj.setGoodsCpnDcAmt((int)(oneData.getGoodsCpnDcAmt() 		* _appQty));
+			orderObj.setCartCpnDcAmt((int)(oneData.getCartCpnDcAmt() 		* _appQty));
+			orderObj.setPntDcAmt((int)(oneData.getPntDcAmt() 				* _appQty));
+			orderObj.setPrePntDcAmt((int)(oneData.getPrePntDcAmt() 			* _appQty));
+			orderObj.setSavePntAmt((int)(oneData.getSavePntAmt() 			* _appQty));
+			orderObj.setGfcdUseAmt((int)(oneData.getGfcdUseAmt() 			* _appQty));
 			
-			// 취소할인금액
+			// 3.4 취소할인합계금액 적용
 			int dcTotAmt		= 0;
 			dcTotAmt			+= orderObj.getTmtb1DcAmt();
 			dcTotAmt			+= orderObj.getTmtb2DcAmt();
@@ -689,10 +670,10 @@ public class TsaOrderService {
 			dcTotAmt			+= orderObj.getCpn1DcAmt();
 			dcTotAmt			+= orderObj.getGfcdUseAmt();
 			
-			// 취소환불금액
+			// 3.5 주문취소환불금액 계산
 			orderObj.setRealOrdAmt(orderObj.getCnclRtnAmt() - dcTotAmt);
 			
-			// 배송관련 설정		
+			// 3.6 배송정보 관련 설정		
 			orderObj.setOrdDtlNo(oneData.getOrdDtlNo());
 			orderObj.setGoodsTypeNm(oneData.getGoodsTypeNm());
 			orderObj.setDelvFee(oneData.getDelvFee());
@@ -701,14 +682,14 @@ public class TsaOrderService {
 			orderObj.setMinOrdAmt(oneData.getMinOrdAmt());
 			orderObj.setOrgDelvFee(oneData.getOrgDelvFee());
 			
-			// 주문상세상태
+			// 3.7 주문상세상태체크
 			orderObj.setOrdDtlStat(oneData.getOrdDtlStat());
 			orderObj.setOrdDtlStatNm(oneData.getOrdDtlStatNm());
-			orderObj.setAllCanYn(oneData.getAllCanYn());
+			orderObj.setAllCanYn(oneData.getAllCanYn()); // 전체취소 여부 (기존의 취소 또는 출고, 반품, 교환 의 경우에는 전체취소 불가능)
 			
 			cancelOrderRefundList.add(orderObj);
 			
-			// 배송비 정책 기준으로 조건 처리
+			// 3.8 배송업체 & 배송비정책 조건으로 추가 배송비 금액 설정
 			if (cancelDelvRefundList.get(k).getSupplyCompCd().equals(orderObj.getSupplyCompCd()) && cancelDelvRefundList.get(k).getDelvFeeCd().equals(orderObj.getDelvFeeCd())) {
 				// 공급업체 와 배송정책코드가 같으면 주문금액, 취소금액 SUM
 				cancelDelvRefundList.get(k).setOrdAmt(cancelDelvRefundList.get(k).getOrdAmt() + orderObj.getOrdAmt());
@@ -738,6 +719,7 @@ public class TsaOrderService {
 				cancelDelvRefundList.add(delvObj);
 			}
 			
+			// 3.9 FRONT 화면에서 상용 하는 변수 값 설정 & 계산
 			spanSumRealOrdAmt	+= oneData.getRealOrdAmt();
 			spanPntDcAmt		+= orderObj.getPntDcAmt();
 			spanPrePntDcAmt		+= orderObj.getPrePntDcAmt();
@@ -750,27 +732,35 @@ public class TsaOrderService {
 			spanRealCnclRtnAmt	+= orderObj.getRealOrdAmt();
 		}
 		
-		// 추가배송비 발생여부 , 추가배송비, 배송비정책단위 전체취소 여부
+		// 4. 추가배송비 발생여부, 추가배송비, 배송비정책단위 전체취소 여부 체크
 		for (int i=0 ; i<cancelDelvRefundList.size() ; i++) {
 			Order obj = cancelDelvRefundList.get(i);
 			
-			// 무료배송비용 > (주문금액 - 취소금액)
+			// 4.1 무료배송비용 > (주문금액 - 취소금액)
 			if (obj.getMinOrdAmt() > (obj.getOrdAmt() - obj.getCnclRtnAmt())) {
-				// 2020.12.28 
-				// case : 배송정책 기준으로 1,2 상품 주문 후 1번 출고 후 1번반품 2번취소 할 경우 전체 취소 가 아니므로 배송비 부과 있을지 모르겠음 주문업체 단위로 배송되기 때문에 발생하지 않을것 같음
-				if ((obj.getOrdAmt() - obj.getCnclRtnAmt()) == 0) {
-					if ("N".equals(obj.getAllCanYn())) {
+				
+				// 4.2 주문시 배송비가 존재하면 추가 배송비 없음
+				if (obj.getDelvFee() > 0) {
+					obj.setAddDelvFeeYn("N");
+					obj.setAddDelvFee(0);
+				} else {
+					// 4.3 주문금액 - 취소금액 == 0 이면 전체취소 이므로 배송비 발생 안함
+					// * 2020.12.28 
+					// * case : 배송정책 기준으로 1,2 상품 주문 후 1번 출고 후 1번반품 2번취소 할 경우 전체 취소 가 아니므로 배송비 부과 있을지 모르겠음 주문업체 단위로 배송되기 때문에 발생하지 않을것 같음
+					if ((obj.getOrdAmt() - obj.getCnclRtnAmt()) == 0) {
+						if ("N".equals(obj.getAllCanYn())) {
+							obj.setAddDelvFeeYn("Y");
+							obj.setAddDelvFee(obj.getOrgDelvFee());
+						} else {
+							// 4.4 전체취소의 경우에 해당
+							obj.setAddDelvFeeYn("N");
+							obj.setAddDelvFee(0);
+						}
+					} else {
+						// 4.5 추가배송비 발생 (취소신청화면에서 대부분 아래의 조건에 해당)
 						obj.setAddDelvFeeYn("Y");
 						obj.setAddDelvFee(obj.getOrgDelvFee());
-					} else {
-						// 전체취소의 경우에 해당
-						obj.setAddDelvFeeYn("N");
-						obj.setAddDelvFee(0);
 					}
-				} else {
-					// 취소신청화면에서 대부분 아래의 조건에 해당
-					obj.setAddDelvFeeYn("Y");
-					obj.setAddDelvFee(obj.getOrgDelvFee());
 				}
 			} else {
 				obj.setAddDelvFeeYn("N");
@@ -785,6 +775,7 @@ public class TsaOrderService {
 			cancelDelvRefundList.set(i, obj);
 		}
 		
+		// 5. FRONT 화면엣 필요한 금액 설정
 		// 2020.12.30 프론트에서 필요한 부분 작업 필여
 		// 관리자 화면에서 사용하는 환불 칼럼 정보
 		// 환불금액표시
@@ -794,6 +785,7 @@ public class TsaOrderService {
 		spanTmtbDcAmt 		= spanTmtb1DcAmt + spanTmtb2DcAmt;
 		spanRefundAmt 		= spanRealCnclRtnAmt - spanTotDeliveryFee;
 
+		mav.set("cancelReqList"			, cancelReqList);			//주문 취소 신청 목록
 		mav.set("cancelOrderRefundList"	, cancelOrderRefundList);	//주문 환불 금액 목록
 		mav.set("cancelDelvRefundList"	, cancelDelvRefundList);	//주문 환불 배송 금액 목록
 		mav.set("spanPayAmt"			, spanPayAmt);				//총 결제 금액
@@ -819,16 +811,6 @@ public class TsaOrderService {
 		return mav;
 	}
 	
-	// 문자의 오른쪽으로 숫자만큼 공백 삽인
-	private static String padRight(String s, int n) {
-		return String.format("%-" + n + "s", s);
-	}
-	
-	// 문자의 왼쪽으로 숫자만큼 공백 삽인
-	private static String padLeft(String s, int n) {
-		return String.format("%" + n + "s", s);
-	}
-	
 	/**
 	 * 주문상세 > 주문취소
 	 * @param Order
@@ -843,12 +825,15 @@ public class TsaOrderService {
 		int userNo = TsaSession.getInfo().getUserNo();
 		
 		// 2. 취소요정정보목록
-		List<Order> cancelOrderRefundList = (List<Order>) mav.get("cancelOrderRefundList");
-		
+		List<Order> cancelReqList		 	= (List<Order>) mav.get("cancelReqList");			//주문 취소 신청 목록
+		List<Order> cancelOrderRefundList 	= (List<Order>) mav.get("cancelOrderRefundList");	//주문 환불 금액 목록
+		List<Order> cancelDelvRefundList 	= (List<Order>) mav.get("cancelDelvRefundList");	//주문 환불 배송 금액 목록
+				
 		// 3. 취소신청정보
 		int ordNo 			= Integer.parseInt(mav.getString("ordNo").toString());
 		String chgReason 	= mav.getString("chgReason").toString();
 		String chgMemo 		= mav.getString("chgMemo").toString();
+		String allCanYn		= mav.getString("allCanYn").toString();
 		String chgGb		= "G680_20";
 		
 		// 4.1 주문변경 기본정보 등록
@@ -864,42 +849,176 @@ public class TsaOrderService {
 		
 		orderDao.createOrderChange(orderChange);
 		
-		// 4.2 주문변경 상세 정보 등록
+		List<Order> cancelOrderDetailList = new ArrayList<Order>();
+		
+		// 4.2 주문변경 상세 단품 정보 등록 (단품단위)
 		for (int i=0 ; i<cancelOrderRefundList.size() ; i++) {
 			Order vo = cancelOrderRefundList.get(i);
 			vo.setRegNo(userNo);
 			vo.setUpdNo(userNo);
-			vo.setOrdDtlStat("G685_21");
 			
+			// 2020.01.05 추후 무통장입금전 전체 취소시 분기로직 추가 예정
+			if ("Y".equals(allCanYn)) {
+				vo.setOrdDtlStat("G013_98"); // 결제전주문취소 : 공통코드로관리예정
+			} else {
+				vo.setOrdDtlStat("G013_99"); // 결제후주문취소 : 공통코드로관리예정
+			}
+
 			// 4.2.1 취소수량이 존재하면 주문정보 수정 및 주문변경정보 등록
 			if (vo.getOrdCanChgQty() > 0) {
-				OrderChange po = new OrderChange();
-				
-				po.setOrdChgSq(orderChange.getOrdChgSq());
-				po.setOrdDtlNo(vo.getOrdDtlNo());
-				po.setChgQty(vo.getOrdCanChgQty());
-				po.setChgStat("G685_21");
-				po.setRegNo(userNo);
-				po.setUpdNo(userNo);
-				
-				// 4.2.2 주문변경상세정보 등록
-				orderDao.createOrderChangeDetail(po);
-				
 				// 4.2.3 주문상세단품정보 수정
 				orderDao.updateOrderDetailItem(vo);
 				
 				// 4.2.4 주문상세단품정보 이력 등록
 				orderDao.createOrderDetailItemHst(vo);
 				
-				// 4.2.5 주문변경상세정보 수정
-				orderDao.updateOrderDetail(vo);
+				// 4.3 주문변경 상세 단위로 데이타 등록 (ORD_DTL_NO)
+				Boolean temp = false;
+				
+				if (cancelOrderDetailList.size() > 0) {
+					for (int j=0 ; j<cancelOrderDetailList.size() ; j++) {
+						if (vo.getOrdDtlNo() == cancelOrderDetailList.get(j).getOrdDtlNo()) {
+							temp = true;
+						}
+					}
+				}
+				
+				// 4.4 주문상세단위 데이타 저장
+				if (!temp) {
+					cancelOrderDetailList.add(vo);
+				}
+			}
+		}
+		
+		// 5. 주문상세단위 취소 데이타 처리
+		for (int i=0 ; i<cancelOrderDetailList.size() ; i++) {			
+			Order vo = cancelOrderRefundList.get(i);
+			vo.setRegNo(userNo);
+			vo.setUpdNo(userNo);
+			
+			// 2020.01.05 추후 무통장입금전 전체 취소시 분기로직 추가 예정
+			if ("Y".equals(allCanYn)) {
+				vo.setOrdDtlStat("G013_98"); // 결제전주문취소 : 공통코드로관리예정
+			} else {
+				vo.setOrdDtlStat("G013_99"); // 결제후주문취소 : 공통코드로관리예정
+			}
+			
+			// 5.1 주문변경상세정보 이력 등록
+			orderDao.createOrderDetailHstCnclRtn(vo);
+			
+			// 4.2 주문변경상세정보 수정
+			orderDao.updateOrderDetail(vo);
+			
+			// * 주문상세단위가 아닌 주문상세단품단위로 데이타가 처리되고 있었음
+			// 5.3 주문변경상세정보 등록
+			OrderChange po = new OrderChange();
+			po.setOrdChgSq(orderChange.getOrdChgSq());
+			po.setOrdDtlNo(vo.getOrdDtlNo());
+			po.setChgQty(vo.getOrdCanChgQty());
+			po.setChgStat("G685_21"); // 취소완료 : 공통코드로관리예정
+			po.setRegNo(userNo);
+			po.setUpdNo(userNo);
+			
+			orderDao.createOrderChangeDetail(po);
+		}
+		
+		// 6. 환불결제 정보 등록
+		Order paymentOrder = new Order();
+		paymentOrder.setOrdNo(ordNo);
+		paymentOrder.setPayAmt(Integer.parseInt(mav.get("spanRefundAmt").toString()) * -1);
+		paymentOrder.setPayStat("G016_99");
+		paymentOrder.setOrdChgSq(orderChange.getOrdChgSq());
+		paymentOrder.setRegNo(userNo);
+		paymentOrder.setUpdNo(userNo);
+		
+		orderDao.createPayment(paymentOrder);
+		
+		// 7. 환불금액 등록
+		Order refundOrder = new Order();
+		refundOrder.setOrdNo(ordNo);
+		refundOrder.setPaySq(paymentOrder.getPaySq());
+		refundOrder.setOrdChgSq(orderChange.getOrdChgSq());
+		refundOrder.setRegNo(userNo);
+		
+		refundOrder.setRefundAmt(Integer.parseInt(mav.get("spanRefundAmt").toString()));
+		refundOrder.setRfCpn1Amt(Integer.parseInt(mav.get("spanCpn1DcAmt").toString()));
+		refundOrder.setRfTmtb1Amt(Integer.parseInt(mav.get("spanTmtb1DcAmt").toString()));
+		refundOrder.setRfTmtb2Amt(Integer.parseInt(mav.get("spanTmtb2DcAmt").toString()));
+		refundOrder.setRfGoodsCpnAmt(Integer.parseInt(mav.get("spanGoodsCpnDcAmt").toString()));
+		refundOrder.setRfCartCpnAmt(Integer.parseInt(mav.get("spanCartCpnDcAmt").toString()));
+		refundOrder.setRfPntAmt(Integer.parseInt(mav.get("spanPntDcAmt").toString()));
+		refundOrder.setRfPrePntAmt(Integer.parseInt(mav.get("spanPrePntDcAmt").toString()));
+		refundOrder.setRfGfcdUseAmt(Integer.parseInt(mav.get("spanGfcdUseAmt").toString()));
+		
+		refundOrder.setRaNo(mav.get("accountNo").toString());
+		refundOrder.setRaNm(mav.get("accountNm").toString());
+		refundOrder.setRaBank(mav.get("bankCd").toString());
+		
+		orderDao.createRefund(refundOrder);
+		
+		// 8. 결제금액이 무료배송금액보다 작으면 배송비 신규 등록
+		for (int i=0 ; i<cancelDelvRefundList.size() ; i++) {
+			Order vo = cancelDelvRefundList.get(i);
+			
+			if (vo.getAddDelvFee() > 0) {
+				Order delvFeeOrder = new Order();
 				
-				// 4.2.6 주문변경상세정보 이력 등록
-				orderDao.createOrderDetailhst(vo);
+				delvFeeOrder.setPaySq(paymentOrder.getPaySq());
+				delvFeeOrder.setOrdNo(ordNo);
+				delvFeeOrder.setDelvFeeGb("G018_10");
+				delvFeeOrder.setDelvFeeCd(vo.getDelvFeeCd());
+				delvFeeOrder.setDelvFee(vo.getAddDelvFee());
+				delvFeeOrder.setRealDelvAmt(vo.getDelvFee());
+				delvFeeOrder.setOrdChgSq(orderChange.getOrdChgSq());
+				delvFeeOrder.setSupplyCompCd(vo.getSupplyCompCd());
+				delvFeeOrder.setRegNo(userNo);
+				delvFeeOrder.setUpdNo(userNo);
 				
-				int a = 100/0;
+				orderDao.createDeliveryFee(delvFeeOrder);
 			}
 		}
+
+		// 9. 포인트원복
+		
+		// 10. 쿠폰원복 (상품쿠폰)
+		
+		// 11. 사은품 취소
+		
+		// 12. 재고원복
+		
+		// 13. PG 연동
+		
+		//int a = 100/0;
+	}
+	
+	/**
+	 * 주문 환불계좌
+	 *
+	 * @param order - 주문정보
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 01. 04.
+	 */
+	public Collection<Order> getRefundAccount(Order order) {
+		return orderDao.getRefundAccount(order);
+	}
+	
+	/**
+	 * 환불계좌 저장
+	 *
+	 * @param order - 주문정보
+	 * @return TsaOrder
+	 * @author jsh77b
+	 * @since 2021. 01. 05.
+	 */
+	public int saveRefundAccount(Order order) {
+		
+		// 환불계좌 유무 체크 후 등록
+		if (orderDao.getRefundAccountCheck(order) < 1) {
+			orderDao.saveRefundAccount(order);
+		}
+		
+		return 1;
 	}
 	
 }

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

@@ -34,7 +34,6 @@ import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.CommonCode;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 
@@ -176,20 +175,6 @@ public class TsaOrderController extends TsaBaseController {
  
 		return orderList;
 	}
-	
-	/**
-	 * 주문 목록 데이타 합산
-	 *
-	 * @param order - 주문정보
-	 * @return Collection<Order>
-	 * @author jsh77b
-	 * @since 2020. 11. 16
-	 */
-	@PostMapping("/list/sum/info")
-	@ResponseBody
-	public Order getOrderListSumInfo(@RequestBody Order order) {
-		return orderService.getOrderListSumInfo(order);
-	}
 
 	/**
 	 * 주문상세 화면
@@ -644,16 +629,17 @@ public class TsaOrderController extends TsaBaseController {
 		
 		Collection<Order> cancelRequestTargetList = orderService.getCancelRequestTargetList(order);
 
-		//Order orderInfo = orderService.getOrderInfo(order);
+		Order orderInfo = orderService.getOrderInfo(order);
 
 		//mav.addObject("nicePay", nicePay);
 		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G686"));	// 취소사유
 		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);							// 취소요청대상 목록
-		//mav.addObject("orderInfo"					, orderInfo);										// 주문정보
+		mav.addObject("orderInfo"					, orderInfo);										// 주문정보
 		mav.addObject("ordNo"						, ordNo);
 		mav.addObject("cncWait"						, cncWait);
 
 		mav.setViewName("order/CancelRequestForm");
+		
 		return mav;
 	}
 	
@@ -707,11 +693,99 @@ public class TsaOrderController extends TsaBaseController {
 		mav.set("chgReason"		, cancelReq.getChgReason());
 		mav.set("chgMemo"		, cancelReq.getChgMemo());
 		
+		mav.set("accountNo"		, cancelReq.getAccountNo());
+		mav.set("accountNm"		, cancelReq.getAccountNm());
+		mav.set("bankCd"		, cancelReq.getBankCd());
+		
+		mav.set("allCanYn"		, cancelReq.getAllCanYn());
+		
 		// 3. 주문변경 DB 등록 (주문정보, 배송정보)
 		orderService.orderCancel(mav);
 		
 		return super.ok("성공");
 	}
+	
+	/**
+	 * 환불계좌등록 화면
+	 *
+	 * @param ordNo - 주문번호
+	 * @param custNo - 고객고유번호
+	 * @return ModelAndView
+	 * @author jsh77b
+	 * @since 2021. 01. 04.
+	 */
+	@GetMapping("/refund/account/create/form")
+	public ModelAndView refundAccountCreateForm(@RequestParam(value = "ordNo") int ordNo) {
+		ModelAndView mav = new ModelAndView();
+		Order order = new Order();
+		order.setOrdNo(ordNo);
+
+		Order orderBasic 						= orderService.getOrderInfo(order);
+		Collection<Order> orderRfAccountInfo 	= orderService.getRefundAccount(order);
+
+		mav.addObject("bankList"				, rendererService.getCommonCodeList("G940"));
+		mav.addObject("orderRfAccountInfo"		, orderRfAccountInfo);
+		mav.addObject("orderBasic"				, orderBasic);
+
+		mav.setViewName("order/RefundAccountRegistForm");
+		
+		return mav;
+	}
+	
+	/**
+	 * 환불계좌 저장
+	 *
+	 * @param order - 환불계좌정보
+	 * @return GagaResponse
+	 * @author jsh77b
+	 * @since 2021. 01. 04.
+	 */
+	@PostMapping("/account/save")
+	@ResponseBody
+	public GagaResponse saveRefundAccount(@RequestBody Order order) {
+		
+		int userNo = TsaSession.getInfo().getUserNo();
+		order.setUpdNo(userNo);
+		order.setRegNo(userNo);
+		
+		/*
+		NicePay nicePay = new NicePay();
+		nicePay.setInAccount(order.getRaNo());
+		nicePay.setInBankCode(order.getRaBnk());
+		nicePay.setRaNm(order.getRaNm());
+		String accountCheck = nicepay.checkBankAccount(nicePay);
+		*/
+		
+		String accountCheck = "Y";
+
+		if ("Y".equals(accountCheck)) {
+			orderService.saveRefundAccount(order);
+		} else {
+			throw new IllegalStateException("환불계좌정보가 맞지 않습니다!");
+		}
+
+		return super.ok(message.getMessage("SUCC_0001"));
+	}
+	
+	/**
+	 * 환불계좌정보
+	 *
+	 * @param ordNo - 주문번호
+	 * @param custNo - 고객고유번호
+	 * @return Collection<TsaOrder>
+	 * @author jsshin
+	 * @since 2020. 10. 16.
+	 */
+	@GetMapping("/refund/account/info/list")
+	@ResponseBody
+	public Collection<Order> getRefundAccountInfoList(@RequestParam(value = "ordNo") int ordNo) {
+		Order order = new Order();
+		order.setOrdNo(ordNo);
+
+		Collection<Order> orderRfAccountInfo = orderService.getRefundAccount(order);
+
+		return orderRfAccountInfo;
+	}
 }
 
 

style24.admin/src/main/java/com/style24/persistence/domain/Order.java

@@ -24,9 +24,7 @@ public class Order extends TscBaseDomain {
 	private String payDt;
 	private int custNo;
 	private String ordNm;
-	private String ord_phnno;
-	private String ord_telno;
-	private String ord_email;
+	private String ordTelno;
 	private String siteCd;
 	private int npayOrdNo;
 	private String frontGb;
@@ -321,6 +319,43 @@ public class Order extends TscBaseDomain {
 	private int addDelvFee;
 	private int ordDtlItemSq;
 	
+	private int paySq;
+	private int refundAmt;
+	private int rfCpn1Amt;
+	private int rfTmtb1Amt;
+	private int rfTmtb2Amt;
+	private int rfGoodsCpnAmt;
+	private int rfCartCpnAmt;
+	private int rfPntAmt;
+	private int rfPrePntAmt;
+	private int rfGfcdUseAmt;
+	
+	private int pgCpnAmt;
+	private int npayPntAmt;
+	private String payGb;
+	private String pgGb;
+	private String pgTid;
+	private String cardType;
+	private String cardKind;
+	private String cardBank;
+	private String cardMips;
+	private String cardPcableYn;
+	private String vaNo;
+	private String vaNm;
+	private String vaDeadline;
+	private String telecom;
+	
+	private String accountNo;
+	private String accountNm;
+	private String bankCd;
+	private String bankNm;
+	
+	private int realDelvAmt;
+	private int delvCpnSq;
+	private int delvCpnDcAmt;
+	
+	private int chgQty;
+	
 
 }
 

style24.admin/src/main/java/com/style24/persistence/domain/OrderChange.java

@@ -45,6 +45,13 @@ public class OrderChange extends TscBaseDomain {
 	private String chgStatNm;
 	private String whMemo;
 	
+	private String accountNo;
+	private String accountNm;
+	private String bankCd;
+	private String bankNm;
+	
+	private String allCanYn;
+	
 
 }
 

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -16,12 +16,13 @@
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		INNER  JOIN TB_GOODS G2
 		ON     ODI.ITEM_CD = G2.GOODS_CD
-		INNER  JOIN TB_GOODS_IMG GI
+		LEFT   OUTER JOIN TB_GOODS_IMG GI
 		ON     ODI.ITEM_CD = GI.GOODS_CD
 		AND    ODI.OPT_CD1 = GI.COLOR_CD
 		INNER  JOIN TB_PAYMENT P
 		ON     O.ORD_NO = P.ORD_NO
 		AND    P.PAY_GB = 'O'
+		AND    P.PAY_STAT = 'G016_30'
 		INNER  JOIN TB_DELIVERY_ADDR DA
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 		LEFT   OUTER JOIN (
@@ -75,12 +76,6 @@
         	<if test="chgGb != null and chgGb != ''">
         AND    OCD.CHG_STAT = #{chgGb}
         	</if>
-        </if>
-		<if test="chgStat != null and chgStat != ''">
-        AND    OCD.CHG_STAT = #{chgStat}
-        </if>
-        <if test="chgStat == null or chgStat == ''">
-        AND    OCD.CHG_STAT = #{chgGb}
         </if>
         <if test='search != null and search == "searchOrdNo"'>
         	<if test="condition != null and condition != ''">
@@ -230,12 +225,13 @@
 				AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 				INNER  JOIN TB_GOODS G2
 				ON     ODI.ITEM_CD = G2.GOODS_CD
-				INNER  JOIN TB_GOODS_IMG GI
+				LEFT   OUTER JOIN TB_GOODS_IMG GI
 				ON     ODI.ITEM_CD = GI.GOODS_CD
 				AND    ODI.OPT_CD1 = GI.COLOR_CD
 				INNER  JOIN TB_PAYMENT P
 				ON     O.ORD_NO = P.ORD_NO
 				AND    P.PAY_GB = 'O'
+				AND    P.PAY_STAT = 'G016_30'
 				INNER  JOIN TB_DELIVERY_ADDR DA
 				ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 				LEFT   OUTER JOIN (
@@ -378,129 +374,16 @@
 		            </foreach>
 		        </if>
 		        ORDER  BY OD.ORD_NO DESC
-		                , OD.ORD_DTL_NO DESC
-		                , ODI.ORD_DTL_ITEM_SQ DESC
+		             , OD.ORD_DTL_NO DESC
+		             , ODI.ORD_DTL_ITEM_SQ DESC
 	        ) A
 			JOIN (SELECT @rownum := 0) R
 		) Z
 		WHERE  1=1
         AND    Z.RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
         ORDER  BY Z.ORD_NO DESC
-                , Z.ORD_DTL_NO DESC
-                , Z.ORD_DTL_ITEM_SQ DESC
-	</select>
-	
-	<!-- 주문 목록 금액, 수량 정보 : 사용안함 -->
-	<select id="getOrderListSumInfo" parameterType="Order" resultType="Order">
-		/* order.getOrderListSumInfo */
-		SELECT SUM(ORD_AMT)                   AS SUM_ORD_AMT
-		     , SUM(ORD_AMT - CNCL_RTN_AMT)    AS SUM_ORD_CNCL_AMT
-		     , SUM(REAL_ORD_AMT)              AS SUM_REAL_PAY_AMT
-		     , COUNT(DISTINCT ORD_NO)         AS ORD_NO_CNT
-		     , SUM(ORD_QTY)                   AS SUM_ORD_QTY
-		     , SUM(ORD_QTY - CNCL_RTN_QTY)    AS SUM_ORD_CNCL_QTY
-		FROM   (
-			SELECT O.ORD_NO
-			     , OD.GOODS_CD
-			     , OD.ORD_AMT
-			     , OD.CNCL_RTN_AMT
-			     , OD.CNCL_RTN_QTY
-			     , OD.ORD_QTY
-			     , OD.REAL_ORD_AMT
-			FROM   TB_ORDER O
-			INNER  JOIN TB_ORDER_DETAIL OD
-			ON     O.ORD_NO = OD.ORD_NO
-			INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
-			ON     OD.ORD_NO = ODI.ORD_NO
-			AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			INNER  JOIN TB_GOODS G
-			ON     OD.GOODS_CD = G.GOODS_CD
-			INNER  JOIN TB_GOODS_IMG GI
-			ON     OD.GOODS_CD = GI.GOODS_CD
-			AND    ODI.OPT_CD1 = GI.COLOR_CD
-			INNER  JOIN TB_PAYMENT P
-			ON     O.ORD_NO = P.ORD_NO
-			AND    P.PAY_GB = 'O'
-			INNER  JOIN TB_DELIVERY_ADDR DA
-			ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-			WHERE  1=1
-			<if test='siteCd != null and siteCd != ""'>
-			AND    O.SITE_CD = #{siteCd}
-			</if>
-			<if test='mallCd != null and mallCd != ""'>
-			AND    O.MALL_GB = #{mallCd}
-			</if>
-			<if test='supplyCompCd != null and supplyCompCd != ""'>
-			AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
-			</if>
-			<if test="multiBrand != null and multiBrand != ''">
-	        AND    G.BRAND_CD IN
-				<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
-	        		#{item}
-	            </foreach>
-	        </if>
-	        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
-	        AND    OD.ORD_DTL_STAT IN
-				<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
-	        		#{item}
-	            </foreach>
-	        </if>
-	        <if test='search != null and search == "searchOrdNo"'>
-	        	<if test="condition != null and condition != ''">
-			AND    O.ORD_NO = #{condition}
-				</if>
-			</if>
-			<if test='search != null and search == "searchExtmallOrderId"'>
-	        	<if test="condition != null and condition != ''">
-			AND    O.ORD_NO = #{condition}
-				</if>
-			</if>
-			<if test='payMeans != null and payMeans != ""'>
-			AND    P.PAY_MEANS = #{payMeans}
-			</if>
-			<if test='orderNm != null and orderNm != ""'>
-			AND    O.ORD_NM = #{orderNm}
-			</if>
-			<if test='custId != null and custId != ""'>
-			AND    O.CUST_NO = #{custId}
-			</if>
-			<if test='orderPhnno != null and orderPhnno != ""'>
-			AND    O.ORD_PHNNO = #{orderPhnno}
-			</if>
-			<if test='goodsCd != null and goodsCd != ""'>
-			AND    G.GOODS_CD = #{goodsCd}
-			</if>
-			<if test='sizeCd != null and sizeCd != ""'>
-			AND    ODI.OPT_CD2 = #{sizeCd}
-			</if>
-			<if test='goodsNm != null and goodsNm != ""'>
-			AND    G.GOODS_NM = #{goodsNm}
-			</if>
-			<if test='recipNm != null and recipNm != ""'>
-			AND    DA.RECIP_NM = #{recipNm}
-			</if>
-			<if test='invoiceNo != null and invoiceNo != ""'>
-			AND    OD.INVOICE_NO = #{invoiceNo}
-			</if>
-			<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "Y"'>
-			AND    OD.INVOICE_SEND_YN = 'Y'
-			</if>
-			<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "N"'>
-			AND    OD.INVOICE_SEND_YN = 'N'
-			</if>
-			<if test='searchDateGb != null and searchDateGb == "ordDt"'>
-			AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
-			</if>
-			<if test='searchDateGb != null and searchDateGb == "delvStdt"'>
-			AND    OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
-			</if>
-			<if test='searchDateGb != null and searchDateGb == "soldoutDt"'>
-			AND    OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
-			</if>
-		) X
+             , Z.ORD_DTL_NO DESC
+             , Z.ORD_DTL_ITEM_SQ DESC
 	</select>
 	
 	<!-- 주문상세 > 주문 정보 -->
@@ -604,12 +487,13 @@
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		INNER  JOIN TB_GOODS G2
 		ON     ODI.ITEM_CD = G2.GOODS_CD
-		INNER  JOIN TB_GOODS_IMG GI
+		LEFT   OUTER JOIN TB_GOODS_IMG GI
 		ON     ODI.ITEM_CD = GI.GOODS_CD
 		AND    ODI.OPT_CD1 = GI.COLOR_CD
 		INNER  JOIN TB_PAYMENT P
 		ON     O.ORD_NO = P.ORD_NO
 		AND    P.PAY_GB = 'O'
+		AND    P.PAY_STAT = 'G016_30'
 		INNER  JOIN TB_DELIVERY_ADDR DA
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 		LEFT   OUTER JOIN (
@@ -665,8 +549,9 @@
 		INNER  JOIN TB_GOODS G
 		ON     OFV.ITEM_CD = G.GOODS_CD 
 		WHERE 1=1
-		AND  OFV.ORD_NO = #{ordNo}
-		AND  OFV.DEL_YN = 'N'
+		AND    OFV.ORD_NO = #{ordNo}
+		AND    OFV.DEL_YN = 'N'
+		ORDER  BY OFV.REG_DT DESC
 	</select>
 	
 	<!-- 주문상세 > 배송정보 -->
@@ -711,6 +596,10 @@
 		     , FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
 		     , P.CARD_NM 
 		     , P.VA_BANK
+		     , CASE WHEN P.PAY_MEANS = 'G014_20' || P.PAY_MEANS = 'G014_10'
+		            THEN FN_GET_CODE_NM('G940', P.VA_BANK)
+		            ELSE P.CARD_NM
+		            END  CARD_NM
 		     , P.PG_TRADE_NO
 		     , DATE_FORMAT(P.PAY_DT,'%Y%m%d%H%i%S') AS PAY_DT  
 		     , P.PAY_STAT 
@@ -720,6 +609,8 @@
 		FROM   TB_PAYMENT P
 		WHERE  1=1
 		AND    P.ORD_NO = #{ordNo}
+		AND    P.PAY_STAT = 'G016_30'
+		ORDER  BY P.REG_DT DESC
 	</select>
 	
 	<!-- 주문상세 > 배송비정보 -->
@@ -727,16 +618,16 @@
 		/* order.getDeliveryFeeList */
 		SELECT Z.*
 		FROM   (
-		SELECT DF.DELV_FEE_GB 
-		     , FN_GET_CODE_NM('G018', DF.DELV_FEE_GB) AS DELV_FEE_GB_NM
-		     , DF.DELV_FEE
-		     , DF.DELV_USAC_YN 
-		     , DATE_FORMAT(DF.DELV_USAC_DT,'%Y%m%d%H%i%S') AS DELV_USAC_DT 
-		     , DF.SUPPLY_COMP_CD 
-		     , DF.DELV_FEE_SQ 
-		FROM   TB_DELIVERY_FEE DF
-		WHERE  1=1
-		AND    DF.ORD_NO = #{ordNo}
+			SELECT DF.DELV_FEE_GB 
+			     , FN_GET_CODE_NM('G018', DF.DELV_FEE_GB) AS DELV_FEE_GB_NM
+			     , DF.DELV_FEE
+			     , DF.DELV_USAC_YN 
+			     , DATE_FORMAT(DF.DELV_USAC_DT,'%Y%m%d%H%i%S') AS DELV_USAC_DT 
+			     , DF.SUPPLY_COMP_CD 
+			     , DF.DELV_FEE_SQ 
+			FROM   TB_DELIVERY_FEE DF
+			WHERE  1=1
+			AND    DF.ORD_NO = #{ordNo}
 		) Z
 		GROUP  BY Z.DELV_FEE_GB 
 		     , Z.DELV_FEE_GB_NM
@@ -747,17 +638,18 @@
 		     , Z.DELV_FEE_SQ
 	</select>
 	
-	<!-- 주문상세 > 취소/반품/교환요청 정보 -->
+	<!-- 주문상세 > 취소 / 반품 / 교환 요청 정보 -->
 	<select id="getOrderChangeList" parameterType="Order" resultType="Order">
 		/* order.getOrderChangeList */
 		SELECT OCD.ORD_CHG_SQ
 		     , OC.CHG_GB
-		     , FN_GET_CODE_NM('G680', OC.CHG_GB) AS CHG_NM
+		     , FN_GET_CODE_NM('G680', OC.CHG_GB) AS CHG_GB_NM
 		     , OD.GOODS_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , OCD.CHG_STAT 
 		     , FN_GET_CODE_NM('G685', OCD.CHG_STAT) AS CHG_STAT_NM
+		     , OCD.CHG_QTY
 		     , DATE_FORMAT(OCD.REG_DT,'%Y%m%d%H%i%S') AS REG_DT 
 		     , OC.CHG_REASON 
 		     , CASE WHEN OC.CHG_GB = 'G680_20' THEN FN_GET_CODE_NM('G686', OC.CHG_REASON)
@@ -782,6 +674,9 @@
 		ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 		WHERE  1=1
 		AND    OD.ORD_NO = #{ordNo}
+		AND    OCD.DEL_YN = 'N'
+		ORDER  BY OC.REG_DT DESC
+		     , OCD.ORD_DTL_NO 
 	</select>
 	
 	<!-- 주문상세 > 환불정보 -->
@@ -790,12 +685,18 @@
 		SELECT P.PAY_MEANS
 		     , FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
 		     , P.CARD_NM
-		     , R.RA_BANK 
+		     , R.RA_BANK
+		     , CASE WHEN PAY_MEANS = 'G014_20' || PAY_MEANS = 'G014_10'
+		            THEN FN_GET_CODE_NM('G940', R.RA_BANK)
+		            ELSE P.CARD_NM
+		            END  CARD_NM
 		     , R.RA_NO
 		     , R.RA_NM 
 		     , R.REFUND_AMT 
-		     , P.UPD_DT
-		     , P.UPD_NO
+		     , DATE_FORMAT(P.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT 
+		     , (SELECT USER_NM
+		        FROM   TB_USER X
+		        WHERE  X.USER_NO = P.UPD_NO) AS UPD_NM
 		FROM   TB_REFUND R
 		INNER  JOIN TB_PAYMENT P
 		ON     R.ORD_CHG_SQ = P.ORD_CHG_SQ 
@@ -898,6 +799,7 @@
 		INNER  JOIN TB_PAYMENT P
 		ON     O.ORD_NO = P.ORD_NO 
 		AND    P.PAY_GB = 'O'
+		AND    P.PAY_STAT = 'G016_30'
 		INNER  JOIN TB_DELIVERY_ADDR DA
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ 
 		INNER  JOIN TB_DELIVERY_FEE DF		
@@ -962,6 +864,8 @@
 				, ORG_ORD_DTL_NO
 				, SUPPLY_COMP_CD
 				, GOODS_CD
+				, PRODUCT_NO
+				, PRODUCT_CODE
 				, FORMAL_GB
 				, GOODS_TYPE
 				, LIST_PRICE
@@ -1034,6 +938,8 @@
 				, ORG_ORD_DTL_NO
 				, SUPPLY_COMP_CD
 				, GOODS_CD
+				, PRODUCT_NO
+				, PRODUCT_CODE
 				, FORMAL_GB
 				, GOODS_TYPE
 				, LIST_PRICE
@@ -1705,7 +1611,17 @@
 			GROUP  BY OCD.ORD_DTL_NO
 		) OCD
 		ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
-		INNER  JOIN TB_DELIVERY_FEE DF
+		INNER  JOIN (
+			SELECT X.SUPPLY_COMP_CD
+			     , X.DELV_FEE_CD
+			     , SUM(X.DELV_FEE) AS DELV_FEE
+			FROM   TB_DELIVERY_FEE X
+			WHERE  1=1
+			AND    X.ORD_NO = #{ordNo}
+			AND    X.DELV_FEE_GB = 'G018_10'
+			GROUP  BY X.SUPPLY_COMP_CD
+			        , X.DELV_FEE_CD
+		) DF
 		ON     OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD 
 		AND    OD.DELV_FEE_CD = DF.DELV_FEE_CD 
 		INNER  JOIN TB_DELV_FEE_POLICY DFP
@@ -1794,25 +1710,31 @@
 	<!-- 주문상세 > 주문취소신청 > 주문상세단품정보 수정 -->
 	<update id="updateOrderDetailItem" parameterType="Order">
 		/* Order.updateOrderDetailItem */
-		UPDATE TB_ORDER_DETAIL_ITEM
-		SET    ORD_AMT 				= ORD_AMT 				- #{cnclRtnAmt}
-		     , CNCL_RTN_AMT 		= CNCL_RTN_AMT 			+ #{cnclRtnAmt}
-		     , CPN1_DC_AMT 			= CPN1_DC_AMT 			- #{cpn1DcAmt}
-		     , TMTB1_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb1DcAmt}
-		     , TMTB2_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb2DcAmt}
-		     , GOODS_CPN_DC_AMT 	= GOODS_CPN_DC_AMT 		- #{goodsCpnDcAmt}
-		     , CART_CPN_DC_AMT 		= CART_CPN_DC_AMT 		- #{cartCpnDcAmt}
-		     , PNT_DC_AMT 			= PNT_DC_AMT 			- #{pntDcAmt}
-		     , PRE_PNT_DC_AMT 		= PRE_PNT_DC_AMT 		- #{prePntDcAmt}
-		     , SAVE_PNT_AMT 		= SAVE_PNT_AMT 			- #{savePntAmt}
-		     , REAL_ORD_AMT 		= REAL_ORD_AMT 			- #{realOrdAmt}
-		     , GFCD_USE_AMT 		= GFCD_USE_AMT 			- #{gfcdUseAmt}
-		     , UPD_NO 				= #{updNo}
-		     , UPD_DT 				= SYSDATE()
+		UPDATE TB_ORDER_DETAIL_ITEM ODI
+		INNER  JOIN TB_ORDER_DETAIL OD
+		ON     OD.ORD_DTL_NO = OD.ORD_DTL_NO
+		SET    ODI.ORD_DTL_STAT		= CASE WHEN OD.ORD_QTY > (OD.CNCL_RTN_QTY + #{ordCanChgQty})
+		                                   THEN ODI.ORD_DTL_STAT
+		                                   ELSE #{ordDtlStat}
+		                                    END
+		     , ODI.ORD_AMT 			= ODI.ORD_AMT 				- #{cnclRtnAmt}
+		     , ODI.CNCL_RTN_AMT 	= ODI.CNCL_RTN_AMT 			+ #{cnclRtnAmt}
+		     , ODI.CPN1_DC_AMT 		= ODI.CPN1_DC_AMT 			- #{cpn1DcAmt}
+		     , ODI.TMTB1_DC_AMT 	= ODI.TMTB1_DC_AMT 			- #{tmtb1DcAmt}
+		     , ODI.TMTB2_DC_AMT 	= ODI.TMTB1_DC_AMT 			- #{tmtb2DcAmt}
+		     , ODI.GOODS_CPN_DC_AMT = ODI.GOODS_CPN_DC_AMT 		- #{goodsCpnDcAmt}
+		     , ODI.CART_CPN_DC_AMT 	= ODI.CART_CPN_DC_AMT 		- #{cartCpnDcAmt}
+		     , ODI.PNT_DC_AMT 		= ODI.PNT_DC_AMT 			- #{pntDcAmt}
+		     , ODI.PRE_PNT_DC_AMT 	= ODI.PRE_PNT_DC_AMT 		- #{prePntDcAmt}
+		     , ODI.SAVE_PNT_AMT 	= ODI.SAVE_PNT_AMT 			- #{savePntAmt}
+		     , ODI.REAL_ORD_AMT 	= ODI.REAL_ORD_AMT 			- #{realOrdAmt}
+		     , ODI.GFCD_USE_AMT 	= ODI.GFCD_USE_AMT 			- #{gfcdUseAmt}
+		     , ODI.UPD_NO 			= #{updNo}
+		     , ODI.UPD_DT 			= SYSDATE()
 		WHERE  1=1
-		AND    ORD_NO 				= #{ordNo} 
-		AND    ORD_DTL_NO 			= #{ordDtlNo} 
-		AND    ORD_DTL_ITEM_SQ 		= #{ordDtlItemSq}
+		AND    ODI.ORD_NO 			= #{ordNo} 
+		AND    ODI.ORD_DTL_NO 		= #{ordDtlNo} 
+		AND    ODI.ORD_DTL_ITEM_SQ 	= #{ordDtlItemSq}
 	</update>
 	
 	<!-- 주문상세 > 주문취소신청 > 주문상세단품정보 이력 등록 -->
@@ -1889,29 +1811,446 @@
 		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
 	</insert>
 	
+	<!-- 주문상세이력 생성-->
+	<insert id="createOrderDetailHstCnclRtn" parameterType="Order">
+		/* Order.createOrderDetailHstCnclRtn */
+		INSERT INTO TB_ORDER_DETAIL_HST (
+				ORD_DTL_NO
+				, ORD_NO
+				, ORD_EXCH_GB
+				, ORD_DTL_STAT
+				, ORG_ORD_DTL_NO
+				, SUPPLY_COMP_CD
+				, GOODS_CD
+				, PRODUCT_NO
+				, PRODUCT_CODE
+				, FORMAL_GB
+				, GOODS_TYPE
+				, LIST_PRICE
+				, CURR_PRICE
+				, DC_RATE
+				, OPT_ADD_PRICE
+				, ORD_QTY
+				, ORD_AMT
+				, CNCL_RTN_QTY
+				, CNCL_RTN_AMT
+				, CPN1_CPN_SQ
+				, CPN1_DC_AMT
+				, TMTB1_SQ
+				, TMTB1_DC_AMT
+				, TMTB2_SQ
+				, TMTB2_DC_AMT
+				, GOODS_CPN_SQ
+				, GOODS_CPN_DC_AMT
+				, CART_CPN_SQ
+				, CART_CPN_DC_AMT
+				, BURDEN_RATE
+				, PNT_DC_AMT
+				, PRE_PNT_DC_AMT
+				, SAVE_PNT_AMT
+				, REAL_ORD_AMT
+				, GFCD_USE_AMT
+				, VENDOR_ID
+				, EXTMALL_ID
+				, AGENT_ORDER_ID
+				, EXTMALL_ORDER_ID
+				, CHANGABLE_YN
+				, CHANGE_FEE_FREE_YN
+				, RETURNABLE_YN
+				, RETURN_FEE_FREE_YN
+				, SOLDOUT_YN
+				, SOLDOUT_MEMO
+				, SOLDOUT_REG_NO
+				, SOLDOUT_REG_DT
+				, DELV_ADDR_SQ
+				, DELV_FEE_CD
+				, SHOT_DELV_YN
+				, GIFT_PACK_YN
+				, MAKE_GOODS_YN
+				, ENTRY_NO
+				, DELV_LOC_CD
+				, DELV_ASSIGN_DT
+				, DELV_ASSIGN_STAT
+				, DSTRBT_NOTE
+				, DELV_STDT
+				, DELV_EDDT
+				, SHIP_COMP_CD
+				, INVOICE_NO
+				, INVOICE_SEND_YN
+				, SELL_STORE_CD
+				, SELL_FEE_RATE
+				, AF_LINK_CD
+				, ITHR_CD
+				, CONTENTS_LOC
+				, PLAN_DTL_SQ
+				, SOCIAL_SQ
+				, REG_NO
+				, REG_DT
+				, UPD_NO
+				, UPD_DT
+		)
+		SELECT OD.ORD_DTL_NO
+			 , OD.ORD_NO
+			 , OD.ORD_EXCH_GB
+			 , #{ordDtlStat}
+			 , OD.ORG_ORD_DTL_NO
+			 , OD.SUPPLY_COMP_CD
+			 , OD.GOODS_CD
+			 , OD.PRODUCT_NO
+			 , OD.PRODUCT_CODE
+			 , OD.FORMAL_GB
+			 , OD.GOODS_TYPE
+			 , OD.LIST_PRICE
+			 , OD.CURR_PRICE
+			 , OD.DC_RATE
+			 , OD.OPT_ADD_PRICE
+			 , OD.ORD_QTY - #{ordCanChgQty}
+			 , OD.ORD_AMT - Z.ORD_AMT
+			 , #{ordCanChgQty}
+			 , OD.ORD_AMT - Z.CNCL_RTN_AMT
+			 , OD.CPN1_CPN_SQ
+			 , OD.CPN1_DC_AMT - Z.CPN1_DC_AMT
+			 , OD.TMTB1_SQ
+			 , OD.TMTB1_DC_AMT - Z.TMTB1_DC_AMT
+			 , OD.TMTB2_SQ
+			 , OD.TMTB2_DC_AMT - Z.TMTB2_DC_AMT
+			 , OD.GOODS_CPN_SQ
+			 , OD.GOODS_CPN_DC_AMT - Z.GOODS_CPN_DC_AMT
+			 , OD.CART_CPN_SQ
+			 , OD.CART_CPN_DC_AMT - Z.CART_CPN_DC_AMT
+			 , OD.BURDEN_RATE
+			 , OD.PNT_DC_AMT - Z.PNT_DC_AMT
+			 , OD.PRE_PNT_DC_AMT - Z.PRE_PNT_DC_AMT
+			 , OD.SAVE_PNT_AMT - Z.SAVE_PNT_AMT
+			 , Z.REAL_ORD_AMT
+			 , OD.GFCD_USE_AMT - Z.GFCD_USE_AMT
+			 , OD.VENDOR_ID
+			 , OD.EXTMALL_ID
+			 , OD.AGENT_ORDER_ID
+			 , OD.EXTMALL_ORDER_ID
+			 , OD.CHANGABLE_YN
+			 , OD.CHANGE_FEE_FREE_YN
+			 , OD.RETURNABLE_YN
+			 , OD.RETURN_FEE_FREE_YN
+			 , OD.SOLDOUT_YN
+			 , OD.SOLDOUT_MEMO
+			 , OD.SOLDOUT_REG_NO
+			 , OD.SOLDOUT_REG_DT
+			 , OD.DELV_ADDR_SQ
+			 , OD.DELV_FEE_CD
+			 , OD.SHOT_DELV_YN
+			 , OD.GIFT_PACK_YN
+			 , OD.MAKE_GOODS_YN
+			 , OD.ENTRY_NO
+			 , OD.DELV_LOC_CD
+			 , OD.DELV_ASSIGN_DT
+			 , OD.DELV_ASSIGN_STAT
+			 , OD.DSTRBT_NOTE
+			 , OD.DELV_STDT
+			 , OD.DELV_EDDT
+			 , OD.SHIP_COMP_CD
+			 , OD.INVOICE_NO
+			 , OD.INVOICE_SEND_YN
+			 , OD.SELL_STORE_CD
+			 , OD.SELL_FEE_RATE
+			 , OD.AF_LINK_CD
+			 , OD.ITHR_CD
+			 , OD.CONTENTS_LOC
+			 , OD.PLAN_DTL_SQ
+			 , OD.SOCIAL_SQ
+			 , #{regNo} AS REG_ID
+			 , CURRENT_TIMESTAMP() AS REG_DT
+			 , #{regNo} AS REG_ID
+			 , CURRENT_TIMESTAMP() AS UPD_DT
+		FROM   TB_ORDER_DETAIL OD
+		INNER  JOIN (
+		SELECT ODI.ORD_DTL_NO
+		     , SUM(ODI.ORD_AMT) AS ORD_AMT
+		     , SUM(ODI.CNCL_RTN_AMT) AS CNCL_RTN_AMT
+		     , SUM(ODI.CPN1_DC_AMT) AS CPN1_DC_AMT
+		     , SUM(ODI.TMTB1_DC_AMT) AS TMTB1_DC_AMT
+		     , SUM(ODI.TMTB2_DC_AMT) AS TMTB2_DC_AMT
+		     , SUM(ODI.GOODS_CPN_DC_AMT) AS GOODS_CPN_DC_AMT
+		     , SUM(ODI.CART_CPN_DC_AMT) AS CART_CPN_DC_AMT
+		     , SUM(ODI.PNT_DC_AMT) AS PNT_DC_AMT
+		     , SUM(ODI.PRE_PNT_DC_AMT) AS PRE_PNT_DC_AMT
+		     , SUM(ODI.SAVE_PNT_AMT) AS SAVE_PNT_AMT
+		     , SUM(ODI.REAL_ORD_AMT) AS REAL_ORD_AMT
+		     , SUM(ODI.GFCD_USE_AMT) AS GFCD_USE_AMT
+		FROM   TB_ORDER_DETAIL_ITEM ODI
+		WHERE  ODI.ORD_DTL_NO = #{ordDtlNo}
+		GROUP  BY ODI.ORD_DTL_NO
+		) Z
+		ON    OD.ORD_DTL_NO = Z.ORD_DTL_NO
+		AND   OD.ORD_DTL_NO = #{ordDtlNo}
+	</insert>
+	
 	<!-- 주문상세 > 주문취소신청 > 주문상세정보 수정 -->
 	<update id="updateOrderDetail" parameterType="Order">
 		/* Order.updateOrderDetail */
-		UPDATE TB_ORDER_DETAIL
-		SET    ORD_AMT 				= ORD_AMT 				- #{cnclRtnAmt}
-		     , CNCL_RTN_AMT 		= CNCL_RTN_AMT 			+ #{cnclRtnAmt}
-		     , CPN1_DC_AMT 			= CPN1_DC_AMT 			- #{cpn1DcAmt}
-		     , TMTB1_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb1DcAmt}
-		     , TMTB2_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb2DcAmt}
-		     , GOODS_CPN_DC_AMT 	= GOODS_CPN_DC_AMT 		- #{goodsCpnDcAmt}
-		     , CART_CPN_DC_AMT 		= CART_CPN_DC_AMT 		- #{cartCpnDcAmt}
-		     , PNT_DC_AMT 			= PNT_DC_AMT 			- #{pntDcAmt}
-		     , PRE_PNT_DC_AMT 		= PRE_PNT_DC_AMT 		- #{prePntDcAmt}
-		     , SAVE_PNT_AMT 		= SAVE_PNT_AMT 			- #{savePntAmt}
-		     , REAL_ORD_AMT 		= REAL_ORD_AMT 			- #{realOrdAmt}
-		     , GFCD_USE_AMT 		= GFCD_USE_AMT 			- #{gfcdUseAmt}
-		     , UPD_NO 				= #{updNo}
-		     , UPD_DT 				= SYSDATE()
+		UPDATE TB_ORDER_DETAIL OD
+		INNER  JOIN (
+		SELECT ODI.ORD_DTL_NO
+		     , SUM(ODI.ORD_AMT) 			AS ORD_AMT
+		     , SUM(ODI.CNCL_RTN_AMT) 		AS CNCL_RTN_AMT
+		     , SUM(ODI.CPN1_DC_AMT) 		AS CPN1_DC_AMT
+		     , SUM(ODI.TMTB1_DC_AMT) 		AS TMTB1_DC_AMT
+		     , SUM(ODI.TMTB2_DC_AMT) 		AS TMTB2_DC_AMT 
+		     , SUM(ODI.GOODS_CPN_DC_AMT) 	AS GOODS_CPN_DC_AMT
+		     , SUM(ODI.CART_CPN_DC_AMT) 	AS CART_CPN_DC_AMT 
+		     , SUM(ODI.PNT_DC_AMT) 			AS PNT_DC_AMT 
+		     , SUM(ODI.PRE_PNT_DC_AMT) 		AS PRE_PNT_DC_AMT
+		     , SUM(ODI.SAVE_PNT_AMT) 		AS SAVE_PNT_AMT 
+		     , SUM(ODI.REAL_ORD_AMT) 		AS REAL_ORD_AMT 
+		     , SUM(ODI.GFCD_USE_AMT) 		AS GFCD_USE_AMT 
+		FROM   TB_ORDER_DETAIL_ITEM ODI
+		WHERE  ODI.ORD_NO = #{ordNo} 
+		AND    ODI.ORD_DTL_NO = #{ordDtlNo}
+		GROUP  BY ODI.ORD_DTL_NO
+		) Z
+		ON     OD.ORD_DTL_NO 			= Z.ORD_DTL_NO
+		SET    OD.ORD_DTL_STAT			= CASE WHEN OD.ORD_QTY > (OD.CNCL_RTN_QTY + #{ordCanChgQty})
+		                                       THEN OD.ORD_DTL_STAT
+		                                       ELSE #{ordDtlStat}
+		                                        END
+		     , OD.CNCL_RTN_QTY			= OD.CNCL_RTN_QTY + #{ordCanChgQty}
+		     , OD.ORD_AMT 				= Z.ORD_AMT
+		     , OD.CNCL_RTN_AMT  		= Z.CNCL_RTN_AMT
+		     , OD.CPN1_DC_AMT 			= Z.CPN1_DC_AMT
+		     , OD.TMTB1_DC_AMT 			= Z.TMTB1_DC_AMT
+		     , OD.TMTB2_DC_AMT 			= Z.TMTB2_DC_AMT
+		     , OD.GOODS_CPN_DC_AMT 		= Z.GOODS_CPN_DC_AMT
+		     , OD.CART_CPN_DC_AMT 		= Z.CART_CPN_DC_AMT
+		     , OD.PNT_DC_AMT 			= Z.PNT_DC_AMT
+		     , OD.PRE_PNT_DC_AMT 		= Z.PRE_PNT_DC_AMT
+		     , OD.SAVE_PNT_AMT 			= Z.SAVE_PNT_AMT
+		     , OD.REAL_ORD_AMT 			= Z.REAL_ORD_AMT
+		     , OD.GFCD_USE_AMT 			= Z.GFCD_USE_AMT
 		WHERE  1=1
-		AND    ORD_NO 				= #{ordNo} 
-		AND    ORD_DTL_NO 			= #{ordDtlNo} 
-		AND    ORD_DTL_ITEM_SQ 		= #{ordDtlItemSq}
+		AND    OD.ORD_NO = #{ordNo}
+		AND    OD.ORD_DTL_NO = #{ordDtlNo}
 	</update>
+		
+	<!-- 주문상세 > 주문취소신청 > 주문환불 결제 정보 등록 -->
+	<insert id="createPayment" parameterType="Order" keyProperty="paySq">
+		/* Order.createPayment */
+		INSERT INTO TB_PAYMENT (
+			ORD_NO
+			, PAY_DT
+			, PAY_MEANS
+			, PAY_AMT
+			, PG_CPN_AMT
+			, NPAY_PNT_AMT
+			, PAY_GB
+			, PAY_STAT
+			, PG_GB
+			, PG_TID
+			, PG_TRADE_NO
+			, PG_SHOP_ID
+			, CARD_TYPE
+			, CARD_KIND
+			, CARD_BANK
+			, CARD_NM
+			, CARD_MIPS
+			, CARD_PCABLE_YN
+			, VA_NO
+			, VA_NM
+			, VA_BANK
+			, VA_DEADLINE
+			, TELECOM
+			, ESCROW_YN
+			, ORD_CHG_SQ
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) 
+		SELECT ORD_NO
+		 	 , SYSDATE()
+			 , PAY_MEANS
+			 , #{payAmt}
+			 , #{pgCpnAmt}
+			 , #{npayPntAmt}
+			 , PAY_GB
+			 , #{payStat}
+			 , PG_GB
+			 , #{pgTid}
+			 , #{pgTradeNo}
+			 , PG_SHOP_ID
+			 , CARD_TYPE
+			 , CARD_KIND
+			 , CARD_BANK
+			 , CARD_NM
+			 , CARD_MIPS
+			 , CARD_PCABLE_YN
+			 , #{vaNo}
+			 , #{vaNm}
+			 , #{vaBank}
+			 , #{vaDeadline}
+			 , TELECOM
+			 , ESCROW_YN
+			 , #{ordChgSq}
+			 , #{regNo}
+			 , SYSDATE()
+			 , #{updNo}
+			 , SYSDATE()
+		FROM   TB_PAYMENT 
+		WHERE  1=1
+		AND    ORD_NO = #{ordNo}
+		AND    PAY_GB = 'O'
+		AND    PAY_STAT = 'G016_30'
+	</insert>
+	
+	<!-- 주문상세 > 주문취소신청 > 주문환불 금액 정보 등록 -->
+	<insert id="createRefund" parameterType="Order">
+		/* Order.createRefund */
+		INSERT INTO TB_REFUND (
+			ORD_NO
+			, PAY_SQ
+			, ORD_CHG_SQ
+			, REFUND_AMT
+			, RA_NO
+			, RA_BANK
+			, RA_NM
+			, RF_CPN1_AMT
+			, RF_TMTB1_AMT
+			, RF_TMTB2_AMT
+			, RF_GOODS_CPN_AMT
+			, RF_CART_CPN_AMT
+			, RF_PNT_AMT
+			, RF_PRE_PNT_AMT
+			, RF_GFCD_USE_AMT
+			, REG_NO
+			, REG_DT
+		) VALUES (
+			#{ordNo}
+			, #{paySq}
+			, #{ordChgSq}
+			, #{refundAmt}
+			, #{raNo}
+			, #{raBank}
+			, #{raNm}
+			, #{rfCpn1Amt}
+			, #{rfTmtb1Amt}
+			, #{rfTmtb2Amt}
+			, #{rfGoodsCpnAmt}
+			, #{rfCartCpnAmt}
+			, #{rfPntAmt}
+			, #{rfPrePntAmt}
+			, #{rfGfcdUseAmt}
+			, #{regNo}
+			, SYSDATE()
+		)
+	</insert>
+	
+	<!-- 주문상세 > 주문취소신청 > 주문 추가 배송 금액 등록-->
+	<insert id="createDeliveryFee" parameterType="Order">
+		/* Order.createDeliveryFee */
+		INSERT INTO TB_DELIVERY_FEE ( 
+			PAY_SQ
+			, ORD_NO
+			, DELV_FEE_GB
+			, DELV_FEE_CD
+			, DELV_FEE
+			, DELV_CPN_SQ
+			, DELV_CPN_DC_AMT
+			, REAL_DELV_AMT
+			, ORD_CHG_SQ
+			, SUPPLY_COMP_CD
+			, DELV_USAC_YN
+			, DELV_USAC_DT
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			#{paySq}
+			, #{ordNo}
+			, #{delvFeeGb}
+			, #{delvFeeCd}
+			, #{delvFee}
+			, #{delvCpnSq}
+			, #{delvCpnDcAmt}
+			, #{realDelvAmt}
+			, #{ordChgSq}
+			, #{supplyCompCd}
+			, 'N'
+			, null
+			, #{regNo}
+			, SYSDATE()
+			, #{updNo}
+			, SYSDATE()
+		)
+	</insert>
+	
+	<!-- 고객환불계좌정보 조회 -->
+	<select id="getRefundAccount" parameterType="Order" resultType="Order">
+		/* Order.getRefundAccount */
+		SELECT Z.ACCOUNT_NO
+		     , Z.ACCOUNT_NM
+		     , Z.BANK_CD
+		     , FN_GET_CODE_NM('G940', Z.BANK_CD) AS BANK_NM
+		     , Z.DEFAULT_YN
+		     , Z.REG_DT
+		FROM   (
+			SELECT CA.ACCOUNT_NO
+			     , CA.ACCOUNT_NM 
+			     , CA.BANK_CD
+			     , CA.DEFAULT_YN
+			     , CA.REG_DT
+			FROM   TB_ORDER O
+			LEFT   OUTER JOIN TB_CUST_ACCOUNT CA 
+			ON     O.CUST_NO = CA.CUST_NO
+			WHERE  1=1
+			AND    O.CUST_NO = 0
+			GROUP  BY CA.ACCOUNT_NO
+			     , CA.ACCOUNT_NM 
+			     , CA.BANK_CD
+			     , CA.DEFAULT_YN
+			ORDER  BY CA.DEFAULT_YN DESC
+			     , CA.REG_DT DESC
+		) Z
+	</select>
+	
+	<!-- 고객환불계좌정보 체크 -->
+	<select id="getRefundAccountCheck" parameterType="Order" resultType="int">
+		/* Order.getRefundAccountCheck */
+		SELECT COUNT(1)
+		FROM   TB_CUST_ACCOUNT CA
+		WHERE  1=1
+		AND    CA.ACCOUNT_NO = ${accountNo}
+		AND    CA.ACCOUNT_NM = #{accountNm}
+		AND    CA.BANK_CD = #{bankCd}
+		AND    CA.DEL_YN = 'N'
+	</select>
+	
+	<!-- 고객환불계좌정보 등록 -->
+	<insert id="saveRefundAccount" parameterType="Order">
+		/* Order.saveRefundAccount */
+		INSERT INTO TB_CUST_ACCOUNT (
+			CUST_NO
+			, BANK_CD
+			, ACCOUNT_NO
+			, ACCOUNT_NM
+			, DEFAULT_YN
+			, DEL_YN
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			#{custNo}
+			, #{bankCd}
+			, #{accountNo}
+			, #{accountNm}
+			, 'N'
+			, 'N'
+			, #{regNo}
+			, SYSDATE()
+			, #{updNo}
+			, SYSDATE()
+		)
+	</insert>
 	
 </mapper>
 
@@ -1923,3 +2262,9 @@
 
 
 
+
+
+
+
+
+

style24.admin/src/main/webapp/WEB-INF/views/order/CancelRequestForm.html

@@ -37,12 +37,7 @@
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" id="btnCancelRequestEscrow" onclick="fnCancelRequestEscrow();" style="display:none;">에스크로 결제생성</button>
-					<label th:if="${sessionInfo.userId == 'jsshin'
-									|| sessionInfo.userId == 'dlffyd7942'
-									|| sessionInfo.userId == 'card007'
-									|| sessionInfo.userId == 'hrkim'
-									|| sessionInfo.userId =='666badboy'
-									|| sessionInfo.userId =='yjyy83'}">
+					<label th:if="${sessionInfo.userId == 'jsh77b'}">
 						<input type="checkbox" name="pgStats" value="N">PG 전문 미전송
 					</label>
 					<button type="button" class="btn btn-success" id="btnCancelRequestPartOk" onclick="fnCancelRequestPartOk();">요청</button>
@@ -126,6 +121,12 @@
 					</tbody>
 				</table>
 				
+				<div id="wrapRefundAccount" style="width:50%;">
+					<h4>환불계좌정보</h4>
+					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
+					<div id="gridRefundAccountInfo" style="height: 150px;" class="ag-theme-balham"></div>
+				</div>
+				
 			</form>
 		</div>
 	</div>
@@ -134,7 +135,9 @@
 <!-- data -->
 <script th:inline="javascript">
 /*<![CDATA[*/
-var cancelRequestTargetList = [[${cancelRequestTargetList}]];
+var cancelRequestTargetList = [[${cancelRequestTargetList}]];				// 취소대상목록
+var ordNo 					= [[${ordNo}]];									// 주문번호
+var orderInfo 				= [[${orderInfo}]];								// 주문기본정보
 
 var temp1 = true;
 var temp2 = false;
@@ -384,11 +387,11 @@ var columnCancelReqList = [
 	}
 ];
 var gridOptionsCancelReqList = orderAgGrid.getGridOptions(columnCancelReqList);
+
 // Add on options
 gridOptionsCancelReqList.suppressRowClickSelection = true;
 gridOptionsCancelReqList.rowSelection = 'multiple';
 
-
 //specify the columns
 var columnCancelReqToBeList = [
 	{
@@ -703,6 +706,18 @@ var columnDelvCdList = [
 	}
 ];
 var gridOptionsDelvCdList = orderAgGrid.getGridOptions(columnDelvCdList);
+
+// 10. 무통장 환불정보
+var columnDefsRefundAccountInfo = [
+	{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: false, checkboxSelection: true, filter: false},
+	{headerName: "은행명"		, field: "bankNm"		, width: 140	, cellClass: 'text-center'},
+	{headerName: "은행코드"	, field: "bankCd"		, width: 120	, cellClass: 'text-center', hidden:true},
+	{headerName: "계좌번호"	, field: "accountNo"	, width: 150	, cellClass: 'text-center'},
+	{headerName: "예금주"		, field: "accountNm"	, width: 120	, cellClass: 'text-center'},
+	{headerName: "기본"		, field: "defaultYn"	, width: 100	, cellClass: 'text-center'}
+];
+
+var gridOptionsRefundAccountInfo = orderAgGrid.getGridOptions(columnDefsRefundAccountInfo);
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
@@ -822,26 +837,105 @@ var fnChangeChgReason = function(reasonCd){
 
 // 취소요청
 var fnCancelRequestPartOk = function () {
-	var jsonObj = {
-		"ordNo"			: $('#cancelRequestFrm input[name=ordNo]').val()
-		,"chgReason" 	: $('#cancelRequestFrm input[name=chgReason]').val()
-		,"chgMemo"		: $('#chgMemo').val()
-		,"cancelReqList" : cancelRequestTargetList
+	
+	var temp 		= false;
+	var ordDtlStat	= cancelRequestTargetList[0].ordDtlStat; 
+	var allCanYn 	= "N";
+	
+	// 1. 취소수량 체크
+	for (i=0 ; i<cancelRequestTargetList.length ; i++) {		
+		if (cancelRequestTargetList[i].ordCanChgQty > 0) {
+			temp = true;
+		}
+	}
+	
+	if (temp == false) {
+		mcxDialog.alert('취소 할 수량을 입력하세요.');
+		return;
+	}
+	
+	// 2. 입금대기건 && 전체취소 체크
+	if (ordDtlStat == "G013_10" && $("#spanPayAmt").text() != $("#spanRefundAmt").text()) {
+		alert("입금대기건은 전체 취소만 가능합니다.");
+		return;
 	}
 	
-	// 취소, 반품, 교환 신청 정보 목록
+	// 2.1 전체취소 여부 적용
+	if (ordDtlStat == "G013_10" && $("#spanPayAmt").text() == $("#spanRefundAmt").text()) {
+		allCanYn = "Y";	
+	}
+	
+	// 3. 취소사유 체크
+	var chgReason = $("#cancelRequestFrm select[name=selectChgReason]").val();
+	
+	if (gagajf.isNull(chgReason)) {
+		mcxDialog.alert("취소사유를 입력하세요."); return ;
+	}
+	
+	// 4. 환불계좌 체크 
+	var refundAccount = gridOptionsRefundAccountInfo.api.getSelectedRows();
+	
+	if (refundAccount.length == 0) {
+		mcxDialog.alert('선택된 행이 없습니다.');
+		return;
+	}
+
+	// 5. PG 전송 여부
+	var pgStat = "N";
+	if ($('#cancelRequestFrm input:checkbox[name=pgStats]').is(":checked")) {
+		pgStat = "Y";
+	}
+	$("#cancelRequestFrm input[name=pgStat]").val(pgStat);
+	
+	var jsonObj = {
+		"ordNo"				: $('#cancelRequestFrm input[name=ordNo]').val()
+		,"chgReason" 		: $('#cancelRequestFrm input[name=chgReason]').val()
+		,"chgMemo"			: $('#chgMemo').val()
+		,"cancelReqList" 	: cancelRequestTargetList
+		,"accountNo" 		: refundAccount[0].accountNo
+		,"accountNm" 		: refundAccount[0].accountNm
+		,"bankCd" 			: refundAccount[0].bankCd
+		,"allCanYn" 		: allCanYn
+	}
+
+	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌
 	var jsonData = JSON.stringify(jsonObj);
 	
-	gagajf.ajaxJsonSubmit(
-		'/order/cancel/'
-		, jsonData
-		, function() {
-			
+	mcxDialog.confirm('취소요청하시겠습니까?', {
+		cancelBtnText		: "취소",
+		sureBtnClick		: function(){
+			// 취소 실행
+			gagajf.ajaxJsonSubmit(
+				'/order/cancel/'
+				, jsonData
+				, function() {
+					uifnPopupClose('popupOrderDetail');
+					fnReOpenOrderDetailPopup();
+					uifnPopupClose('popupCancelRequestForm');
+				}
+			);
 		}
-	);
+	});
 }
 
-$(document).ready(function() {	
+// 환불계좌 등록
+var fnCreateOrderRfAccount = function () {	
+	var actionUrl = "/order/refund/account/create/form?ordNo=" + ordNo ;
+	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
+};
+
+// 환불계좌 정보
+var fnBindOrderRfAccountInfo = function () {
+	gagaAgGrid.fetch(
+		"/order/refund/account/info/list?ordNo=" + ordNo
+		, gridOptionsRefundAccountInfo
+		, null
+		, function (result) {
+		}
+	)
+};
+
+$(document).ready(function() {
 	// Create a agGrid
 	gagaAgGrid.createGrid('gridOrderCancelRequestList'		, gridOptionsCancelReqList);			// 주문정보
 	gridOptionsCancelReqList.api.setRowData(cancelRequestTargetList);
@@ -850,6 +944,12 @@ $(document).ready(function() {
 	
 	gagaAgGrid.createGrid('gridDelvCdList'					, gridOptionsDelvCdList);				// 배송비 정보
 	
+	gagaAgGrid.createGrid('gridRefundAccountInfo'			, gridOptionsRefundAccountInfo);		// 환불계좌정보
+	//gridOptionsRefundAccountInfo.api.setRowData(orderRfAccountInfo);
+	
+	// 환불계좌정보
+	fnBindOrderRfAccountInfo();
+	
 	// 취소정보계산
 	fnCalculateRefundAmt(null);
 });

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

@@ -65,7 +65,7 @@
 
 				<div id="wrapOrderChange">
 					<h4>(취소/반품/교환)요청 정보</h4>
-					<div id="gridOrderChangeInfo" style="width:100%; height: 100px; min-height:99px;" class="ag-theme-balham"></div>
+					<div id="gridOrderChangeInfo" style="width:100%; height: 180px; min-height:99px;" class="ag-theme-balham"></div>
 				</div>
 
 				<div id="wrapRefund">
@@ -115,16 +115,16 @@ var orderCounselInfo 		= [[${orderCounselInfo}]];				// 상담내역
 var orderAdminMemoInfo 		= [[${orderAdminMemoInfo}]];			// 관리자메모
 
 // 쿠폰,포인트,적립금 컬럼배경색설정
-var goodsCpnDcAmtClass 		= (orderGoodsInfo[0].goodsCpnDcAmt > 0) 	? 'bgPink' : 'text-right';
-var cartCpnDcAmtClass 		= (orderGoodsInfo[0].cartCpnDcAmt > 0) 		? 'bgPink' : 'text-right';
-var plusCpnDcAmtClass 		= (orderGoodsInfo[0].plusCpnDcAmt > 0) 		? 'bgPink' : 'text-right';
-var pntDcAmtClass 			= (orderGoodsInfo[0].pntDcAmt > 0) 			? 'bgPink' : 'text-right';
-var prePntDcAmtClass 		= (orderGoodsInfo[0].prePntDcAmt > 0) 		? 'bgPink' : 'text-right';
-var savePntAmtClass 		= (orderGoodsInfo[0].savePntAmt > 0) 		? 'bgSky' : 'text-right';
-
-var custNo 					= orderInfo[0].custNo;
-var payMeans 				= orderInfo[0].payMeans;
-var mallGb 					= orderInfo[0].mallGb;
+//var goodsCpnDcAmtClass 	= (orderGoodsInfo[0].goodsCpnDcAmt > 0) 	? 'bgPink' : 'text-right';
+//var cartCpnDcAmtClass 	= (orderGoodsInfo[0].cartCpnDcAmt > 0) 		? 'bgPink' : 'text-right';
+//var plusCpnDcAmtClass 	= (orderGoodsInfo[0].plusCpnDcAmt > 0) 		? 'bgPink' : 'text-right';
+//var pntDcAmtClass 		= (orderGoodsInfo[0].pntDcAmt > 0) 			? 'bgPink' : 'text-right';
+//var prePntDcAmtClass 		= (orderGoodsInfo[0].prePntDcAmt > 0) 		? 'bgPink' : 'text-right';
+//var savePntAmtClass 		= (orderGoodsInfo[0].savePntAmt > 0) 		? 'bgSky' : 'text-right';
+
+//var custNo 				= orderInfo[0].custNo;
+//var payMeans 				= orderInfo[0].payMeans;
+//var mallGb 				= orderInfo[0].mallGb;
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
@@ -260,8 +260,8 @@ var columnDefsGoodsInfo = [
 					return '<a href="javascript:void(0);" onclick="cfnOpenFrontGoodsPopup(\'' + params.data.itemCd + '\',\'' + params.data.siteCd + '\');">' + params.value + '</a>';
 				}
 			},
-			{headerName: "칼라"		, field: "optCd1"		, width: 80, cellClass: 'text-center'},
-			{headerName: "사이즈"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "optCd1"		, width: 80, cellClass: 'text-center'},
+			{headerName: "옵션2"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
 			{headerName: "단품수량"	, field: "itemQty"		, width: 80, cellClass: 'text-center'},
 			{
 				headerName		: "단품금액"
@@ -568,32 +568,8 @@ var gridOptionsDeliveryInfo = orderAgGrid.getGridOptions(columnDefsDeliveryInfo)
 var columnDefsPaymentInfo = [
 	{headerName: "에스크로여부"		, field: "escrowYn"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "결제수단"		, field: "payMeansNm"	, width: 100	, cellClass: 'text-center'},
-	{
-		headerName		: "카드(은행)"
-		, field			: "cardNm"
-		, width			: 100
-		, cellClass		: 'text-center'
-		, cellRenderer	: function (params) {
-			if (params.data.payMeans == '20') {
-				return params.data.vaNm;
-			} else if (params.data.payMeans == '10' || params.data.payMeans == '30') {
-				return params.data.cardNm;
-			}
-		}
-	},
-	{
-		headerName		: "할부(입금계좌)"
-		, field			: "cardMips"
-		, width			: 120
-		, cellClass		: 'text-center'
-		, cellRenderer	: function (params) {
-			if (params.data.payMeans == '20') {
-				return params.data.vaNo;
-			} else if (params.data.payMeans == '10') {
-				return params.value;
-			}
-		}
-	},
+	{headerName: "카드(은행)"		, field: "cardNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "할부(입금계좌)"	, field: "cardMips"		, width: 100	, cellClass: 'text-center'},
 	{
 		headerName		: "승인번호"
 		, field			: "pgTradeNo"
@@ -663,16 +639,17 @@ var gridOptionsDeliveryFeeInfo = orderAgGrid.getGridOptions(columnDefsDeliveryFe
 
 // 6. 반품/교환 정보
 var columnDefsOrderChangeInfo = [
-	{headerName: "요청번호"		, field: "ordChgSq"		, width: 60		, cellClass: 'text-center'},
-	{headerName: "요청구분"		, field: "chgGbNm"		, width: 75		, cellClass: 'text-center'},
+	{headerName: "요청번호"		, field: "ordChgSq"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "요청구분"		, field: "chgGbNm"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "사이즈"			, field: "sizeCd"		, width: 50		, cellClass: 'text-center'},
-	{headerName: "수량"			, field: "chgQty"		, width: 40		, cellClass: 'text-center'},
-	{headerName: "요청상태"		, field: "chgStatNm"	, width: 80		, cellClass: 'text-center'},
+	{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
 	{
 		headerName		: "요청일자"		
-		, field			: "chgRegDt"		
-		, width			: 90		
+		, field			: "regDt"		
+		, width			: 150		
 		, cellClass		: 'text-center'
 		, cellRenderer	: function(params) {
 			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
@@ -680,9 +657,9 @@ var columnDefsOrderChangeInfo = [
 	},
 	{headerName: "변경사유"		, field: "chgReasonNm"	, width: 100	, cellClass: 'text-center'},
 	{headerName: "요청메모"		, field: "chgMemo"		, width: 120	, cellClass: 'text-center'},
-	{headerName: "변경자명"		, field: "chgerNm"		, width: 70		, cellClass: 'text-center'},
-	{headerName: "변경자핸드폰"		, field: "chgerPhnno"	, width: 105	, cellClass: 'text-center', editable: true},
-	{headerName: "우편번호"		, field: "chgerPostNo"	, width: 60		, cellClass: 'text-center'},
+	{headerName: "변경자명"		, field: "chgerNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "변경자핸드폰"		, field: "chgerPhnno"	, width: 120	, cellClass: 'text-center', editable: true},
+	{headerName: "우편번호"		, field: "chgerPostNo"	, width: 120	, cellClass: 'text-center'},
 	{
 		headerName		: "주소(기본)"
 		, field			: "chgerBaseAddr"
@@ -718,12 +695,12 @@ var columnDefsOrderChangeInfo = [
 		, cellRenderer	: function (params) {
 			var retStr = "";
 
-			if (params.data.chgGb == "30" && params.data.chgStat == "40") {
+			if (params.data.chgGb == "G680_30" && params.data.chgStat == "G685_40") {
 				retStr = ' <button type="button" class="btn btn-success" onclick="fnReturnReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');"> 반품취소 </button>';
-			} else if (params.data.chgGb == "40" && params.data.chgStat == "30") {
+			} else if (params.data.chgGb == "G680_40" && params.data.chgStat == "G685_30") {
 				retStr = ' <button type="button" class="btn btn-success" onclick="fnExchangeReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + ordNo + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');"> 교환취소 </button>';
-			} else if (params.data.chgGb == "20" && params.data.chgStat == "20") {
-				//retStr = '<button type="button" class="btn btn-success" onclick="fnCancelConfirmRequestCancel(\'' + params.data.ordChgSq + '\')">요청철회 </button>';
+			} else if (params.data.chgGb == "G680_20" && params.data.chgStat == "G685_20") {
+				retStr = '<button type="button" class="btn btn-success" onclick="fnCancelConfirmRequestCancel(\'' + params.data.ordChgSq + '\')">요청철회 </button>';
 			}
 
 			return retStr;
@@ -732,7 +709,7 @@ var columnDefsOrderChangeInfo = [
 	{
 		headerName		: "회수지시전송"
 		, field			: "wdInvoiceSendYn"
-		, width			: 90
+		, width			: 120
 		, cellClass		: 'text-center'
 	},
 	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
@@ -742,7 +719,7 @@ var gridOptionsOrderChangeInfo = orderAgGrid.getGridOptions(columnDefsOrderChang
 // 7.환불정보
 var columnDefsRefundInfo = [
 	{headerName: "환불수단"		, field: "payMeansNm"	, width: 80		, cellClass: 'text-center'},
-	{headerName: "환불은행(카드)"	, field: "raBank"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "환불은행(카드)"	, field: "cardNm"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "환불은행계좌번호"	, field: "raNo"			, width: 100	, cellClass: 'text-center'},
 	{headerName: "예금주"			, field: "raNm"			, width: 80		, cellClass: 'text-center'},
 	{
@@ -756,14 +733,14 @@ var columnDefsRefundInfo = [
 	},
 	{
 		headerName		: "환불완료일자"		
-		, field			: "regDt"		
+		, field			: "updDt"		
 		, width			: 140	
 		, cellClass		: 'text-center'
 		, cellRenderer	: function(params) {
 			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
 		}
 	},
-	{headerName: "환불처리자"		, field: "regNo"		, width: 80		, cellClass: 'text-center'}
+	{headerName: "환불처리자"		, field: "updNm"		, width: 80		, cellClass: 'text-center'}
 ];
 var gridOptionsRefundInfo = orderAgGrid.getGridOptions(columnDefsRefundInfo);
 

style24.admin/src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -458,8 +458,8 @@ var columnDefsOrderList = [
 					}
 				}
 			},
-			{headerName: "색상"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, sortable: true},
-			{headerName: "사이즈"		, field: "optCd2"		, width: 60		, cellClass: 'text-center'	, sortable: true},
+			{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, sortable: true},
+			{headerName: "옵션2"		, field: "optCd2"		, width: 60		, cellClass: 'text-center'	, sortable: true},
 			{headerName: "단품명"		, field: "itemNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},
 			{
 				headerName		: "외부몰벤더"

style24.admin/src/main/webapp/WEB-INF/views/order/RefundAccountRegistForm.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : OrderListForm.html
+ * @desc    : 주문목록 Page
+ *============================================================================
+ * SISUN
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.01.04   jsh77b       최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="900">
+	<div class="panelStyle">
+		<div class="panelTitle">
+			<h2>환불계좌정보</h2>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCreateRefundAccount');"><i class="fa fa-times"></i></button>
+		</div>
+		
+		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
+			<form id="orderRefundAccontForm">
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:160px;" />
+						<col />
+						<col />
+						<col />
+						<col />
+						<col />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>은행</th>
+								<td>
+									<select name="bankCd">
+										<option value="">[선택하세요]</option>
+										<option th:if="${bankList}" th:each="oneData, status : ${bankList}" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+									</select>
+								</td>
+								<th>계좌번호</th>
+								<td><input type="text" name="accountNo" data-valid-type="numeric"></td>
+								<th>예금주</th>
+								<td><input type="text" name="accountNm"></td>
+							</th:block>
+							<td>
+								<button type="button" class="btn btn-success" id="saveAccountBtn" onclick="fnSaveAccount();">저장</button>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</form>
+		</div>
+	</div>
+</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+/* 이벤트 바인딩 관련 */
+	var ordNo 	= [[${orderBasic.ordNo}]];
+	var custNo 	= [[${orderBasic.custNo}]];
+
+	/* 환불계좌번호 저장 */
+	var fnSaveAccount = function(){
+		var bankCd 		= $("#orderRefundAccontForm select[name=bankCd]").val();
+		var accountNo 	= $("#orderRefundAccontForm input[name=accountNo]").val();
+		var accountNm 	= $("#orderRefundAccontForm input[name=accountNm]").val();
+
+		if (gagajf.isNull(bankCd)) {
+			mcxDialog.alert('은행을 선택하세요.');
+			return;
+		}
+
+		if (gagajf.isNull(accountNo)) {
+			mcxDialog.alert('계좌번호를 입력하세요.');
+			return;
+		}
+
+		if (gagajf.isNull(accountNm)) {
+			mcxDialog.alert('예금주를 입력하세요.');
+			return;
+		}
+
+		if (gagajf.isNull(ordNo) || gagajf.isNull(custNo)) {
+			mcxDialog.alert('주문정보를 다시 확인하시기 바랍니다..');
+			return;
+		}
+
+		mcxDialog.confirm("환불계좌를 저장하시겠습니까?", {
+			cancelBtnText	: "취소",
+			sureBtnText		: "확인",
+			sureBtnClick	: function(){
+				var data = {};
+				data.ordNo 			= ordNo;
+				data.custNo 		= custNo;
+				data.bankCd 		= bankCd;
+				data.accountNo 		= accountNo;
+				data.accountNm 		= accountNm;
+				
+				var jsonData = JSON.stringify(data);
+				
+				gagajf.ajaxJsonSubmit('/order/account/save', jsonData, function(result){
+					uifnPopupClose('popupCreateRefundAccount');
+					fnBindOrderRfAccountInfo();
+				});
+			}
+		});
+	};
+
+	$(document).ready(function() {
+
+
+	});
+
+/*]]>*/
+</script>
+
+</html>
+
+
+
+
+

style24.front/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
+Build-Jdk-Spec: 14
 Implementation-Title: style24.front
 Implementation-Version: 0.0.1-SNAPSHOT
-Build-Jdk-Spec: 1.8
 Created-By: Maven Integration for Eclipse
 

style24.front/target/m2e-wtp/web-resources/META-INF/maven/com.style24.front/style24.front/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Tue Jan 05 10:10:08 KST 2021
-version=0.0.1-SNAPSHOT
-groupId=com.style24.front
-m2e.projectName=style24.front
+#Wed Jan 06 14:17:20 KST 2021
 m2e.projectLocation=D\:\\WIDE\\workspace\\webapps\\style24\\STYLE24\\style24.front
+m2e.projectName=style24.front
+groupId=com.style24.front
 artifactId=style24.front
+version=0.0.1-SNAPSHOT