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

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

@@ -57,7 +57,14 @@ public class TscKakaoPayService {
 		String paymentReadyUrl = env.getProperty("kakao.paymentReadyUrl");
 
 		// Redirect URL 설정
-		String redirectUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String approvalUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String failUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String cancelUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+
+		if (TscConstants.FrontGb.MOB.value().equals(order.getFrontGb())) {
+			failUrl = "http://" + env.getProperty("domain.front") + "/order/payment/fail";
+			cancelUrl = "http://" + env.getProperty("domain.front") + "/order/payment/fail";
+		}
 
 		// API 파라메터 설정
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
@@ -68,9 +75,9 @@ public class TscKakaoPayService {
 		params.add("quantity", order.getOrdGoodsQty()+"");
 		params.add("total_amount", order.getPayAmt()+"");
 		params.add("tax_free_amount", "0");
-		params.add("approval_url", redirectUrl);
-		params.add("fail_url", redirectUrl);
-		params.add("cancel_url", redirectUrl);
+		params.add("approval_url", approvalUrl);
+		params.add("fail_url", failUrl);
+		params.add("cancel_url", cancelUrl);
 
 		// 카카오페이 API 전송
 		return kakaoPayApi.kakaoPaymentApi(params, paymentReadyUrl);