ISTCS-17 (BOS 접수자명 표기 오류 수정요청)

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

@@ -1999,21 +1999,14 @@
 		     , (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 /*신청(접수)자정보*/
+		     , CONCAT(CASE WHEN OC.REG_NO = 0 THEN '비회원'
+					WHEN OC.REG_NO = 99999 THEN '배치'
+					ELSE (IFNULL((SELECT CONCAT(USER_NM,
+										' / ',USER_ID)
+						  FROM   TB_USER
+						  WHERE  USER_NO = OC.REG_NO),'회원'
+						 ))
+			   END,' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))  AS REG_NM /*신청(접수)자정보*/
 		  FROM TB_ORDER_CHANGE_DETAIL OCD
 		 INNER JOIN TB_ORDER_CHANGE OC
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
@@ -3132,7 +3125,7 @@
 		  FROM TB_CUST_GIFTCARD CG
 		 WHERE 1=1
 		   AND CG.CUST_NO = #{custNo}
-		   AND NOW() BETWEEN DATE_FORMAT(CG.USE_ST_DATE, '%Y%m%d') AND DATE_FORMAT(CG.USE_EXP_DATE, '%Y%m%d')
+		   AND DATE_FORMAT(NOW(), '%Y%m%d') BETWEEN CG.USE_ST_DATE AND CG.USE_EXP_DATE
 	</select>
 
 	<!-- 쿠폰정보 조회 -->