수정

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

@@ -833,6 +833,7 @@ public class Order extends TscBaseDomain {
 	private int totPayAmt;			/*총결제금액*/
 	private String payMeansDesc;	/*결제수단설명*/
 	private String gfcdUseDesc;		/*상품권사용설명*/
+	private String npayPntDesc;		/*네이버포인트(마일리지)설명*/
 	private String cashReceipReqYn;	/*현금영수증신청여부*/
 	
 }

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

@@ -1314,19 +1314,21 @@
 		           END           AS PAY_MEANS_NM  /*결제수단명*/
 		         , CASE WHEN PG_GB = 'KCP' THEN
 		                    CASE WHEN PAY_MEANS = 'G014_10' THEN CONCAT(FN_GET_CODE_NM('G940',VA_BANK),' / ',VA_NO)
-		                         WHEN PAY_MEANS = 'G014_20' THEN CONCAT(FN_GET_CODE_NM('G940',VA_BANK),' / ',VA_NO,' / ',VA_NM,' / ',DATE_FORMAT(VA_DEADLINE,'%Y-%m-%d %H:%i:%S'))
+		                         WHEN PAY_MEANS = 'G014_20' THEN CONCAT(FN_GET_CODE_NM('G940',VA_BANK),' / ',VA_NO,' / ',VA_NM,' / 입금일 : ',IFNULL(DATE_FORMAT(PAY_DT,'%Y-%m-%d %H:%i:%S'),''))
 		                         WHEN PAY_MEANS = 'G014_30' THEN CONCAT(CARD_NM,' / ',CASE WHEN CAST(CARD_MIPS AS UNSIGNED) = 0 THEN '일시불' ELSE CONCAT(CAST(CARD_MIPS AS UNSIGNED),'개월') END)
 		                         ELSE ''
 		                    END
 		                WHEN PG_GB IN ('NAVER','KAKAO','PAYCO') THEN
-		                    CASE WHEN PAY_MEANS = 'G014_10' THEN CONCAT(FN_GET_CODE_NM('G940',VA_BANK),' / ',VA_NO)
-		                         WHEN PAY_MEANS = 'G014_30' THEN CONCAT(CARD_NM,' / ',CASE WHEN CAST(CARD_MIPS AS UNSIGNED) = 0 THEN '일시불' ELSE CONCAT(CAST(CARD_MIPS AS UNSIGNED),'개월') END)
+		                    CASE WHEN PAY_MEANS = 'G014_30' THEN CONCAT(CARD_NM,' / ',CASE WHEN CAST(CARD_MIPS AS UNSIGNED) = 0 THEN '일시불' ELSE CONCAT(CAST(CARD_MIPS AS UNSIGNED),'개월') END)
 		                         ELSE ''
 		                    END
 		                ELSE ''
-		           END           AS PAY_MEANS_DESC /*결제수단설명*/
-		         , PG_CPN_AMT                      /*PG쿠폰금액*/
-		         , NPAY_PNT_AMT                    /*네이버페이포인트금액(마일리지)*/
+		           END           AS PAY_MEANS_DESC     /*결제수단설명*/
+		         , PG_CPN_AMT                          /*PG쿠폰금액*/
+		         , NPAY_PNT_AMT                        /*포인트금액(마일리지)*/
+		         , CASE WHEN NPAY_PNT_AMT > 0 AND PAY_MEANS IN ('G014_80','G014_81','G014_82','G014_83') THEN FN_GET_CODE_NM('G014',PAY_MEANS)
+		                ELSE ''
+		           END           AS NPAY_PNT_DESC      /*포인트(마일리지)설명*/
 		         , CASE WHEN CASH_AUTH_NO IS NOT NULL AND CASH_TRADE_NO IS NOT NULL THEN 'Y'
 		                ELSE 'N'
 		           END           AS CASH_RECEIP_REQ_YN /*현금영수증신청여부*/
@@ -1435,6 +1437,7 @@
 		     , SUM(OO.PNT_DC_AMT)                     AS PNT_DC_AMT         /*포인트할인금액*/
 		     , MAX(P.PG_CPN_AMT)                      AS PG_CPN_AMT         /*PG쿠폰금액(KCP쿠폰금액)*/
 		     , MAX(P.NPAY_PNT_AMT)                    AS NPAY_PNT_AMT       /*네이버페이포인트금액(마일리지)*/
+		     , MAX(P.NPAY_PNT_DESC)                   AS NPAY_PNT_DESC      /*네이버포인트(마일리지)설명*/
 		     , SUM(OO.SAVE_PNT_AMT)                   AS SAVE_PNT_AMT       /*적립포인트금액*/
 		     , MAX(P.CASH_RECEIP_REQ_YN)              AS CASH_RECEIP_REQ_YN /*현금영수증신청여부*/
 		FROM   ORIGINAL_ORD OO