Просмотр исходного кода

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

xodud lee 5 лет назад
Родитель
Сommit
2c9464198a

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

@@ -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

@@ -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() {