취소신청, 취소완료 개발중

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -119,6 +119,8 @@ public class TscOrderChangeService {
 		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 isCustomer	= mav.getString("isCustomer").toString();							// 귀책사유 (고객, 회사)		
 		String chgGb		= TscConstants.OrderChangeGb.CANCEL.value(); 						// 취소요청
 		
 		// 4. 주문상세단품정보등록,변경 (단품단위)
@@ -208,6 +210,22 @@ public class TscOrderChangeService {
 						orderChangeDao.createOrderChangeDetail(changeDetailPo);
 					}
 				}
+				// 5.4 환불결제정보 등록 (업체별 & 배송정책별) 단위
+				// 취소, 반품 사유에 따른 추가배송비, 반품배송비를 환불금액에서 추가, 제외 할 수 있다.
+				int spanRealCnclRtnAmt 		= obj.getCnclRtnAmt();		// 취소금액합계
+				int sumDeliveryFee 			= obj.getDelvFee();			// 배송비합계
+				int spanTotDeliveryFee 		= obj.getAddDelvFee();		// 추가배송비합계
+				int spanTotRtnDelvFee 		= obj.getRtnDelvFee();		// 반품배송비합계
+				int spanRefundAmt			= 0;
+
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if ("true".equals(isCustomer)) {
+					spanRefundAmt = (spanRealCnclRtnAmt + sumDeliveryFee) - spanTotDeliveryFee - spanTotRtnDelvFee;
+				}
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					spanRefundAmt = (spanRealCnclRtnAmt + sumDeliveryFee);
+				}
 				
 				// 5.4 환불금액 등록
 				Order refundOrder = new Order();
@@ -216,15 +234,16 @@ public class TscOrderChangeService {
 				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()));
+				// 2021.01.25 TB_REFUND 정보 등록을 위해서 분리 작업
+				refundOrder.setRefundAmt(spanRefundAmt);
+				refundOrder.setRfCpn1Amt(obj.getCpn1DcAmt());
+				refundOrder.setRfTmtb1Amt(obj.getTmtb1DcAmt());
+				refundOrder.setRfTmtb2Amt(obj.getTmtb2DcAmt());
+				refundOrder.setRfGoodsCpnAmt(obj.getGoodsCpnDcAmt());
+				refundOrder.setRfCartCpnAmt(obj.getCartCpnDcAmt());
+				refundOrder.setRfPntAmt(obj.getPntAmt());
+				refundOrder.setRfPrePntAmt(obj.getPrePntDcAmt());
+				refundOrder.setRfGfcdUseAmt(obj.getGfcdUseAmt());
 				
 				refundOrder.setRaNo(mav.get("accountNo").toString());
 				refundOrder.setRaNm(mav.get("accountNm").toString());
@@ -449,15 +468,16 @@ public class TscOrderChangeService {
 				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()));
+				// 2021.01.25 TB_REFUND 정보 등록을 위해서 분리 작업
+				refundOrder.setRefundAmt(spanRefundAmt);
+				refundOrder.setRfCpn1Amt(obj.getCpn1DcAmt());
+				refundOrder.setRfTmtb1Amt(obj.getTmtb1DcAmt());
+				refundOrder.setRfTmtb2Amt(obj.getTmtb2DcAmt());
+				refundOrder.setRfGoodsCpnAmt(obj.getGoodsCpnDcAmt());
+				refundOrder.setRfCartCpnAmt(obj.getCartCpnDcAmt());
+				refundOrder.setRfPntAmt(obj.getPntAmt());
+				refundOrder.setRfPrePntAmt(obj.getPrePntDcAmt());
+				refundOrder.setRfGfcdUseAmt(obj.getGfcdUseAmt());
 				
 				refundOrder.setRaNo(mav.get("accountNo").toString());
 				refundOrder.setRaNm(mav.get("accountNm").toString());
