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

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -366,7 +366,7 @@ public class TsfOrderService {
 			param.setPgGb(TscConstants.PgGb.KCP.value());
 			param.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
 		}
-
+		
 		try {
 			// 결제수단체크
 			if (StringUtils.isEmpty(param.getPgGb())) {
@@ -437,6 +437,7 @@ public class TsfOrderService {
 				result.setPgGb(param.getPgGb());
 				return result;
 			}
+
 			
 			// 결제완료 업데이트
 			int resultCnt = coreOrderDao.updatePaymentOrderComplete(result);
@@ -453,11 +454,14 @@ public class TsfOrderService {
 						coreKcpService.kcpCancel(result);
 					}
 				} else if (TscConstants.PgGb.KAKAO.value().equals(param.getPgGb())) {
-					param.setLeftAmt(0);
-					coreKakaoPayService.kakaoPayRollBack(param);
+					result.setLeftAmt(0);
+					coreKakaoPayService.kakaoPayRollBack(result);
+					
+					//param.setLeftAmt(0);
+					//coreKakaoPayService.kakaoPayRollBack(param);
 				} else if (TscConstants.PgGb.NAVER.value().equals(param.getPgGb())) {
-					param.setLeftAmt(0);
-					coreNaverPayService.naverPayRollBack(param);
+					result.setLeftAmt(0);
+					coreNaverPayService.naverPayRollBack(result);
 				}
 				
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
@@ -482,11 +486,11 @@ public class TsfOrderService {
 					coreKcpService.kcpCancel(result);
 				}
 			} else if (TscConstants.PgGb.KAKAO.value().equals(param.getPgGb())) {
-				param.setLeftAmt(0);
-				coreKakaoPayService.kakaoPayRollBack(param);
+				result.setLeftAmt(0);
+				coreKakaoPayService.kakaoPayRollBack(result);
 			} else if (TscConstants.PgGb.NAVER.value().equals(param.getPgGb())) {
-				param.setLeftAmt(0);
-				coreNaverPayService.naverPayRollBack(param);
+				result.setLeftAmt(0);
+				coreNaverPayService.naverPayRollBack(result);
 			}
 			*/
 			
