Merge branch 'jsshin' into develop

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

@@ -1395,7 +1395,7 @@ public class TsaMarketingController extends TsaBaseController {
 		Integer userNo = TsaSession.getInfo().getUserNo();
 		custCoupon.setRegNo(userNo);
 		custCoupon.setUpdNo(userNo);
-		coreCouponService.saveCouponIssue(custCoupon);
+		coreCouponService.createCustCoupon(custCoupon);
 		return super.ok(message.getMessage("SUCC_0006"));
 	}
 

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

@@ -1,34 +0,0 @@
-package com.style24.persistence.domain;
-
-import com.style24.persistence.TscBaseDomain;
-import com.style24.persistence.TscPageRequest;
-import lombok.Data;
-import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
-
-/**
- * 고객쿠폰 도메인
- * @author xyzp1539
- * @since 2020-12-21
- */
-@SuppressWarnings("serial")
-@Data
-public class CustCoupon extends TscBaseDomain {
-    private Integer custCpnSq;              // 고객쿠폰일련번호
-    private Integer custNo;                 // 고객번호
-    private int     cpnId;                  // 쿠폰아이디
-    private String  availStdt;              // 유효시작일시
-    private String  availEddt;              // 유효종료일시
-    private String  pubReason;              // 발행사유(공통코드G250)
-    private String  pubReasonDtl;           // 발행사유상세
-    private String  usedDt;                 // 사용된일시
-    private String  endAlimSendYn;          // 만료알림발송여부
-    private String  useYn;                  // 사용여부
-    private String  rdCpnNm;                // 랜덤쿠폰 및 시리얼쿠폰 키
-    private String  custId;                 // 고객 아이디
-    private String  custNm;                 // 고객명
-
-    // 그리드 컬럼
-    private String  custList;
-    private String  cpnNm;                  // 쿠폰명
-    private Integer ordNo;                  // 주문번호
-}

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

@@ -199,7 +199,7 @@
 			headerName: "유효기간", field: "availPeriod", width: 300, cellClass: "text-center",
 			cellRenderer: function(params) {
 				return params.data.pdGb == 'P' ? gagaAgGrid.toDateTimeFormat(params.data.availStdt)
-					+ '~' + gagaAgGrid.toDateTimeFormat(params.data.availStdt) : gagaAgGrid.toAddComma(params.data.availDays) + '일';
+					+ '~' + gagaAgGrid.toDateTimeFormat(params.data.availEddt) : gagaAgGrid.toAddComma(params.data.availDays) + '일';
 			}
 		},
 		{headerName: "발행제한여부", field: "pubLimitYn", width: 100, cellClass: "text-center"},
@@ -296,13 +296,17 @@
 	var fnBindCouponInfo = function(params) {
 		$('#couponIssueForm input[name=cpnId]').val(params.cpnId);
 		$('#couponIssueForm input[name=pdGb]').val(params.pdGb);
-		$('#couponIssueForm input[name=availStdt]').val(gagaAgGrid.toDateFormat(params.availStdt));
-		$("#couponIssueForm select[name=availStHH]").val(params.availStdt.substring(8,10));
-		$("#couponIssueForm select[name=availStMM]").val(params.availStdt.substring(10,12));
-		$('#couponIssueForm input[name=availEddt]').val(gagaAgGrid.toDateFormat(params.availEddt));
-		$("#couponIssueForm select[name=availEdHH]").val(params.availEddt.substring(8,10));
-		$("#couponIssueForm select[name=availEdMM]").val(params.availEddt.substring(10,12));
-		$('#couponIssueForm input[name=availDays]').val(params.availDays);
+
+		if (params.pdGb === 'P') {
+			$('#couponIssueForm input[name=availStdt]').val(gagaAgGrid.toDateFormat(params.availStdt));
+			$("#couponIssueForm select[name=availStHH]").val(params.availStdt.substring(8,10));
+			$("#couponIssueForm select[name=availStMM]").val(params.availStdt.substring(10,12));
+			$('#couponIssueForm input[name=availEddt]').val(gagaAgGrid.toDateFormat(params.availEddt));
+			$("#couponIssueForm select[name=availEdHH]").val(params.availEddt.substring(8,10));
+			$("#couponIssueForm select[name=availEdMM]").val(params.availEddt.substring(10,12));
+		} else {
+			$('#couponIssueForm input[name=availDays]').val(params.availDays);
+		}
 
 		//유효기간 숨김처리
 		if (params.pdGb === 'P') {