Merge branch 'card007' into develop

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

@@ -359,6 +359,7 @@
 		    ON OD.ORD_NO = P.ORD_NO
 		 WHERE OD.ORD_NO = #{ordNo}
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
+		 GROUP BY DF.DELV_CPN_DC_AMT, DF.REAL_DELV_AMT, P.PAY_AMT, P.NPAY_PNT_AMT, P.PG_CPN_AMT
 	</select>
 
 	<!-- 마이페이지 주문상세 결제정보 조회 -->

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -356,8 +356,6 @@
 			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
 			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
 			let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-			console.log('sumDeliveryFee : '+sumDeliveryFee);
-			console.log('spanTotDeliveryFee : '+spanTotDeliveryFee);
 			let goodsCancelAmt = spanCnclRtnAmt;									// 상품취소금액
 			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)