Merge branch 'ST24PRJ-636' into develop

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

@@ -1,6 +1,5 @@
 package com.style24.persistence.domain;
 
-import java.time.Clock;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -198,4 +197,6 @@ public class Coupon extends TscBaseDomain {
     private String supplyCompNm;
     private String supplyCompCd;
     private String brandGroupNm;
+    
+    private String regId;
 }

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

@@ -950,32 +950,37 @@
                  )
     </insert>
 
-    <!-- 쿠폰발급받은회원 조회-->
-    <select id="getCpnPubCustList" parameterType="Integer" resultType="Coupon">
-        /* TscCoupon.getCpnPubCustList */
-        SELECT	A.CUST_NO
-             ,B.CUST_NM
-             ,B.CUST_GB
-             ,FN_GET_CODE_NM('G100',B.CUST_GB) AS CUST_GB_NM
-             ,B.CUST_GRADE
-             ,FN_GET_CODE_NM('G110',B.CUST_GRADE) AS CUST_GRADE_NM
-             ,A.AVAIL_STDT
-             ,A.AVAIL_EDDT
-             ,CASE WHEN A.USED_DT IS NOT NULL THEN 'Y'
-                   ELSE 'N' END USE_YN
-             ,A.USED_DT
-             ,A.PUB_REASON
-             ,FN_GET_CODE_NM('G068',A.PUB_REASON) AS PUB_REASON_NM
-             ,A.PUB_REASON_DTL
-             ,A.REG_NO
-             ,CASE WHEN FN_GET_USER_NM(A.REG_NO) = '본인' THEN '본인발급' ELSE FN_GET_USER_NM(A.REG_NO) END AS REG_NM
-             ,A.REG_DT
-        FROM 	TB_CUST_COUPON A
-                    LEFT OUTER JOIN TB_CUSTOMER B
-                                    ON		A.CUST_NO = B.CUST_NO
-        WHERE 1=1
-          AND A.CPN_ID = #{cpnId}
-    </select>
+	<!-- 쿠폰발급받은회원 조회-->
+	<select id="getCpnPubCustList" parameterType="Integer" resultType="Coupon">
+		/* TscCoupon.getCpnPubCustList */
+		SELECT A.CUST_NO
+		     , FN_DEC_AES(B.CUST_NM)               AS CUST_NM
+		     , B.CUST_GB
+		     , FN_GET_CODE_NM('G100',B.CUST_GB)    AS CUST_GB_NM
+		     , B.CUST_GRADE
+		     , FN_GET_CODE_NM('G110',B.CUST_GRADE) AS CUST_GRADE_NM
+		     , A.AVAIL_STDT
+		     , A.AVAIL_EDDT
+		     , CASE WHEN A.USED_DT IS NOT NULL THEN 'Y'
+		            ELSE 'N' END USE_YN
+		     , A.USED_DT
+		     , A.PUB_REASON
+		     , FN_GET_CODE_NM('G068',A.PUB_REASON) AS PUB_REASON_NM
+		     , A.PUB_REASON_DTL
+		     , A.REG_NO
+		     , CASE WHEN A.REG_NO > 100000 THEN (SELECT CUST_ID FROM TB_CUSTOMER WHERE CUST_NO = A.REG_NO)
+		            WHEN A.REG_NO = 99999 THEN 'BATCH'
+		            ELSE (SELECT USER_ID FROM TB_USER WHERE USER_NO = A.REG_NO)
+		        END AS REG_ID
+		     , CASE WHEN A.REG_NO > 100000 THEN '본인발급' ELSE FN_GET_USER_NM(A.REG_NO)
+		        END AS REG_NM
+		     , A.REG_DT
+		FROM   TB_CUST_COUPON A
+		LEFT   OUTER JOIN TB_CUSTOMER B
+		ON     A.CUST_NO = B.CUST_NO
+		WHERE  1=1
+		AND    A.CPN_ID = #{cpnId}
+	</select>
 
     <!-- 선착순쿠폰 삭제 -->
     <update id="updateLimitedTimeCouponList" parameterType="CouponLimitedTime" >