Merge remote-tracking branch 'origin/card007' into develop

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

@@ -2567,7 +2567,7 @@ public class TscOrderChangeService {
 
 			cnclReqList.add(order);
 		}
-
+log.info("allLastCanYn >>> {}", allLastCanYn);
 		result.setString("allCanYn", allCanYn);									// 전체 취소 여부
 		result.setString("allLastCanYn", allLastCanYn);							// 전체 마지막 취소 여부
 		result.setString("allCanYnBeforePayment", allCanYnBeforePayment);		// 무통장입금전 전체 취소 여부

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

@@ -174,7 +174,7 @@ public class TscOrderRefundService {
 				// 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).setCpn1DcAmt(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());
@@ -243,9 +243,9 @@ public class TscOrderRefundService {
 		// 4. 추가배송비 발생여부, 추가배송비, 배송비정책단위 전체취소 여부 체크
 		for (int i=0 ; i<cancelDelvRefundList.size() ; i++) {
 			Order obj = cancelDelvRefundList.get(i);
-			
+
 			// 주문금액 - 기취소 금액 - 취소요청금액
-			int leftOrdAmt = obj.getOrdAmt() - obj.getOrgCnclRtnAmt() - obj.getCnclRtnAmt();
+			int leftOrdAmt = (obj.getOrdAmt() + obj.getCpn1DcAmt()) - obj.getOrgCnclRtnAmt() - obj.getCnclRtnAmt();
 
 			// 취소금액이 있을때 처리
 			if (obj.getCnclRtnAmt() > 0) {