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

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

@@ -47,6 +47,7 @@ public class TscKcpService {
 		}
 
 		// 02. 지불 요청 정보 설정
+		result.setOrdNo(param.getOrdNo());
 		result.setPgGb(param.getPgGb());
 		result.setPayMeans(param.getPayMeans());
 		result.setReqTx(request.getParameter("req_tx"));
@@ -77,6 +78,8 @@ public class TscKcpService {
 			c_PayPlus.m_res_msg = "연동 오류|tran_cd값이 설정되지 않았습니다.";
 		}
 
+		log.info("CHECK KCP RESULT :::: {}", c_PayPlus.getRecvObj().toString());
+
 		result.setResCd(c_PayPlus.m_res_cd);		// 결과 코드
 		result.setResMsg(c_PayPlus.m_res_msg);		// 결과 메시지
 
@@ -154,7 +157,7 @@ public class TscKcpService {
 	}
 
 	public Payment setKcpOrderData(Order order) {
-		if(order.getOrdChgSq() > 0) {
+		if(order.getOrdChgSq() != null && order.getOrdChgSq() > 0) {
 			order.setPgOrdNo("C" + order.getOrdChgSq());
 		} else {
 			order.setPgOrdNo(String.valueOf(order.getOrdNo()));
@@ -219,6 +222,7 @@ public class TscKcpService {
 			}
 		}
 
+		payment.setOrgOrdNo(order.getOrdNo());
 
 		return payment;
 	}