개선 #998 [ADMIN][FRONT] 배송비 계산 처리 시 상품권 사용 금액 추가 처리 임시 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.gagaframework.web.parameter.GagaMap;
@@ -927,7 +924,7 @@ public class TsfMypageController extends TsfBaseController {
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
 				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+				if (orderChange != null && StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 					mailService.sendOrderCancel(replaceInfo, custNo);
 				}
 			} catch (Exception e) {

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -598,7 +598,7 @@ public class TsfNoMemberController extends TsfBaseController {
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
 				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+				if (orderChange != null && StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 					mailService.sendOrderCancel(replaceInfo, 0);
 				}
 			} catch (Exception e) {

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1209,9 +1209,13 @@ public class TsfOrderController extends TsfBaseController {
 					replaceInfo.set("vaBankNm"			, orderInfo.getCardNm());
 					
 					// 2021.07.29
-					Date deadline = new SimpleDateFormat("yyyy-MM-dd").parse(orderInfo.getVaDeadline().substring(0, 10));
+					String vaDeadline = "";
+					if (StringUtils.isNotBlank(orderInfo.getVaDeadline())) {
+						Date deadline = new SimpleDateFormat("yyyy-MM-dd").parse(orderInfo.getVaDeadline().substring(0, 10));
+						vaDeadline = new SimpleDateFormat("yyyy.MM.dd").format(deadline);
+					}
 					
-					replaceInfo.set("vaDeadline"		, new SimpleDateFormat("yyyy.MM.dd").format(deadline));
+					replaceInfo.set("vaDeadline"		, vaDeadline);
 					replaceInfo.set("vaNo"				, orderInfo.getVaNo());
 					
 					// 2021.06.15

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -467,10 +467,11 @@ var fnChangeCancelQty = function(param) {
 		let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 		let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
 		let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 삼품권 금액 합계
-		let returnAmt 			= spanRefundAmt + refundPoint + refundGiftCard;			// 환불예정금액
+		let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+		let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 		// 추가배송비 영역 설정
-		if (spanRefundAmt < 0) {
+		if (refundPayAmt < 0) {
 			//refundPayAmt = spanRefundAmt;
 			//$('#addDeliveryFee').css('display', '');
 			//$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
@@ -484,7 +485,7 @@ var fnChangeCancelQty = function(param) {
 		$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
 		$('#deliveryFee').text(deliveryFee.addComma());
 		$('#deductDcAmt').text(deductDcAmt.addComma());
-		$('#refundPayAmt').text(spanRefundAmt.addComma());
+		$('#refundPayAmt').text(refundPayAmt.addComma());
 		$('#refundPoint').text(refundPoint.addComma());
 		$('#refundGiftCard').text(refundGiftCard.addComma());
 	});

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html

@@ -161,7 +161,7 @@
 										<dt>배송비</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt + oneData.rfDelvGfcdUseAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>
@@ -183,6 +183,7 @@
 												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
 												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
 												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
+												<span th:if="${oneData.pgGb == 'ISTYLE'}">상품권</span>
 											</div>
 										</dd>
 									</div>
@@ -206,7 +207,7 @@
 										<dt>상품권 환불</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -718,7 +718,7 @@
 									<th:block th:if="${orderAmtInfo.gfcdUseAmt} > 0">
 										<div>
 											<dt>상품권 사용</dt>
-											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt + orderAmtInfo.delvGfcdUseAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
 									<th:block th:if="${orderAmtInfo.npayPntAmt} > 0">

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -466,10 +466,11 @@ var fnChangeCancelQty = function(param) {
 		let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 		let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
 		let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
-		let returnAmt 			= spanRefundAmt + refundPoint + refundGiftCard;			// 환불예정금액
+		let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+		let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 		// 추가배송비 영역 설정
-		if (spanRefundAmt < 0) {
+		if (refundPayAmt < 0) {
 			//refundPayAmt = spanRefundAmt;
 			//$('#addDeliveryFee').css('display', '');
 			//$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
@@ -483,7 +484,7 @@ var fnChangeCancelQty = function(param) {
 		$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
 		$('#deliveryFee').text(deliveryFee.addComma());
 		$('#deductDcAmt').text(deductDcAmt.addComma());
-		$('#refundPayAmt').text(spanRefundAmt.addComma());
+		$('#refundPayAmt').text(refundPayAmt.addComma());
 		$('#refundPoint').text(refundPoint.addComma());
 		$('#refundGiftCard').text(refundGiftCard.addComma());
 	});

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -171,6 +171,7 @@
 												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
 												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
 												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
+												<span th:if="${oneData.pgGb == 'ISTYLE'}">상품권</span>
 											</div>
 										</dd>
 									</div>
@@ -194,7 +195,7 @@
 										<dt>상품권 환불</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

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

@@ -363,10 +363,11 @@
 			let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 			let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
 			let refundGiftCard		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
-			let returnAmt 			= spanRefundAmt + refundPoint + refundGiftCard;			// 환불예정금액
-			
+			let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+			let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
+
 			// 추가배송비 영역 설정
-			if (spanRefundAmt < 0) {
+			if (refundPayAmt < 0) {
 				//refundPayAmt = spanRefundAmt;
 				//$('#addDeliveryFee').css('display', '');
 				//$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
@@ -380,7 +381,7 @@
 			$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
 			$('#deliveryFee').text(deliveryFee.addComma());
 			$('#deductDcAmt').text(deductDcAmt.addComma());
-			$('#refundPayAmt').text(spanRefundAmt.addComma());
+			$('#refundPayAmt').text(refundPayAmt.addComma());
 			$('#refundPoint').text(refundPoint.addComma());
 			$('#refundGiftCard').text(refundGiftCard.addComma());
 		});

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

@@ -135,7 +135,7 @@
 												<dt>환불 예정 금액</dt>
 												<dd>
 													<div class="price">
-														<span class="return_total_price"><em th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원</span>
+														<span class="return_total_price"><em th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원</span>
 													</div>
 												</dd>
 											</div>
@@ -145,7 +145,7 @@
 											</div>
 											<div class="include_item">
 												<dt>배송비</dt>
-												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt + oneData.rfDelvGfcdUseAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
@@ -170,7 +170,7 @@
 											<div>
 												<dt>상품권 환불</dt>
 												<dd>
-													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원
+													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원
 												</dd>
 											</div>
 											<div>
@@ -179,6 +179,7 @@
 												<dd th:if="${oneData.pgGb == 'NAVER'}">네이버페이</dd>
 												<dd th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</dd>
 												<dd th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</dd>
+												<dd th:if="${oneData.pgGb == 'ISTYLE'}">상품권</dd>
 											</div>
 											<div th:if="${oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
 												<dt class="sr-only">영수증 확인</dt>

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

@@ -425,7 +425,7 @@
 												</div>
 												<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
 													<dt>상품권 사용</dt>
-													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt + orderAmtInfo.delvGfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
 												</div>
 												<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
 													<dt>마일리지 사용</dt>

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

@@ -363,10 +363,11 @@
 			let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 			let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
 			let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
-			let returnAmt 			= spanRefundAmt + refundPoint + refundGiftCard;			// 환불예정금액
+			let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+			let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 			// 추가배송비 영역 설정
-			if (spanRefundAmt < 0) {
+			if (refundPayAmt < 0) {
 				//refundPayAmt = spanRefundAmt;
 				//$('#addDeliveryFee').css('display', '');
 				//$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
@@ -380,7 +381,7 @@
 			$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
 			$('#deliveryFee').text(deliveryFee.addComma());
 			$('#deductDcAmt').text(deductDcAmt.addComma());
-			$('#refundPayAmt').text(spanRefundAmt.addComma());
+			$('#refundPayAmt').text(refundPayAmt.addComma());
 			$('#refundPoint').text(refundPoint.addComma());
 			$('#refundGiftCard').text(refundGiftCard.addComma());
 		});

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

@@ -168,7 +168,7 @@
 											<div>
 												<dt>상품권 환불</dt>
 												<dd>
-													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원
+													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원
 												</dd>
 											</div>
 											<div>
@@ -177,6 +177,7 @@
 												<dd th:if="${oneData.pgGb == 'NAVER'}">네이버페이</dd>
 												<dd th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</dd>
 												<dd th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</dd>
+												<dd th:if="${oneData.pgGb == 'ISTYLE'}">상품권</dd>
 											</div>
 											<div th:if="${oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
 												<dt class="sr-only">영수증 확인</dt>