Merge branch 'ST24PRJ-636' into develop

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

@@ -1,12 +1,15 @@
 package com.style24.persistence.domain;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.core.support.util.CryptoUtils;
+import com.style24.core.support.util.MaskingUtils;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
-import lombok.Data;
+import com.style24.scm.support.security.session.TssSession;
 
-import java.util.List;
+import lombok.Data;
 
 @SuppressWarnings("serial")
 @Data
@@ -61,6 +64,7 @@ public class Coupon extends TscBaseDomain {
     private int custNo;
     private String custNm;
     private String custGbNm;
+    private String cellPhnno;	// 휴대전화번호(탈퇴 시 NULL로 처리)
     private String custGradeNm;
     private String useYn;
     private String usedDt;
@@ -112,6 +116,14 @@ public class Coupon extends TscBaseDomain {
         this.custNm = CryptoUtils.decryptAES(this.custNm);
         return this.custNm;
     }
+    public String getCellPhnno() {
+        this.cellPhnno = CryptoUtils.decryptAES(this.cellPhnno);
+        return this.cellPhnno;
+    }
+
+    public String getMaskingCustNm() {
+        return TssSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(getCustNm()) : getCustNm();
+    }
     
     // 업체목록배열
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
@@ -125,4 +137,6 @@ public class Coupon extends TscBaseDomain {
     private String brandEnm;
     private String supplyCompNm;
     private String brandGroupNm;
+
+    private String regId;
 }

src/main/webapp/WEB-INF/views/marketing/CouponPubCustListPopupForm.html

@@ -31,7 +31,7 @@
 
 	var columnDefs = [
 		{ headerName: "회원번호" , field:"custNo" , width:100, cellClass:"text-center"} ,
-		{ headerName: "회원명" , field:"custNm" , width:120, cellClass:"text-center" } ,
+		{ headerName: "회원명", field:'maskingCustNm', width:100, cellClass: 'text-center'},
 		{ headerName: "회원구분" , field:"custGbNm" , width:120, cellClass:"text-center" } ,
 		{ headerName: "회원등급" , field:"custGradeNm" , width:120, cellClass:"text-center" } ,
 		{ headerName: "시작유효기간" , field:"availStdt" , width:150, cellClass:"text-center"
@@ -52,7 +52,8 @@
 		} ,*/
 		{ headerName: "발급사유" , field:"pubReasonNm" , width:200, cellClass:"text-center"} ,
 		{ headerName: "발급상세사유" , field:"pubReasonDtl" , width:200, cellClass:"text-center"} ,
-		{ headerName: "발급인ID" , field:"regNo" , width:100, cellClass:"text-center"} ,
+		{ headerName: "발급인번호" , field:"regNo" , width:100, cellClass:"text-center"} ,
+		{ headerName: "발급인ID" , field:"regId" , width:100, cellClass:"text-center"} ,
 		{ headerName: "발급시간" , field:"regDt" , width:150, cellClass:"text-center"
 			,valueGetter	: function (params) {
 				return gagaAgGrid.toDateTimeFormat(params.data.regDt);