Merge branch 'card007' into order

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

@@ -114,7 +114,7 @@ public class TscKakaoPayService {
 			payment.setCustNo(Integer.parseInt(kakaoPay.getPartner_user_id()));
 			payment.setKakaoMethodType(kakaoPay.getPayment_method_type());
 			payment.setPayAmt(kakaoPay.getAmount().getTotal());
-			payment.setKakaoPoint(kakaoPay.getAmount().getPoint());
+			payment.setNpayPntAmt(kakaoPay.getAmount().getPoint());
 			payment.setKakaoDiscount(kakaoPay.getAmount().getDiscount());
 
 			// 카카오페이 카드결제 시 카드정보 설정
@@ -215,6 +215,7 @@ public class TscKakaoPayService {
 			payment.setCustNo(Integer.parseInt(kakaoPay.getPartner_user_id()));
 			payment.setKakaoMethodType(kakaoPay.getPayment_method_type());
 			payment.setPayAmt(kakaoPay.getApproved_cancel_amount().getTotal());
+			payment.setNpayPntAmt(kakaoPay.getApproved_cancel_amount().getPoint());
 			payment.setResCd(String.valueOf(statusCode));
 			payment.setResMsg(message.getMessage("SUCC_0004"));
 

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

@@ -213,6 +213,7 @@ public class TscNaverPayService {
 			payment.setCustNo(payment.getCustNo());
 			payment.setNaverMethodType(naverPay.getBody().getPrimaryPayMeans());
 			payment.setPayAmt(naverPay.getBody().getPrimaryPayCancelAmount() + naverPay.getBody().getNpointCancelAmount());
+			payment.setNpayPntAmt(naverPay.getBody().getNpointCancelAmount());
 			payment.setResCd(naverPay.getCode());
 			payment.setResMsg(naverPay.getMessage());
 

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

@@ -435,6 +435,7 @@ public class TscOrderChangeService {
 		
 		// TODO
 		// 13. PG 연동
+		// 네이버페이, 카카오페이 취소 시 취소 포인트 금액 TB_PAYMENT에 업데이트 처야함
 		
 		// TODO
 		// 14. 취소 완료 알림톡 발송 에정