@@ -535,6 +555,8 @@ public class TscOrderChangeService {
 		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 isCustomer	= mav.getString("isCustomer").toString();							// 귀책사유 (고객, 회사)
 		String chgGb		= TscConstants.OrderChangeGb.RETURN.value(); 						// 반품요청
 		
 		// 4. 주문상세단품정보등록,변경 (단품단위)
@@ -589,7 +611,7 @@ public class TscOrderChangeService {
 				String chgerPhnno 		= mav.getString("chgerPhnno").toString();		// 변경핸드폰번호
 				String chgerTelno 		= mav.getString("chgerTelno").toString();		// 변경전화번호
 				String chgerEmail 		= mav.getString("chgerEmail").toString();		// 변경이메일
-				String chgerZipNo 		= mav.getString("chgerZipNo").toString();		// 변경우편번호
+				String chgerZipcode 	= mav.getString("chgerZipcode").toString();		// 변경우편번호
 				String chgerBaseAddr 	= mav.getString("chgerBaseAddr").toString();	// 변경기본주소
 				String chgerDtlAddr 	= mav.getString("chgerDtlAddr").toString();		// 변경상세주소
 				
@@ -598,7 +620,7 @@ public class TscOrderChangeService {
 				orderChange.setChgerTelno(chgerTelno);
 				orderChange.setChgerEmail(chgerEmail);
 				orderChange.setChgerRtnMemo("");
-				orderChange.setChgerZipNo(chgerZipNo);
+				orderChange.setChgerZipcode(chgerZipcode);
 				orderChange.setChgerBaseAddr(chgerBaseAddr);
 				orderChange.setChgerDtlAddr(chgerDtlAddr);
 				orderChange.setChgerRtnMemo("");
@@ -632,6 +654,23 @@ public class TscOrderChangeService {
 					}
 				}
 				
+				// 5.4 환불결제정보 등록 (업체별 & 배송정책별) 단위
+				// 취소, 반품 사유에 따른 추가배송비, 반품배송비를 환불금액에서 추가, 제외 할 수 있다.
+				int spanRealCnclRtnAmt 		= obj.getCnclRtnAmt();		// 취소금액합계
+				int sumDeliveryFee 			= obj.getDelvFee();			// 배송비합계
+				int spanTotDeliveryFee 		= obj.getAddDelvFee();		// 추가배송비합계
+				int spanTotRtnDelvFee 		= obj.getRtnDelvFee();		// 반품배송비합계
+				int spanRefundAmt			= 0;
+				
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if ("true".equals(isCustomer)) {
+					spanRefundAmt = (spanRealCnclRtnAmt + sumDeliveryFee) - spanTotDeliveryFee - spanTotRtnDelvFee;
+				}
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					spanRefundAmt = (spanRealCnclRtnAmt + sumDeliveryFee);
+				}
+				
 				// 5.4 환불금액 등록
 				Order refundOrder = new Order();
 				refundOrder.setOrdNo(ordNo);
@@ -639,15 +678,16 @@ public class TscOrderChangeService {
 				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()));
+				// 2021.01.25 TB_REFUND 정보 등록을 위해서 분리 작업
+				refundOrder.setRefundAmt(spanRefundAmt);
+				refundOrder.setRfCpn1Amt(obj.getCpn1DcAmt());
+				refundOrder.setRfTmtb1Amt(obj.getTmtb1DcAmt());
+				refundOrder.setRfTmtb2Amt(obj.getTmtb2DcAmt());
+				refundOrder.setRfGoodsCpnAmt(obj.getGoodsCpnDcAmt());
+				refundOrder.setRfCartCpnAmt(obj.getCartCpnDcAmt());
+				refundOrder.setRfPntAmt(obj.getPntAmt());
+				refundOrder.setRfPrePntAmt(obj.getPrePntDcAmt());
+				refundOrder.setRfGfcdUseAmt(obj.getGfcdUseAmt());
 				
 				refundOrder.setRaNo(mav.get("accountNo").toString());
 				refundOrder.setRaNm(mav.get("accountNm").toString());

src/main/java/com/style24/core/biz/service/TscOrderRefundService.java

