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

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

@@ -1072,6 +1072,8 @@ public class TscOrderChangeService {
 				pg.setPayAmt(pg.getPartCancelAmt());
 				
 				kakaoPayService.cancelKakaoPayment(pg);
+			} else if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
+				orderDao.insertPaymentCancel(pg);
 			}
 
 			// 7. 환불정보 수정
@@ -2743,6 +2745,8 @@ public class TscOrderChangeService {
 			} else if (TscConstants.PgGb.KAKAO.value().equals(pgGb)) {
 				pg.setPayMeans(payment.getPayMeans());
 				kakaoPayService.cancelKakaoPayment(pg);
+			} else if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
+				orderDao.insertPaymentCancel(pg);
 			}
 
 			// 11. 환불금액 정보 수정

src/main/java/com/style24/persistence/domain/Order.java

@@ -115,6 +115,7 @@ public class Order extends TscBaseDomain {
 	private String invoiceNo;						// 송장번호
 	private String invoiceSendYn;					// 배송지시전송여부
 	private String sellStoreCd;						// 판매매장코드
+	private String naverPayShipCompCd;				// 네이버페이 택배사코드
 	private double sellFeeRate;						// 판매매장수수료
 
 	private String afLinkCd;						// AFLINKCD

src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -1106,6 +1106,7 @@
 		     , UPD_NO      = #{updNo}
 		     , UPD_DT      = NOW()
 		WHERE  ORD_NO      = #{ordNo}
+		AND    IFNULL(NPAY_ORD_NO, 0) = 0
 	</update>
 
 	<!-- 주문/배송 > 입점업체 주문상세정보 변경 (입점) -->