Merge branch 'develop' into ST24PRJ-612

pom.xml

@@ -24,6 +24,16 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-to-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>

src/main/java/com/style24/admin/biz/dao/TsaMailTemplateDao.java

@@ -101,7 +101,7 @@ public interface TsaMailTemplateDao {
 	 * @author gagamel
 	 * @since 2021. 5. 11
 	 */
-	void deleteMailTemplate(MailTemplate mailTemplate);
+	int deleteMailTemplate(MailTemplate mailTemplate);
 
 	/**
 	 * 메일템플릿코너 삭제

src/main/java/com/style24/admin/biz/service/TsaMailTemplateService.java

@@ -182,6 +182,25 @@ public class TsaMailTemplateService {
 		}
 	}
 
+	/**
+	 * 메일템플릿 삭제
+	 * 
+	 * @param Integer
+	 * @return int
+	 * @author card007
+	 * @since 2021. 12. 16
+	 */
+	@Transactional("shopTxnManager")
+	public int deleteMailTemplate(Integer mailtSq) {
+		MailTemplate mailTemplate = new MailTemplate();
+		mailTemplate.setMailtSq(mailtSq);
+		mailTemplate.setUseYn("N");
+		mailTemplate.setRegNo(TsaSession.getInfo().getUserNo());
+		mailTemplate.setUpdNo(TsaSession.getInfo().getUserNo());
+
+		return mailTemplateDao.deleteMailTemplate(mailTemplate);
+	}
+
 	/**
 	 * 메일템플릿코너 삭제
 	 * @param mailtcSq - 메일템플릿코너일련번호

src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -1728,6 +1728,27 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
+	/**
+	 * 메일템플릿 삭제
+	 * 
+	 * @param Integer
+	 * @return GagaResponse
+	 * @author card007
+	 * @since 2021. 12. 16
+	 */
+	@PostMapping("/mailtemplate/delete/{mailtSq}")
+	@ResponseBody
+	public GagaResponse deleteMailTemplate(@PathVariable Integer mailtSq) {
+		int result = mailTemplateService.deleteMailTemplate(mailtSq);
+		
+		if (result > 0) {
+			return super.ok(message.getMessage("SUCC_0003"));
+		} else {
+			return super.error(message.getMessage("FAIL_0003"));
+		}
+		
+	}
+
 	/**
 	 * 메일템플릿코너 삭제
 	 * @param mailtcSq - 메일템플릿코너일련번호

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

@@ -1,14 +1,15 @@
 package com.style24.persistence.domain;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.admin.support.security.session.TsaSession;
 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 java.util.List;
-import java.util.ArrayList;
-import java.util.Collection;
+import lombok.Data;
 
 /**
  * 쿠폰 도메인
@@ -65,6 +66,7 @@ public class Coupon extends TscBaseDomain {
     private String custNo;
     private String custNm;
     private String custGbNm;
+    private String cellPhnno;	// 휴대전화번호(탈퇴 시 NULL로 처리)
     private String custGradeNm;
     private String useYn;
     private String usedDt;
@@ -121,6 +123,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 TsaSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(getCustNm()) : getCustNm();
+    }
     
     // 업체목록배열
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
@@ -136,4 +146,5 @@ public class Coupon extends TscBaseDomain {
     private String supplyCompCd;
     private String brandGroupNm;
 
+    private String regId;
 }

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

@@ -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:"regNm" , width:100, cellClass:"text-center"} ,
 		{ headerName: "발급시간" , field:"regDt" , width:150, cellClass:"text-center"
 			,valueGetter	: function (params) {

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

@@ -427,6 +427,13 @@
 	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 	var mtcgGridOptions;
 	var mode = $('#mailTemplateDetailForm input[name=mode]').val();
+	var mtInfo;
+	var useYn;
+	
+	if (mode == 'U') {
+		mtInfo = [[${mtInfo}]];
+		useYn = mtInfo.useYn;
+	}
 	
 	var columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
@@ -784,7 +791,8 @@
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
-				var actionUrl = '/marketing/mailtemplate/delete/' + $('input[name=mailtSq]').val();
+				var actionUrl = '/marketing/mailtemplate/delete/' + $('#mailTemplateDetailForm input[name=mailtSq]').val();
+				mcxDialog.alert(actionUrl);
 				gagajf.ajaxJsonSubmit(actionUrl, null, function() {
 					uifnPopupClose('popupMailTemplateDetail');
 					$('#btnSearch').trigger('click');
@@ -853,6 +861,11 @@
 			$('#mtcorner').show(); // 상품전시코너 영역 노출
 			fnGetMailTemplateCorner(); // 상품전시코너 조회
 		}
+		
+		// 삭제 버튼 처리
+		if (useYn == 'N') {
+			$('#btnDeleteMailTemplate').hide();
+		}
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -95,8 +95,8 @@
 				</table>
 				<!-- //TABLE -->
 
-				<h4>주문결제내역</h4>
-				<table class="frmStyle">
+				<h4 th:if="${orginalOrdPayInfo != null}">주문결제내역</h4>
+				<table class="frmStyle" th:if="${orginalOrdPayInfo != null}">
 					<colgroup>
 						<col width="10%"/>
 						<col width="10%"/>
@@ -1519,116 +1519,118 @@ $(document).ready(function () {
 // 	$(".pgGbNm").text(pgGbNm);
 // 	$(".cardNm").text(cardGbNm);
 	
-	// 원주문 결제내역 정보
-	$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
-	$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
-	$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
-	$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
-	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
-	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
-	
-	var delvFeeDesc = '';
-	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeDesc)) delvFeeDesc += '<li>배송비 : ' + orginalOrdPayInfo.delvFeeDesc + '</li>';
-	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) delvFeeDesc += '<li>배송비 쿠폰 : ' + orginalOrdPayInfo.delvFeeCpnDesc + '</li>';
-	$('.delvFeeDesc').html(delvFeeDesc);
-	
-	$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');
-	
-	var gfcdUseDesc = '';
-	if (parseInt(orginalOrdPayInfo.gfcdUseAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.gfcdUseDesc)) {
-		if (orginalOrdPayInfo.gfcdUseDesc.indexOf('!@!') > -1) {
-			var arrGfcdUseDesc = orginalOrdPayInfo.gfcdUseDesc.split('!@!');
-			for (var j = 0; j < arrGfcdUseDesc.length; j++) {
-				gfcdUseDesc += '<li>' + arrGfcdUseDesc[j] + '</li>\n';
-			}
-		} else {
-			gfcdUseDesc += '<li>' + orginalOrdPayInfo.gfcdUseDesc + '</li>\n';
-		}
-	}
-	$('.gfcdUseDesc').html(gfcdUseDesc);
-	
-	$('.totDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.totDcAmt) + '원');
-	$('.pntDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.pntDcAmt.addComma() + '원</u></a>');
-	$('.cpn1DcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.cpn1DcAmt) + '원');
-	
-	var cpn1CpnDcDesc = '';
-	if (parseInt(orginalOrdPayInfo.cpn1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cpn1CpnDcDesc)) {
-		if (orginalOrdPayInfo.cpn1CpnDcDesc.indexOf('!@!') > -1) {
-			var arrCpn1CpnDcDesc = orginalOrdPayInfo.cpn1CpnDcDesc.split('!@!');
-			for (var j = 0; j < arrCpn1CpnDcDesc.length; j++) {
-				cpn1CpnDcDesc += '<li>' + arrCpn1CpnDcDesc[j] + '</li>\n';
+	if (!gagajf.isNull(orginalOrdPayInfo)) {
+		// 원주문 결제내역 정보
+		$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
+		$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
+		$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
+		$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
+		$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
+		$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
+		
+		var delvFeeDesc = '';
+		if (!gagajf.isNull(orginalOrdPayInfo.delvFeeDesc)) delvFeeDesc += '<li>배송비 : ' + orginalOrdPayInfo.delvFeeDesc + '</li>';
+		if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) delvFeeDesc += '<li>배송비 쿠폰 : ' + orginalOrdPayInfo.delvFeeCpnDesc + '</li>';
+		$('.delvFeeDesc').html(delvFeeDesc);
+		
+		$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');
+		
+		var gfcdUseDesc = '';
+		if (parseInt(orginalOrdPayInfo.gfcdUseAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.gfcdUseDesc)) {
+			if (orginalOrdPayInfo.gfcdUseDesc.indexOf('!@!') > -1) {
+				var arrGfcdUseDesc = orginalOrdPayInfo.gfcdUseDesc.split('!@!');
+				for (var j = 0; j < arrGfcdUseDesc.length; j++) {
+					gfcdUseDesc += '<li>' + arrGfcdUseDesc[j] + '</li>\n';
+				}
+			} else {
+				gfcdUseDesc += '<li>' + orginalOrdPayInfo.gfcdUseDesc + '</li>\n';
 			}
-		} else {
-			cpn1CpnDcDesc += '<li>' + orginalOrdPayInfo.cpn1CpnDcDesc + '</li>\n';
 		}
-	}
-	$('.cpn1CpnDcDesc').html(cpn1CpnDcDesc);
-	
-	$('.pgCpnAmt').text(orginalOrdPayInfo.pgCpnAmt.addComma() + '원');
-	$('.tmtbDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderTmtbHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtbDcAmt) + '원</u></span></a>');
-	if (parseInt(orginalOrdPayInfo.tmtbDcAmt) > 0) {
-		var tmtb1Desc = '';
-		if (parseInt(orginalOrdPayInfo.tmtb1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb1Desc)) {
-			if (orginalOrdPayInfo.tmtb1Desc.indexOf('!@!') > -1) {
-				var arrTmtb1Desc = orginalOrdPayInfo.tmtb1Desc.split('!@!');
-				for (var j = 0; j < arrTmtb1Desc.length; j++) {
-					tmtb1Desc += arrTmtb1Desc[j];
+		$('.gfcdUseDesc').html(gfcdUseDesc);
+		
+		$('.totDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.totDcAmt) + '원');
+		$('.pntDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.pntDcAmt.addComma() + '원</u></a>');
+		$('.cpn1DcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.cpn1DcAmt) + '원');
+		
+		var cpn1CpnDcDesc = '';
+		if (parseInt(orginalOrdPayInfo.cpn1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cpn1CpnDcDesc)) {
+			if (orginalOrdPayInfo.cpn1CpnDcDesc.indexOf('!@!') > -1) {
+				var arrCpn1CpnDcDesc = orginalOrdPayInfo.cpn1CpnDcDesc.split('!@!');
+				for (var j = 0; j < arrCpn1CpnDcDesc.length; j++) {
+					cpn1CpnDcDesc += '<li>' + arrCpn1CpnDcDesc[j] + '</li>\n';
 				}
 			} else {
-				tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
+				cpn1CpnDcDesc += '<li>' + orginalOrdPayInfo.cpn1CpnDcDesc + '</li>\n';
 			}
 		}
-		var tmtb2Desc = '';
-		if (parseInt(orginalOrdPayInfo.tmtb2DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb2Desc)) {
-			if (orginalOrdPayInfo.tmtb2Desc.indexOf('!@!') > -1) {
-				var arrTmtb2Desc = orginalOrdPayInfo.tmtb2Desc.split('!@!');
-				for (var j = 0; j < arrTmtb2Desc.length; j++) {
-					tmtb2Desc += arrTmtb2Desc[j];
+		$('.cpn1CpnDcDesc').html(cpn1CpnDcDesc);
+		
+		$('.pgCpnAmt').text(orginalOrdPayInfo.pgCpnAmt.addComma() + '원');
+		$('.tmtbDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderTmtbHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtbDcAmt) + '원</u></span></a>');
+		if (parseInt(orginalOrdPayInfo.tmtbDcAmt) > 0) {
+			var tmtb1Desc = '';
+			if (parseInt(orginalOrdPayInfo.tmtb1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb1Desc)) {
+				if (orginalOrdPayInfo.tmtb1Desc.indexOf('!@!') > -1) {
+					var arrTmtb1Desc = orginalOrdPayInfo.tmtb1Desc.split('!@!');
+					for (var j = 0; j < arrTmtb1Desc.length; j++) {
+						tmtb1Desc += arrTmtb1Desc[j];
+					}
+				} else {
+					tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
 				}
-			} else {
-				tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
 			}
+			var tmtb2Desc = '';
+			if (parseInt(orginalOrdPayInfo.tmtb2DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb2Desc)) {
+				if (orginalOrdPayInfo.tmtb2Desc.indexOf('!@!') > -1) {
+					var arrTmtb2Desc = orginalOrdPayInfo.tmtb2Desc.split('!@!');
+					for (var j = 0; j < arrTmtb2Desc.length; j++) {
+						tmtb2Desc += arrTmtb2Desc[j];
+					}
+				} else {
+					tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
+				}
+			}
+			var tmtbDcDesc = '<li>수량 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb1DcAmt) + '원' + (!gagajf.isNull(tmtb1Desc) ? " (" : "") + tmtb1Desc + (!gagajf.isNull(tmtb1Desc) ? ")" : "") + '</li>';
+			tmtbDcDesc += '<li>금액 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb2DcAmt) + '원' + (!gagajf.isNull(tmtb2Desc) ? " (" : "") + tmtb2Desc + (!gagajf.isNull(tmtb2Desc) ? ")" : "") + '</li>';
+			$(".tmtbDcDesc").html(tmtbDcDesc);
 		}
-		var tmtbDcDesc = '<li>수량 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb1DcAmt) + '원' + (!gagajf.isNull(tmtb1Desc) ? " (" : "") + tmtb1Desc + (!gagajf.isNull(tmtb1Desc) ? ")" : "") + '</li>';
-		tmtbDcDesc += '<li>금액 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb2DcAmt) + '원' + (!gagajf.isNull(tmtb2Desc) ? " (" : "") + tmtb2Desc + (!gagajf.isNull(tmtb2Desc) ? ")" : "") + '</li>';
-		$(".tmtbDcDesc").html(tmtbDcDesc);
-	}
-	
-	$('.npayPntAmt').text(orginalOrdPayInfo.npayPntAmt.addComma() + '원');
-	$('.npayPntDesc').text(orginalOrdPayInfo.npayPntDesc);
-	$('.goodsCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.goodsCpnDcAmt) + '원</u></span></a>');
-	
-	var goodsCpnDcDesc = '';
-	if (parseInt(orginalOrdPayInfo.goodsCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.goodsCpnDcDesc)) {
-		if (orginalOrdPayInfo.goodsCpnDcDesc.indexOf('!@!') > -1) {
-			var arrGoodsCpnDcDesc = orginalOrdPayInfo.goodsCpnDcDesc.split('!@!');
-			for (var j = 0; j < arrGoodsCpnDcDesc.length; j++) {
-				goodsCpnDcDesc += '<li>' + arrGoodsCpnDcDesc[j] + '</li>\n';
+		
+		$('.npayPntAmt').text(orginalOrdPayInfo.npayPntAmt.addComma() + '원');
+		$('.npayPntDesc').text(orginalOrdPayInfo.npayPntDesc);
+		$('.goodsCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.goodsCpnDcAmt) + '원</u></span></a>');
+		
+		var goodsCpnDcDesc = '';
+		if (parseInt(orginalOrdPayInfo.goodsCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.goodsCpnDcDesc)) {
+			if (orginalOrdPayInfo.goodsCpnDcDesc.indexOf('!@!') > -1) {
+				var arrGoodsCpnDcDesc = orginalOrdPayInfo.goodsCpnDcDesc.split('!@!');
+				for (var j = 0; j < arrGoodsCpnDcDesc.length; j++) {
+					goodsCpnDcDesc += '<li>' + arrGoodsCpnDcDesc[j] + '</li>\n';
+				}
+			} else {
+				goodsCpnDcDesc += '<li>' + orginalOrdPayInfo.goodsCpnDcDesc + '</li>\n';
 			}
-		} else {
-			goodsCpnDcDesc += '<li>' + orginalOrdPayInfo.goodsCpnDcDesc + '</li>\n';
 		}
-	}
-	$('.goodsCpnDcDesc').html(goodsCpnDcDesc);
-	
-	$('.savePntAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.savePntAmt.addComma() + '</u>원</a>');
-	$('.cartCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.cartCpnDcAmt) + '원</u></span></a>');
-	
-	var cartCpnDcDesc = '';
-	if (parseInt(orginalOrdPayInfo.cartCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cartCpnDcDesc)) {
-		if (orginalOrdPayInfo.cartCpnDcDesc.indexOf('!@!') > -1) {
-			var arrCartCpnDcDesc = orginalOrdPayInfo.cartCpnDcDesc.split('!@!');
-			for (var j = 0; j < arrCartCpnDcDesc.length; j++) {
-				cartCpnDcDesc += '<li>' + arrCartCpnDcDesc[j] + '</li>\n';
+		$('.goodsCpnDcDesc').html(goodsCpnDcDesc);
+		
+		$('.savePntAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.savePntAmt.addComma() + '</u>원</a>');
+		$('.cartCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.cartCpnDcAmt) + '원</u></span></a>');
+		
+		var cartCpnDcDesc = '';
+		if (parseInt(orginalOrdPayInfo.cartCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cartCpnDcDesc)) {
+			if (orginalOrdPayInfo.cartCpnDcDesc.indexOf('!@!') > -1) {
+				var arrCartCpnDcDesc = orginalOrdPayInfo.cartCpnDcDesc.split('!@!');
+				for (var j = 0; j < arrCartCpnDcDesc.length; j++) {
+					cartCpnDcDesc += '<li>' + arrCartCpnDcDesc[j] + '</li>\n';
+				}
+			} else {
+				cartCpnDcDesc += '<li>' + orginalOrdPayInfo.cartCpnDcDesc + '</li>\n';
 			}
-		} else {
-			cartCpnDcDesc += '<li>' + orginalOrdPayInfo.cartCpnDcDesc + '</li>\n';
 		}
+		$('.cartCpnDcDesc').html(cartCpnDcDesc);
+		
+		$('.cashReceipReqYn').text(orginalOrdPayInfo.cashReceipReqYn);
+		$('.prePntDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.prePntDcAmt) + '원');
 	}
-	$('.cartCpnDcDesc').html(cartCpnDcDesc);
-	
-	$('.cashReceipReqYn').text(orginalOrdPayInfo.cashReceipReqYn);
-	$('.prePntDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.prePntDcAmt) + '원');
 });
 </script>
 

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -488,6 +488,12 @@
 			}
 		});
 	};
+
+	// 주문자연락처 하이픈 처리
+	$('#ordPhnno').on('input keyup keydown paste change', function () {
+		cfnCellPhonnHypen(this);
+	});
+
 /*]]>*/
 </script>
 </html>