Merge remote-tracking branch 'TSIT/ST24PRJ-22' into develop

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

@@ -1956,8 +1956,8 @@
 		     , FN_GET_CODE_NM('G680', OC.CHG_GB)       AS CHG_GB_NM
 		     , OD.GOODS_CD
 		     , G.GOODS_TYPE
-		     , FN_GET_CODE_NM('G056', G.GOODS_TYPE) AS GOODS_TYPE_NM
---		     , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+		     , FN_GET_CODE_NM('G056', G.GOODS_TYPE)    AS GOODS_TYPE_NM
+--		     , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,''), G.MAIN_COLOR_CD) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
 		     , ODI.OPT_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
@@ -1973,7 +1973,7 @@
 		            WHEN OC.CHG_GB = 'G680_40'
 		                 THEN FN_GET_CODE_NM('G689', OC.CHG_REASON)
 		            ELSE '결제전취소'
-		        END		                      CHG_REASON_NM
+		        END                                    AS CHG_REASON_NM
 		     , OC.CHG_MEMO
 		     , OC.CHGER_NM
 		     , OC.CHGER_PHNNO
@@ -1994,6 +1994,21 @@
 		     , (SELECT COUNT(1)
 		        FROM   TB_ORDER_DETAIL_ITEM_HST X
 		        WHERE  X.ORD_DTL_NO = OCD.ORD_DTL_NO) AS CHG_ITEM_CNT
+		     , CASE WHEN OC.REG_NO = 0 THEN '비회원'
+		            WHEN OC.REG_NO = 99999 THEN '배치'
+		            WHEN OC.REG_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
+		                                                        ' / ',CUST_ID,
+		                                                        ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                                          FROM   TB_CUSTOMER
+		                                          WHERE  CUST_NO = OC.REG_NO
+		                                         )
+		            ELSE (SELECT CONCAT(USER_NM,
+		                                ' / ',USER_ID,
+		                                ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                  FROM   TB_USER
+		                  WHERE  USER_NO = OC.REG_NO
+		                 )
+		       END                                    AS REG_NM /*신청(접수)자정보*/
 		  FROM TB_ORDER_CHANGE_DETAIL OCD
 		 INNER JOIN TB_ORDER_CHANGE OC
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ

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

@@ -474,6 +474,36 @@
 		            ELSE 'N'
 		        END                                    AS CAN_REQUEST_CANCEL_YN
 		     , OC.NPAY_CHANGE_HOLD_YN
+		     , CASE WHEN OC.REG_NO = 0 THEN '비회원'
+		            WHEN OC.REG_NO = 99999 THEN '배치'
+		            WHEN OC.REG_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
+		                                                        ' / ',CUST_ID,
+		                                                        ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                                          FROM   TB_CUSTOMER
+		                                          WHERE  CUST_NO = OC.REG_NO
+		                                         )
+		            ELSE (SELECT CONCAT(USER_NM,
+		                                ' / ',USER_ID,
+		                                ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                  FROM   TB_USER
+		                  WHERE  USER_NO = OC.REG_NO
+		                 )
+		       END                                     AS REG_NM /*신청(접수)자정보*/
+		     , CASE WHEN OC.UPD_NO = 0 THEN '비회원'
+		            WHEN OC.UPD_NO = 99999 THEN '배치'
+		            WHEN OC.UPD_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
+		                                                        ' / ',CUST_ID,
+		                                                        ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
+		                                          FROM   TB_CUSTOMER
+		                                          WHERE  CUST_NO = OC.UPD_NO
+		                                         )
+		            ELSE (SELECT CONCAT(USER_NM,
+		                                ' / ',USER_ID,
+		                                ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
+		                  FROM   TB_USER
+		                  WHERE  USER_NO = OC.UPD_NO
+		                 )
+		       END                                     AS UPD_NM /*최종수정자정보*/
 		  FROM TB_ORDER_CHANGE_DETAIL OCD
 		 INNER JOIN TB_ORDER_CHANGE OC
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
@@ -4692,6 +4722,8 @@
 		     , A.RF_CNCL_AMT
 		     , A.RF_DELIVERY_FEE
 		     , A.RF_REAL_CNCL_AMT
+		     , A.REG_NM
+		     , A.UPD_NM
 		FROM (
 		    SELECT ODIH.ORD_NO
 		         , ODIH.ORD_DTL_NO
@@ -4751,6 +4783,36 @@
 		         , RF.RF_CNCL_AMT
 		         , RF.RF_DELIVERY_FEE
 		         , RF.RF_REAL_CNCL_AMT
+		         , CASE WHEN OC.REG_NO = 0 THEN '비회원'
+		                WHEN OC.REG_NO = 99999 THEN '배치'
+		                WHEN OC.REG_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
+		                                                            ' / ',CUST_ID,
+		                                                            ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                                              FROM   TB_CUSTOMER
+		                                              WHERE  CUST_NO = OC.REG_NO
+		                                             )
+		                ELSE (SELECT CONCAT(USER_NM,
+		                                    ' / ',USER_ID,
+		                                    ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
+		                      FROM   TB_USER
+		                      WHERE  USER_NO = OC.REG_NO
+		                     )
+		           END                                    AS REG_NM /*신청(접수)자정보*/
+		         , CASE WHEN OC.UPD_NO = 0 THEN '비회원'
+		                WHEN OC.UPD_NO = 99999 THEN '배치'
+		                WHEN OC.UPD_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
+		                                                            ' / ',CUST_ID,
+		                                                            ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
+		                                              FROM   TB_CUSTOMER
+		                                              WHERE  CUST_NO = OC.UPD_NO
+		                                             )
+		                ELSE (SELECT CONCAT(USER_NM,
+		                                    ' / ',USER_ID,
+		                                    ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
+		                      FROM   TB_USER
+		                      WHERE  USER_NO = OC.UPD_NO
+		                     )
+		           END                                    AS UPD_NM /*최종수정자정보*/
 		    FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		    INNER  JOIN TB_ORDER_DETAIL OD
 		    ON     ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
@@ -4813,6 +4875,8 @@
 		     , A.RF_CNCL_AMT
 		     , A.RF_DELIVERY_FEE
 		     , A.RF_REAL_CNCL_AMT
+		     , A.REG_NM
+		     , A.UPD_NM
 		ORDER  BY A.ORD_NO
 		     , A.ORD_DTL_NO
 	</select>