@@ -521,8 +525,11 @@ public class TsfOrderService {
 
 			// TB_PAYMENT 등록. 실패시 PG 환불.
 			if (coreOrderDao.updatePaymentOrderComplete(result) < 1) {
-				payment.setLeftAmt(0);
-				coreKakaoPayService.kakaoPayRollBack(payment);
+				result.setLeftAmt(0);
+				coreKakaoPayService.kakaoPayRollBack(result);
+				
+				//payment.setLeftAmt(0);
+				//coreKakaoPayService.kakaoPayRollBack(payment);
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
@@ -535,8 +542,8 @@ public class TsfOrderService {
 			e.printStackTrace();
 			
 			// 2021.10.27 카카오페이 결제취소로직
-			//payment.setLeftAmt(0);
-			//coreKakaoPayService.kakaoPayRollBack(payment);
+			//result.setLeftAmt(0);
+			//coreKakaoPayService.kakaoPayRollBack(result);
 			
 			throw new IllegalArgumentException(e.getMessage());
 		}
@@ -557,6 +564,8 @@ public class TsfOrderService {
 		Payment result;
 
 		try {
+			log.info("payment.getOrdNo() >>> {}", payment.getOrdNo());
+			
 			result = coreNaverPayService.approveNaverPayment(payment);
 
 			// 결제 수단이 없는 경우(KAKAO, NAVER) CARD로 세팅
@@ -569,8 +578,11 @@ public class TsfOrderService {
 
 			// TB_PAYMENT 등록. 실패시 PG 환불.
 			if (coreOrderDao.updatePaymentOrderComplete(result) < 1) {
-				payment.setLeftAmt(0);
-				coreNaverPayService.naverPayRollBack(payment);
+				result.setLeftAmt(0);
+				coreNaverPayService.naverPayRollBack(result);
+				
+				//payment.setLeftAmt(0);
+				//coreNaverPayService.naverPayRollBack(payment);
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {

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

@@ -180,6 +180,11 @@ public class TsfCartController extends TsfBaseController {
 		order.setShotDelvUseYn(param.getShotDelvUseYn());
 		order.setShotCanYn(param.getShotCanYn());
 		order.setShotDelvDt(param.getShotDelvDt());
+		
+		// 2021.11.08 입접업체만 있는경우 총알배송 선택여부 미노출
+		if (order.getShotCartList().size() < 1) {
+			order.setShotCanYn("N");
+		}
 
 		model.addAttribute("loginInfo", TsfSession.getInfo());
 		model.addAttribute("order", order);

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

@@ -901,7 +901,12 @@ public class TsfOrderController extends TsfBaseController {
 		} catch (Exception e) {
 			// 2021.10.25 결제실패 등록
 			orderService.createPaymentFail(e.getMessage(), param.getCustNo());
-			throw new IllegalArgumentException(e.getMessage());
+			
+			// 2021.11.05 결제실패화면이동처리
+			ModelAndView redir = new ModelAndView();
+			redir.setViewName("redirect:/order/payment/fail");
+			return redir;
+			//throw new IllegalArgumentException(e.getMessage());
 		}
 
 		log.info("CHECK RES_CD :::: {} / {}", param.getCode(), param.getResCd());
@@ -959,7 +964,11 @@ public class TsfOrderController extends TsfBaseController {
 		String tid 		= TsfSession.getAttribute("tid");
 
 		if (StringUtils.isBlank(ordNo) || StringUtils.isBlank(tid)) {
-			throw new IllegalArgumentException("결제가 실패하였습니다.");
+			// 2021.11.05 결제실패화면이동처리
+			ModelAndView redir = new ModelAndView();
+			redir.setViewName("redirect:/order/payment/fail");
+			return redir;
+			//throw new IllegalArgumentException("결제가 실패하였습니다.");
 		}
 
 		payment.setPgTid(tid);
@@ -977,7 +986,12 @@ public class TsfOrderController extends TsfBaseController {
 		} catch (Exception e) {
 			// 2021.10.25 결제실패 등록
 			orderService.createPaymentFail(e.getMessage(), custNo);
-			throw new IllegalArgumentException(e.getMessage());
+			
+			// 2021.11.05 결제실패화면이동처리
+			ModelAndView redir = new ModelAndView();
+			redir.setViewName("redirect:/order/payment/fail");
+			return redir;
+			//throw new IllegalArgumentException(e.getMessage());
 		}
 
 		// 3. 주문정보 업데이트
@@ -1032,13 +1046,17 @@ public class TsfOrderController extends TsfBaseController {
 		String ordNo = TsfSession.getAttribute("ordNo");
 
 		if (StringUtils.isBlank(ordNo)) {
-			throw new IllegalArgumentException("결제가 실패하였습니다.");
+			// 2021.11.05 결제실패화면이동처리
+			ModelAndView redir = new ModelAndView();
+			redir.setViewName("redirect:/order/payment/fail");
+			return redir;
+			//throw new IllegalArgumentException("결제가 실패하였습니다.");
 		}
 
 		param.setPgTid(param.getPaymentId());
 		param.setRegNo(custNo);
 		param.setUpdNo(custNo);
-
+		
 		// 2. 결재정보등록(TB_PAYMENT)
 		Payment result = new Payment();
 		try {
@@ -1046,7 +1064,12 @@ public class TsfOrderController extends TsfBaseController {
 		} catch (Exception e) {
 			// 2021.10.25 결제실패 등록
 			orderService.createPaymentFail(e.getMessage(), custNo);
-			throw new IllegalArgumentException(e.getMessage());
+			
+			// 2021.11.05 결제실패화면이동처리
+			ModelAndView redir = new ModelAndView();
+			redir.setViewName("redirect:/order/payment/fail");
+			return redir;
+			//throw new IllegalArgumentException(e.getMessage());
 		}
 
 		// 3. 주문정보 업데이트

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -1376,7 +1376,7 @@ var paymentInfoSet = function() {
 							var custPayMeans = "N";
 							
 							// 자주쓰는결제타입
-							if ($("#orderForm #chk-agree_paymethod").is(":checked") == true) {
+							if ($("#orderForm #chk-agree_paymethod123").is(":checked") == true) {
 								custPayMeans = "Y";
 							}