@@ -167,6 +167,16 @@ public class TscOrderRefundService {
 				cancelDelvRefundList.get(k).setCnclRtnAmt(cancelDelvRefundList.get(k).getCnclRtnAmt() + orderObj.getCnclRtnAmt());
 				cancelDelvRefundList.get(k).setRealOrdAmt(cancelDelvRefundList.get(k).getRealOrdAmt() + orderObj.getRealOrdAmt());
 				
+				// 2021.01.25 TB_REFUND 정보 등록을 위해서 분리 작업
+				cancelDelvRefundList.get(k).setPntDcAmt(cancelDelvRefundList.get(k).getPntDcAmt() + orderObj.getPntDcAmt());
+				cancelDelvRefundList.get(k).setPrePntDcAmt(cancelDelvRefundList.get(k).getPrePntDcAmt() + orderObj.getPrePntDcAmt());
+				cancelDelvRefundList.get(k).setCpn1CpnSq(cancelDelvRefundList.get(k).getCpn1DcAmt() + orderObj.getCpn1DcAmt());
+				cancelDelvRefundList.get(k).setGoodsCpnDcAmt(cancelDelvRefundList.get(k).getGoodsCpnDcAmt() + orderObj.getGoodsCpnDcAmt());
+				cancelDelvRefundList.get(k).setCartCpnDcAmt(cancelDelvRefundList.get(k).getCartCpnDcAmt() + orderObj.getCartCpnDcAmt());
+				cancelDelvRefundList.get(k).setTmtb1DcAmt(cancelDelvRefundList.get(k).getTmtb1DcAmt() + orderObj.getTmtb1DcAmt());
+				cancelDelvRefundList.get(k).setTmtb2DcAmt(cancelDelvRefundList.get(k).getTmtb2DcAmt() + orderObj.getTmtb2DcAmt());
+				cancelDelvRefundList.get(k).setGfcdAmt(cancelDelvRefundList.get(k).getGfcdAmt() + orderObj.getGfcdAmt());
+				
 				if ("N".equals(orderObj.getAllCanYn())) {
 					cancelDelvRefundList.get(k).setAllCanYn("N");
 				}
@@ -180,6 +190,16 @@ public class TscOrderRefundService {
 				delvObj.setCnclRtnAmt(orderObj.getCnclRtnAmt());
 				delvObj.setRealOrdAmt(orderObj.getRealOrdAmt());
 				
+				// 2021.01.25 TB_REFUND 정보 등록을 위해서 분리 작업
+				delvObj.setPntDcAmt(orderObj.getPntDcAmt());
+				delvObj.setPrePntDcAmt(orderObj.getPrePntDcAmt());
+				delvObj.setCpn1CpnSq(orderObj.getCpn1DcAmt());
+				delvObj.setGoodsCpnDcAmt(orderObj.getGoodsCpnDcAmt());
+				delvObj.setCartCpnDcAmt(orderObj.getCartCpnDcAmt());
+				delvObj.setTmtb1DcAmt(orderObj.getTmtb1DcAmt());
+				delvObj.setTmtb2DcAmt(orderObj.getTmtb2DcAmt());
+				delvObj.setGfcdAmt(orderObj.getGfcdAmt());
+				
 				delvObj.setDelvFee(orderObj.getDelvFee());
 				delvObj.setMinOrdAmt(orderObj.getMinOrdAmt());		
 				delvObj.setOrgDelvFee(orderObj.getOrgDelvFee());

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

@@ -162,7 +162,7 @@ public class Order extends TscBaseDomain {
 	private String delYn;
 	private String recipPhnno;
 	private String recipTelno;
-	private String recipZipNo;
+	private String recipZipcode;
 	private String recipBaseAddr;
 	private String recipDtlAddr;
 	private String ordEmail;
@@ -202,7 +202,7 @@ public class Order extends TscBaseDomain {
 	private String chgMemo;
 	private String chgerNm;
 	private String chgerPhnno;
-	private String chgerZipNo;
+	private String chgerZipcode;
 	private String chgerBaseAddr;
 	private String chgerDtlAddr;
 	private String wdInvoiceNo;

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

@@ -28,7 +28,7 @@ public class OrderChange extends TscBaseDomain {
 	private String chgerPhnno;
 	private String chgerTelno;
 	private String chgerEmail;
-	private String chgerZipNo;
+	private String chgerZipcode;
 	private String chgerBaseAddr;
 	private String chgerDtlAddr;
 	private String chgerRtnMemo;
@@ -61,7 +61,7 @@ public class OrderChange extends TscBaseDomain {
 	private String wdGb;
 	private String recipNm;
 	private String recipEmail;
-	private String recipZipNo;
+	private String recipZipcode;
 	private String recipBaseAddr;
 	private String recipDtlAddr;
 	private String recipPhnno;

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -281,7 +281,7 @@
 			, CHGER_PHNNO
 			, CHGER_TELNO
 			, CHGER_EMAIL
-			, CHGER_ZIP_NO
+			, CHGER_ZIPCODE
 			, CHGER_BASE_ADDR
 			, CHGER_DTL_ADDR
 			, CHGER_RTN_MEMO
@@ -299,7 +299,7 @@
 			 , #{chgerPhnno}
 			 , #{chgerTelno}
 			 , #{chgerEmail}
-			 , #{chgerZipNo}
+			 , #{chgerZipcode}
 			 , #{chgerBaseAddr}
 			 , #{chgerDtlAddr}
 			 , #{chgerRtnMemo}