이태영 - 20210304 임시커밋

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thymeleaf.util.StringUtils;
 
 import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
@@ -168,9 +169,9 @@ public class TsfCartService {
 		cart.setGoodsType(params.iterator().next().getGoodsType());
 		cart.setItemCdSql(sb.toString());
 
-		if ("C".equals(params.iterator().next().getCartGb())) {
+		if (!StringUtils.isEmpty(params.iterator().next().getCartGb()) && "C".equals(params.iterator().next().getCartGb())) {
 			cart.setCartGb(TscConstants.CartGb.CART.value());
-		} else if ("O".equals(params.iterator().next().getCartGb())) {
+		} else if (!StringUtils.isEmpty(params.iterator().next().getCartGb()) && "O".equals(params.iterator().next().getCartGb())) {
 			if ("P".equals(TsfSession.getFrontGb())) {
 				cart.setCartGb(TscConstants.CartGb.PC_ORDER.value());
 			} else {

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

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.thymeleaf.util.StringUtils;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.service.TscKcpService;
@@ -214,12 +215,35 @@ public class TsfOrderService {
 		return mapList;
 	}
 
-	public void kcpTest(Payment param, HttpServletRequest request, HttpServletResponse response) {
+	/**
+	 * PG 결제승인
+	 * @param param - 필수 : payGb(결제수단 : KCP, KAKAO 등), payMeans(결제수단 : G014_30(신용카드) 등), cashReceiptYn(현금영수증여부)
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public Payment orderPgPayResult(Payment param, HttpServletRequest request, HttpServletResponse response) {
+		Payment result = new Payment();
 		try {
-			coreKcpService.kcpPayRequest(param, request, response);
+			if(StringUtils.isEmpty(param.getPayGb())) {
+				throw new IllegalArgumentException("결제수단을 선택해주세요.");
+			}
+
+			if("KCP".equals(param.getPayGb())) {
+				result = coreKcpService.kcpPayRequest(param, request, response);
+			} else if ("PAYCO".equals(param.getPayGb())) {
+				param = null;
+			} else if ("KAKAO".equals(param.getPayGb())) {
+				param = null;
+			} else if ("NAVER".equals(param.getPayGb())) {
+
+			}
 		} catch(Exception e) {
 			e.printStackTrace();
+			throw new IllegalArgumentException(e.getMessage());
 		}
+
+		return result;
 	}
 
 	/**

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

@@ -261,12 +261,11 @@ public class TsfOrderController extends TsfBaseController {
 	 * @author jsh77b
 	 * @since 2021. 02. 02
 	 */
-	@SuppressWarnings({ "unchecked", "null" })
 	@RequestMapping(value = "/pay/result/response")
 	public ModelAndView payResultResponse(Payment param, HttpServletRequest request, HttpServletResponse response) {
 		ModelAndView mav = new ModelAndView();
 
-		orderService.kcpTest(param, request, response);
+		orderService.orderPgPayResult(param, request, response);
 		
 		mav.setViewName(super.getDeviceViewName("pg/kcpOrder"));
 		return mav;

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -48,6 +48,7 @@
 			if( frm.res_cd.value == "0000" )
 			{
 				alert("결제 승인 요청 전,\n\n반드시 결제창에서 고객님이 결제 인증 완료 후\n\n리턴 받은 ordr_chk 와 업체 측 주문정보를\n\n다시 한번 검증 후 결제 승인 요청하시기 바랍니다."); //업체 연동 시 필수 확인 사항.
+				alert(frm);
 				/*
 					가맹점 리턴값 처리 영역
 				*/