이태영 - 20210126 난수 쿠폰 적용 중간커밋

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

@@ -184,4 +184,20 @@ public interface TsaCouponDao {
 	 * @since 2021-01-21
 	 */
 	void updateCustCouponAvailEddt(CustCoupon issueCust);
+
+	/**
+	 * 난수, 시리얼 쿠폰 등록
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 01. 26
+	 */
+	void createRandomCouponInfo(Coupon param);
+
+	/**
+	 * 동일 쿠폰명이 존재하는지 확인
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 01. 26
+	 */
+	int getSerialOverlapCheck(Coupon param);
 }

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

@@ -44,20 +44,11 @@ public class TsaCouponService {
 	 * @since  2021-01-11
 	 */
 	@Transactional("shopTxnManager")
-	public void saveCoupon(Coupon params) {
+	public String saveCoupon(Coupon params){
 		String cpnId = "";		// 쿠폰ID
 		params.setRegNo(TsaSession.getInfo().getUserNo());
 		params.setUpdNo(TsaSession.getInfo().getUserNo());
 
-		// 자동생성이면 시퀀스 가져오기
-		if(StringUtils.isBlank(params.getCpnId())) {
-			Integer sequence = commonService.getNextSequence("SEQ_COUPON");
-			cpnId = "CPN"+sequence;
-		} else {
-			cpnId = params.getCpnId();
-		}
-		params.setCpnId(cpnId);
-
 		couponDao.couponInsert(params);
 
 		Gson gson = new Gson();
@@ -162,7 +153,7 @@ public class TsaCouponService {
 		}
 
 		// 수정모드이고 변경된 쿠폰상태가 대기 , 중지 인경우 고객이 발급받은 내용도 변경
-		if(!StringUtils.isBlank(params.getCpnId()) &&
+		if(params.getCpnId() != 0 &&
 				(params.getCpnStat().equals("G232_10") || params.getCpnStat().equals("G232_12")) ) {
 
 			CustCoupon custCoupon = new CustCoupon();
@@ -179,6 +170,23 @@ public class TsaCouponService {
 				}
 			}
 		}
+
+		log.info("CHECK GUBUN >> " + params.getCpnType() + " / " + params.getDcCdGb() + " / " + params.getTotPubLimitQty());
+
+		// 시리얼 쿠폰 생성
+		if("G230_20".equals(params.getCpnType()) && "G233_10".equals(params.getDcCdGb())) {
+			// 시리얼 쿠폰명이 동일한 쿠폰이 일정 겹치는 부분이 있는지 확인
+			int overlapCheck = couponDao.getSerialOverlapCheck(params);
+			if(overlapCheck < 1) {
+				for(int i = 0 ; i < params.getTotPubLimitQty() ; i++) {
+					couponDao.createRandomCouponInfo(params);
+				}
+			} else {
+				throw new IllegalStateException("같은 시리얼명이 사용되는 쿠폰이 중복됩니다. 기간을 확인해주세요.");
+			}
+		}
+
+		return "SUCCESS";
 	}
 
 	/**

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

@@ -296,6 +296,8 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("hhList", hhList);
 		// 입점업체 조회
 		mav.addObject("ibSupplyCompList", rendererService.getSupplyCompanyList("", "N"));
+		// 할인 쿠폰 코드 조회
+		mav.addObject("dcCdList", rendererService.getCommonCodeList("G233", "Y"));
 		// 정상/이월 조회
 		mav.addObject("formalGbList" , rendererService.getCommonCodeList("G009"));
 		// 카테고리 구분 조회
@@ -364,7 +366,10 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaResponse saveCoupon(@RequestBody Coupon coupon) {
 		log.info("couponSave : {}", coupon);
 
-		couponService.saveCoupon(coupon);
+		String result = couponService.saveCoupon(coupon);
+		if(!"SUCCESS".equals(result)) {
+			return super.error(message.getMessage(result));
+		}
 
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

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

@@ -17,7 +17,7 @@ import java.util.Collection;
 @Data
 public class Coupon extends TscBaseDomain {
     // TB_COUPON
-    private String  cpnId;					// 쿠폰ID
+    private int     cpnId;					// 쿠폰ID
     private String  cpnNm;					// 쿠폰명
     private String  siteCd;					// 사이트코드(공통코드G000)
     private String  afLinkCd;				// 제휴링크코드
@@ -56,6 +56,8 @@ public class Coupon extends TscBaseDomain {
     private String  payType;                // 결제수단
     private String  custJoinYn;             // 신규회원여부
     private String  afChannel;              // 제휴링크
+    private String  dcCdGb;                 // 할인코드유형 (공통코드G233)
+    private String  rdCpnNm;                // 랜덤쿠폰 사용키 (시리얼명 or 난수)
 
     // 그리드 파라미터
     private String  supplyCompList;         // 공급업체 리스트

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

@@ -15,7 +15,7 @@ import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
 public class CustCoupon extends TscBaseDomain {
     private Integer custCpnSq;              // 고객쿠폰일련번호
     private Integer custNo;                 // 고객번호
-    private String  cpnId;                  // 쿠폰아이디
+    private int     cpnId;                  // 쿠폰아이디
     private String  availStdt;              // 유효시작일시
     private String  availEddt;              // 유효종료일시
     private String  pubReason;              // 발행사유(공통코드G250)

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

@@ -106,9 +106,11 @@
 	<!-- 쿠폰 등록 -->
 	<insert id="couponInsert" parameterType="Coupon">
 		/* TsaCoupon.couponInsert*/
+		<selectKey keyProperty="cpnId" resultType="int" order="AFTER">
+			SELECT LAST_INSERT_ID()
+		</selectKey>
 		INSERT INTO TB_COUPON (
-			CPN_ID
-		  , CPN_NM
+		    CPN_NM
 		  , SITE_CD
 		  , AF_LINK_CD
 		  , USABLE_CUST_GB
@@ -128,6 +130,7 @@
 		  , TOT_PUB_LIMIT_QTY
 		  , ONE_PUB_QTY
 		  , DN_GB
+		  , DC_CD_GB
 		  , DOWN_STDT
 		  , DOWN_EDDT
 		  , BUY_LIMIT_AMT
@@ -150,8 +153,7 @@
 		  </if>
 		  , CUST_JOIN_YN
 		) VALUES (
-		    #{cpnId}
-		  , #{cpnNm}
+		    #{cpnNm}
 		  , #{siteCd}
 		  , #{afLinkCd}
 		  , #{usableCustGb}
@@ -180,6 +182,7 @@
 		  , #{totPubLimitQty}
 		  , #{onePubQty}
 		  , #{dnGb}
+		  , #{dcCdGb}
 		  , DATE_FORMAT(#{downStdt} , '%Y-%m-%d %H:%i:%s')
 		  , DATE_FORMAT(#{downEddt} , '%Y-%m-%d %H:%i:%s')
 		  , #{buyLimitAmt}
@@ -218,8 +221,7 @@
 		  </if>
 		  , #{custJoinYn}
 		) ON DUPLICATE KEY UPDATE
-		    CPN_ID = #{cpnId}
-		  ,	CPN_NM = #{cpnNm}
+		    CPN_NM = #{cpnNm}
 		  , SITE_CD = #{siteCd}
 		  , AF_LINK_CD = #{afLinkCd}
 		  , USABLE_CUST_GB = #{usableCustGb}
@@ -409,47 +411,54 @@
 	<!-- 쿠폰 상세 조회-->
 	<select id="getCouponDetail" parameterType="String" resultType="Coupon">
 		/* TsaCoupon.getCouponDetail */
-		SELECT CPN_ID
-			 , CPN_NM
-			 , SITE_CD
-			 , AF_LINK_CD
-			 , USABLE_CUST_GB
-			 , USABLE_CUST_GRADE
-			 , CPN_TYPE
-			 , APPLY_SCOPE
-			 , DC_WAY
-			 , DC_PVAL
-			 , DC_MVAL
-			 , DC_AVAL
-			 , MAX_DC_AMT
-			 , PD_GB
-			 , AVAIL_STDT
-			 , AVAIL_EDDT
-			 , AVAIL_DAYS
-			 , CUST_PUB_LIMIT_QTY
-			 , TOT_PUB_LIMIT_QTY
-			 , ONE_PUB_QTY
-			 , DN_GB
-			 , DOWN_STDT
-			 , DOWN_EDDT
-			 , BUY_LIMIT_AMT
-			 , PLAN_SQ
-			 , REISSUANCE
-			 , CPN_STAT
-			 , END_ALIM_YN
-			 , FIRST_YN
-			 , DOWN_YN
-			 , CUST_JOIN_STDT
-			 , CUST_JOIN_EDDT
-			 , BUY_STDT
-			 , BUY_EDDT
-			 , PAY_TYPE
-			 , CUST_JOIN_YN
+		SELECT B.CPN_ID
+			 , B.CPN_NM
+			 , B.SITE_CD
+			 , B.AF_LINK_CD
+			 , B.USABLE_CUST_GB
+			 , B.USABLE_CUST_GRADE
+			 , B.CPN_TYPE
+			 , B.APPLY_SCOPE
+			 , B.DC_WAY
+			 , B.DC_PVAL
+			 , B.DC_MVAL
+			 , B.DC_AVAL
+			 , B.MAX_DC_AMT
+			 , B.PD_GB
+			 , B.AVAIL_STDT
+			 , B.AVAIL_EDDT
+			 , B.AVAIL_DAYS
+			 , B.CUST_PUB_LIMIT_QTY
+			 , B.TOT_PUB_LIMIT_QTY
+			 , B.ONE_PUB_QTY
+			 , B.DN_GB
+			 , B.DOWN_STDT
+			 , B.DOWN_EDDT
+			 , B.BUY_LIMIT_AMT
+			 , B.PLAN_SQ
+			 , B.REISSUANCE
+			 , B.CPN_STAT
+			 , B.END_ALIM_YN
+			 , B.FIRST_YN
+			 , B.DOWN_YN
+			 , B.CUST_JOIN_STDT
+			 , B.CUST_JOIN_EDDT
+			 , B.BUY_STDT
+			 , B.BUY_EDDT
+			 , B.PAY_TYPE
+			 , B.CUST_JOIN_YN
 			 , (SELECT AF_CHANNEL
 			      FROM TB_AF_LINK A
 			     WHERE A.AF_LINK_CD = B.AF_LINK_CD) AS AF_CHANNEL
+			 , RC.RD_CPN_NM AS RD_CPN_NM
   		  FROM TB_COUPON B
-    	 WHERE CPN_ID = #{value}
+		  LEFT OUTER JOIN (SELECT CPN_ID
+		  						, RD_CPN_NM
+							 FROM TB_RANDOM_COUPON
+		    				GROUP BY CPN_ID, RD_CPN_NM) RC
+		    ON B.CPN_ID = RC.CPN_ID
+		   AND B.DC_CD_GB = 'G233_10'		<!-- 시리얼 유형일 경우에만 랜덤쿠폰 검색 검색 -->
+    	 WHERE B.CPN_ID = #{value}
 	</select>
 
 	<!-- 쿠폰 발급 개수 조회 -->
@@ -606,4 +615,79 @@
 		   AND CUST_CPN_SQ = #{custCpnSq}
 	</update>
 
+	<!-- 특정 쿠폰 발급받은 회원 조회-->
+	<select id="getSerialOverlapCheck" parameterType="Coupon" resultType="int">
+		/* TsaCoupon.getSerialOverlapCheck : 중복 시리얼넘버 체크 */
+		WITH CHECK_DATA AS (
+		    SELECT C.CPN_ID
+				 , C.DOWN_STDT
+		    	 , C.DOWN_EDDT
+		    	 , C.AVAIL_STDT
+		    	 , C.AVAIL_EDDT
+		    	 , C.AVAIL_DAYS
+		    FROM TB_COUPON C
+			INNER JOIN (SELECT CPN_ID
+							 , RD_CPN_NM
+						FROM TB_RANDOM_COUPON
+						WHERE RD_CPN_NM = #{rdCpnNm}
+						GROUP BY CPN_ID, RD_CPN_NM ) RC
+		    ON C.CPN_ID = RC.CPN_ID
+		)
+		SELECT SUM(A.CNT) AS CNT
+		FROM ( SELECT COUNT(1) AS CNT		<!-- 다운 시작일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.DOWN_STDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.DOWN_STDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 다운 종료일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.DOWN_EDDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.DOWN_EDDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 유효 시작일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.AVAIL_STDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.AVAIL_STDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 유효 종료일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.AVAIL_EDDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.AVAIL_EDDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 쿠폰 사용 기한이 일수일경우 다운시작일 + 일수가 사용가능일. 해당 기준으로 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND DATE_ADD(C.DOWN_STDT, INTERVAL C.AVAIL_DAYS DAY) >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND DATE_ADD(C.DOWN_STDT, INTERVAL C.AVAIL_DAYS DAY) <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 쿠폰 사용 기한이 일수일경우 다운종료일 + 일수가 사용종료일. 해당 기준으로 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND DATE_ADD(C.DOWN_EDDT, INTERVAL C.AVAIL_DAYS DAY) >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND DATE_ADD(C.DOWN_EDDT, INTERVAL C.AVAIL_DAYS DAY) <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s') ) A
+	</select>
+
+	<!-- 고객 쿠폰 발행 -->
+	<insert id="createRandomCouponInfo" parameterType="Coupon">
+		/* TsaCoupon.createRandomCouponInfo */
+		INSERT INTO TB_RANDOM_COUPON (
+			  RD_CPN_NM
+			, CPN_ID
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			  #{rdCpnNm}
+			, #{cpnId}
+			, #{regNo}
+			, CURRENT_TIMESTAMP()
+			, #{updNo}
+			, CURRENT_TIMESTAMP()
+		)
+	</insert>
 </mapper>

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

@@ -28,7 +28,8 @@
 				<input type="hidden" name="exceptGoodsList" id="excepGoodsList">
 				<input type="hidden" name="burdenList" id="burdenList">
 				<input type="hidden" name="cateList" id="cateList">
-				<input type="hidden" name="cpnId2" id="cpnId2" th:if="${cpnDetail}" th:value="${cpnDetail.cpnId}">
+				<input type="hidden" name="rdCpnNm" id="rdCpnNm">
+				<input type="hidden" name="cpnId" id="cpnId" th:if="${cpnDetail}" th:value="${cpnDetail.cpnId}">
 
 				<div class="tabs">
 					<div class="tabsNav">
@@ -36,6 +37,7 @@
 							<li class="on"><a href="#coupontab1">기본정보</a></li>
 							<li><a href="#coupontab2">적용대상</a></li>
 							<li><a href="#coupontab3">입점업체분담율</a></li>
+							<li class="randomCpnTab" style="display:none;"><a href="#coupontab4">시리얼및난수</a></li>
 						</ul>
 					</div>
 					<ul class="tabsCont">
@@ -49,14 +51,10 @@
 										<col style="width:40%;">
 									</colgroup>
 									<tbody>
-										<tr>
-											<th>쿠폰번호<em class="required" title="필수"></em></th>
+										<tr th:if="${cpnDetail}">
+											<th>쿠폰번호</th>
 											<td colspan="5">
-												<input type="hidden" name="copyCpnId" maxlength="50" value="">
-												<input type="text" name="cpnId" id="cpnId" maxlength="50"  style="width:70%;" disabled="true" readonly="readonly" placeholder="자동생성" data-valid-name="쿠폰번호">
-												<label class="chkBox checked" onclick="clickCreateChk(this);">
-													<input type="checkbox" name="cpnCreateType" value="true" class="type-check" checked />쿠폰번호 자동생성
-												</label>
+												<span th:if="${cpnDetail}" th:text="${cpnDetail.cpnId}"></span>
 											</td>
 										</tr>
 										<tr>
@@ -72,6 +70,27 @@
 												<label class="rdoBtn" th:if="${cpnTypeList}" th:each="oneData, status : ${cpnTypeList}"> <input type="radio" name="rdoCpnType"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
 											</td>
 										</tr>
+										<tr class="dcCdGb" style="display:none;">
+											<th>할인쿠폰유형<em class="required" title="필수"></em></th>
+											<td class="normalCol">
+												<input type="hidden" id="dcCd" required="required"  data-valid-name="할인쿠폰유형">
+												<label class="rdoBtn" th:if="${dcCdList}" th:each="oneData, status : ${dcCdList}"> <input type="radio" name="dcCdGb"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
+											</td>
+											<th class="randomCpnArea">난수생성수량<em class="required" title="필수"></em></th>
+											<td class="randomCpnArea">
+												<input type="text" name="randomCpnQty" class="w300" required="required" data-valid-name="랜덤쿠폰발급수량" data-valid-type="numeric">
+											</td>
+										</tr>
+										<tr class="serialCpnArea" style="display:none;">
+											<th>시리얼명<em class="required" title="필수"></em></th>
+											<td>
+												<input type="text" name="serialCpnNm" class="w300" required="required" data-valid-name="시리얼쿠폰키워드">
+											</td>
+											<th>쿠폰발급수량<em class="required" title="필수"></em></th>
+											<td>
+												<input type="text" name="serialCpnQty" class="w300" required="required" data-valid-name="시리얼쿠폰발급수량" data-valid-type="numeric">
+											</td>
+										</tr>
 										<tr>
 											<th>사용가능고객구분<em class="required" title="필수"></em></th>
 											<td>
@@ -247,8 +266,8 @@
 													<option value="N" selected="selected">N</option>
 												</select>
 											</td>
-											<th>총발행제한수량<em class="required" title="필수"></em></th>
-											<td>
+											<th class="dcCdCheck">총발행제한수량<em class="required" title="필수"></em></th>
+											<td class="dcCdCheck">
 												<input type="text" class="w200" name="totPubLimitQty" id="totPubLimitQty" value="0" required="required" data-valid-name="총발행제한수량" data-valid-type="numeric" style="text-align: right;">개<span class="cRed" id="totPubLimitQtySpan"> *제한없음</span>
 											</td>
 										</tr>
@@ -275,7 +294,7 @@
 												</select>
 											</td>
 										</tr>
-										<tr>
+										<tr class="dcCdCheck">
 											<th>1인당발행제한수량<em class="required" title="필수"></em></th>
 											<td>
 												<input type="text" class="w200" name="custPubLimitQty" id="custPubLimitQty" value="0" required="required" data-valid-name="1인당발행제한수량" data-valid-type="numeric" style="text-align: right;">개<span class="cRed" id="custPubLimitQtySpan"> *제한없음</span>
@@ -431,12 +450,19 @@
 										<button type="button" class="btn btn-danger btn-lg" id="btnDelRow">행삭제</button>
 									</li>
 								</ul>
-
 								<div id="inComGridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
-
 							</div>
 						</li>
 						<!-- 입점업체분담끝-->
+						<!-- 난수 및 네임쿠폰 설정 -->
+						<li class="tab" id="coupontab4">
+							<div class="panelStyle">
+								<span>
+									<div id="randomCpnList" style="width: 100%; height: 500px" class="ag-theme-balham"></div>
+								</span>
+							</div>
+						</li>
+						<!-- 난수 및 네임쿠폰 설정-->
 					</ul>
 				</div>
 			</form>
@@ -551,12 +577,20 @@
 		{ headerName: "쿠폰대상일련번호"  , field: "cpnRefvalSq" , width: 120 , cellClass: 'text-center' , hide:true}
 	];
 
+	// ag-grid 공급처 컬럼
+	var randomCouponDefs = [
+		{ headerName : "생성쿠폰명" , field: "supplyCompCd" , width:150, cellClass: 'text-center'} ,
+		{ headerName: "고객아이디" , field: "supplyCompNm" , width:150, cellClass: 'text-center'},
+		{ headerName: "고객명" , field: "supplyCompNm" , width:150, cellClass: 'text-center'}
+	];
+
 	var inComGridOptions = gagaAgGrid.getGridOptions(columnDefs);
 	var cateGridOptions = gagaAgGrid.getGridOptions(cateSelColumnDefs);
 	var goodsGridOptions = gagaAgGrid.getGridOptions(goodsSelColumnDefs);
 	var brandGridOptions = gagaAgGrid.getGridOptions(brandSelColumnDefs);
 	var supplyGridOptions = gagaAgGrid.getGridOptions(supplyColumnDefs);
 	var excepGoodsGridOptions = gagaAgGrid.getGridOptions(excepGoodsColumnDefs);
+	var randomCouponGridOptions = gagaAgGrid.getGridOptions(randomCouponDefs);
 
 	inComGridOptions.defaultColDef.editable = true;
 	inComGridOptions.rowSelection = "multiple";
@@ -727,16 +761,42 @@
 
 		// 주문서 쿠폰 선택시 결제수단 노출
 		if(radioValue == 'G230_20') {
-			$('.payTypeTr').css('display' , '');
+			$('#CouponForm .payTypeTr').show();
 			$('#CouponForm #payType').attr('required' , true);
+			$("#CouponForm .dcCdGb").show();		// 할인쿠폰유형 노출
 		} else {
-			$('.payTypeTr').css('display' , 'none');
+			$('#CouponForm .payTypeTr').hide();
 			$('#CouponForm #payType').attr('required' , false );
+			$("#CouponForm .dcCdGb").hide();		// 할인쿠폰유형 숨김
+			$("#CouponForm input:radio[name='dcCdGb']:radio[value='G233_00']").prop('checked', true);		// 주문서 쿠폰이 아닐 경우 일반 쿠폰으로 설정
 		}
 
 		$('#CouponForm #cpnType').val(radioValue);
 	});
 
+	// 할인 쿠폰 유형 변경
+	$("#CouponForm input[name=dcCdGb]").bind('click change', function () {
+		if(this.value == "G233_00") {			// 일반 유형
+			$("#CouponForm .dcCdCheck").show();
+			$("#CouponForm .serialCpnArea").hide();
+			$("#CouponForm .randomCpnArea").hide();
+			$("#CouponForm #custJoinYn").parent().attr("colspan", "");
+			$("#CouponForm .normalCol").attr("colspan", "5");
+		} else {
+			if(this.value == "G233_10") {		// 시리얼 유형
+				$("#CouponForm .serialCpnArea").show();
+				$("#CouponForm .randomCpnArea").hide();
+				$("#CouponForm .normalCol").attr("colspan", "5");
+			} else {							// 난수 유형
+				$("#CouponForm .serialCpnArea").hide();
+				$("#CouponForm .randomCpnArea").show();
+				$("#CouponForm .normalCol").attr("colspan", "");
+			}
+			$("#CouponForm .dcCdCheck").hide();								// 총발행제한수량, 1회발행수량, 1인당발행제한수량 숨김
+			$("#CouponForm #custJoinYn").parent().attr("colspan", "5");		// 총발행제한 수량을 없애면서 신규회원여부 colspan 수정
+		}
+	});
+
 	// 적용대상 - 브랜드 추가 버튼시
 	$('#btnBrandAdd').on('click' , function(){
 		cfnOpenBrandListPopup("fnSetPopupBrandInfo", "M");
@@ -1105,31 +1165,6 @@
 		inComGridOptions.api.updateRowData({remove:gagaAgGrid.selectedRowData(inComGridOptions)});
 	});
 
-
-
-	// 쿠폰번호 자동생성 클릭시
-	function clickCreateChk(){
-		var flag = $('#CouponForm input[name=cpnCreateType]').prop("checked");
-		// 발급받은 이력이 있으면 수정 안됨
-		if(issueCnt > 0 ) {
-			return false;
-		}
-
-		if(!flag) {
-			$("#CouponForm input[name=cpnId]").prop("disabled", true);
-			$("#CouponForm input[name=cpnId]").attr("required", false);
-			$("#CouponForm input[name=cpnId]").attr("readonly", true);
-			$("#CouponForm input[name=cpnId]").attr("placeholder", "자동생성");
-			$('#CouponForm input[name=cpnCreateType]').prop("checked" , false);
-		} else{
-			$("#CouponForm input[name=cpnId]").prop("disabled", false);
-			$("#CouponForm input[name=cpnId]").attr("required", true);
-			$("#CouponForm input[name=cpnId]").attr("placeholder", "");
-			$("#CouponForm input[name=cpnId]").attr("readonly", false);
-			$('#CouponForm input[name=cpnCreateType]').prop("checked" , true);
-		}
-	}
-
 	// 제휴링크채널 수정 (제휴링크가 꼭필요한지 확인필요)
 	function fnChangeAfLinkCdList(){
 		var actionUrl = "/business/aflink/list" + '?' + $('#afChannel').serialize();
@@ -1180,6 +1215,15 @@
 		// 신규회원기간 세팅
 		$('#CouponForm #custJoinStdt').val($('#CouponForm #custJoinStDay').val() + " " + $('#CouponForm #custJoinStHH').val() + ":" + $('#CouponForm #custJoinStMM').val() + ":00");
 		$('#CouponForm #custJoinEddt').val($('#CouponForm #custJoinEdDay').val() + " " + $('#CouponForm #custJoinEdHH').val() + ":" + $('#CouponForm #custJoinEdMM').val() + ":59");
+
+		// 할인쿠폰 유형에 따른 총 발행수량 수정 (주문서 쿠폰이고 난수쿠폰일 경우)
+		if($('#CouponForm #cpnType').val() == "G230_20" && $('#CouponForm input:radio[name="dcCdGb"]:checked').val() == "G233_20") {
+			$('#CouponForm input[name="totPubLimitQty"]').val($('#CouponForm input[name="randomCpnQty"]').val());	// 총 발행수량 난수 생성수량으로 변경
+		} else if ($('#CouponForm #cpnType').val() == "G230_20" && $('#CouponForm input:radio[name="dcCdGb"]:checked').val() == "G233_10") {		// 주문서 쿠폰이고 시리얼 유형일 경우
+			$('#CouponForm input[name="rdCpnNm"]').val($('#CouponForm input[name="serialCpnNm"]').val());			// 시리얼유형쿠폰명 저장
+			$('#CouponForm input[name="totPubLimitQty"]').val($('#CouponForm input[name="serialCpnQty"]').val());	// 총 발행수량 랜덤쿠폰발급수량으로 변경
+		}
+
 		// 적용대상 - 공급처 그리드 전체값 세팅
 		var supplyAllData = gagaAgGrid.getAllRowData(supplyGridOptions);
 		var jsonSupplyCompData = JSON.stringify(supplyAllData);
@@ -1214,10 +1258,12 @@
 		gagaAgGrid.createGrid('supplyGridList', supplyGridOptions);
 		gagaAgGrid.createGrid('goodsGridList', goodsGridOptions);
 		gagaAgGrid.createGrid('excepGoodsGridList', excepGoodsGridOptions);
+		gagaAgGrid.createGrid('randomCpnList', randomCouponGridOptions);
 
 		// 초기화시 데이터 세팅
 		if (mode == "N") {
 			$('input[name=rdoCpnType]').eq(0).attr("checked", true);
+			$('input[name=dcCdGb]').eq(0).attr("checked", true);
 			$('input[name=rdoDcWay]').eq(0).attr("checked", true);
 			$('input[name=rdoApplyScope]').eq(0).attr("checked", true)
 			$('#CouponForm #availEdHH option:last').attr("selected", "selected");
@@ -1229,6 +1275,8 @@
 			$('#buyEdHH option:last').attr("selected", "selected");
 			$('#buyEdMM option:last').attr("selected", "selected");
 			$("#CouponForm #afChannel option:first").attr("selected" , "selected");
+			$("#CouponForm .normalCol").attr("colspan", "5");
+			$("#CouponForm .randomCpnArea").hide();
 		} else {
 			// 수정모드시 그리드 세팅
 			inComGridOptions.api.setRowData(cpnDtlBurdenList);
@@ -1264,6 +1312,29 @@
 			$("#CouponForm #buyLimitAmt").val(cpnDetail.buyLimitAmt);
 			$("#CouponForm #cpnId").val(cpnDetail.cpnId);
 
+			// 한번 저장되면 쿠폰유형, 할인쿠폰유형, 난수 생성수량, 시리얼명, 시리얼쿠폰발급수량 수정 불가 처리
+			$("#CouponForm input:radio[name='rdoCpnType']").attr('readonly', true);
+			$("#CouponForm input:radio[name='rdoCpnType']").parent().prop('disabled', true);
+			$("#CouponForm input:radio[name='dcCdGb']").attr('readonly', true);
+			$("#CouponForm input:radio[name='dcCdGb']").parent().prop('disabled', true);
+			$("#CouponForm input[name='serialCpnNm']").prop("disabled", true);
+			$("#CouponForm input[name='serialCpnQty']").prop("disabled", true);
+			$("#CouponForm input[name='randomCpnQty']").prop("disabled", true);
+
+			// 할인코드유형이 일반유형이 아니면 시리얼 및 난수 생성 및 지급 내역 탭 노출
+			if(cpnDetail.dcCdGb != "G233_00" ) {
+				$("#CouponForm .randomCpnTab").show();
+				if(cpnDetail.dcCdGb == "G233_10") {		// 시리얼 유형
+					$("#CouponForm input[name='serialCpnQty']").val(cpnDetail.totPubLimitQty);
+					$("#CouponForm input[name='serialCpnNm']").val(cpnDetail.rdCpnNm);
+					$("#CouponForm .serialCpnArea").show();
+				} else if (cpnDetail.dcCdGb == "G233_20") {
+					$("#CouponForm input[name='randomCpnQty']").val(cpnDetail.totPubLimitQty);
+					$("#CouponForm .randomCpnArea").show();
+					$("#CouponForm .normalCol").attr("colspan", "");
+				}
+			}
+
 			/*
 			$("#CouponForm input:checkbox[name='cpnCreateType']").parent("label").addClass("formControl");
 			$("#CouponForm input:checkbox[name='cpnCreateType']").parent("label").prop('disabled', true);
@@ -1318,7 +1389,6 @@
 				$("#CouponForm #downStMM").attr('disabled', true);
 				$("#CouponForm #buyLimitAmt").attr('readonly', true);
 				$("#CouponForm input:radio[name='rdoDcWay']").attr('readonly', true);
-				$("#CouponForm input:radio[name='rdoCpnType']").attr('readonly', true);
 				$("#CouponForm input:radio[name='rdoApplyScope']").attr('readonly', true);
 				$("#CouponForm .rdoBtn").css('cursor', 'auto');
 				$("#CouponForm #cpnId").attr('readonly', true);