Home Explore Help
Sign In
style24
/
style24.front
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

xodud lee 5 years ago
parent
ae6a2b52c6 6fc23ca937
commit
2c9464198a
2 changed files with 13 additions and 2 deletions
Split View Show Diff Stats
  1. 6 1
      src/main/java/com/style24/front/biz/web/TsfOrderController.java
  2. 7 1
      src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

+ 6 - 1
src/main/java/com/style24/front/biz/web/TsfOrderController.java
View File 

@@ -793,7 +793,12 @@ public class TsfOrderController extends TsfBaseController {
 
 	@ResponseBody
 
 	@RequestMapping(value = "/pay/result/response")
 
 	public ModelAndView payResultResponse(Payment param, HttpServletRequest request, HttpServletResponse response) {
 
-		
+		if(StringUtils.isBlank(param.getPgTid()) && StringUtils.isBlank(request.getParameter("tran_cd"))) {
 
+			ModelAndView mav = new ModelAndView();
 
+			mav.setViewName("redirect:/order/payment/fail");
 
+			return mav;
 
+		}
 
+
 
 		ModelAndView mav = new ModelAndView();
 
 		
 		Order order = new Order();

+ 7 - 1
src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html
View File 

@@ -13,7 +13,7 @@
 
  * 1.0  2021.04.05   jsh77b     최초 작성

  *******************************************************************************

  -->

-<body>

+<body onunload="">

 <th:block layout:fragment="content">

 

 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">

@@ -451,6 +451,12 @@ $(document).ready( function() {
 
 	custemerInfoSet();

 });

 

+window.onpageshow = function(event){

+	if ( event.persisted || (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2) ){

+		window.history.back();

+	}

+};

+

 // 1. 함수기능 정의

 // 1.1 고객정보로드

 var custemerInfoSet = function() {