이태영 - 2020127 삭제된 data 백업

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

@@ -21,7 +21,7 @@ public interface TsaDeliveryDao {
 	 * @param delivery - 배송정보
 	 * @return Collection<Delivery>
 	 * @author moon
-	 * @since 2020. 11.05
+	 * @since 2020. 11. 05
 	 */
 	Collection<Delivery> getDeliveryList(Delivery delivery);
 
@@ -31,7 +31,7 @@ public interface TsaDeliveryDao {
 	 * @param ordDtlNo - 주문상세번호
 	 * @return Collection<Delivery>
 	 * @author moon
-	 * @since 2020. 11.05
+	 * @since 2020. 11. 05
 	 */
 	Collection<Delivery> getOrderDetail(long ordDtlNo);	
 	
@@ -106,7 +106,7 @@ public interface TsaDeliveryDao {
 	/**
 	 * 배송/회수지시 목록
 	 *
-	 * @param delivery - 배송/회수지시 정보
+	 * @param Delivery - 배송/회수지시 정보
 	 * @return Collection<Delivery>
 	 * @author moon
 	 * @since 2020. 11. 11

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

@@ -1,12 +1,9 @@
 package com.style24.admin.biz.dao;
 
 import com.style24.core.support.annotation.ShopDs;
-import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.FreeGoodsPromotion;
-import com.style24.persistence.domain.Itemkind;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -28,26 +25,11 @@ public interface TsaMarketingDao {
 	 * @since 2020. 12. 17
 	 */
 	Collection<FreeGoodsPromotion> getFreeGoodsPromotionList(FreeGoodsPromotion marketing);
-    /* // xodud1202 진행 */
+
+	/* // xodud1202 진행 */
 
 	/* JSM 진행 */
-	/**
-	 * 쿠폰 리스트 조회
-	 * @param  Coupon
-	 * @return ArrayList<Coupon>
-	 * @author xyzp1539
-	 * @since 2020-12-22
-	 */
-	ArrayList<Coupon> getCouponList(Coupon param);
 
-	/**
-	 * 쿠폰 리스트 카운트 조회
-	 * @param  Coupon
-	 * @return int
-	 * @author xyzp1539
-	 * @since 2020-12-22
-	 */
-	int getCouponListCnt(Coupon param);
 	/* // JSM 진행 */
 
 }

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

@@ -26,7 +26,6 @@ import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -78,39 +77,19 @@ public class TsaMarketingService {
 
 	/**
 	 * 사은품 프로모션 리스트
-	 * @param marketing
+	 * @param param
 	 * @return
 	 * @author xodud1202
 	 * @since 2020. 12. 17
 	 */
-	public Collection<FreeGoodsPromotion> getFreeGoodsPromotionList(FreeGoodsPromotion marketing) {
-		return marketingDao.getFreeGoodsPromotionList(marketing);
+	public Collection<FreeGoodsPromotion> getFreeGoodsPromotionList(FreeGoodsPromotion param) {
+		return marketingDao.getFreeGoodsPromotionList(param);
 	}
 
 	/* // xodud1202 진행 */
 
 	/* JSM 진행 */
-	/**
-	 * 쿠폰 리스트 조회
-	 * @param  Coupon
-	 * @return ArrayList<Coupon>
-	 * @author xyzp1539
-	 * @since 2020-12-22
-	 */
-	public ArrayList<Coupon> getCouponList(Coupon param) {
-		return marketingDao.getCouponList(param);
-	}
 
-	/**
-	 * 쿠폰리스트 카운트 조회
-	 * @param  Coupon
-	 * @return int
-	 * @author xyzp1539
-	 * @since 2020-12-22
-	 */
-	public int getCouponListCnt(Coupon param) {
-		return marketingDao.getCouponListCnt(param);
-	}
 	/* // JSM 진행 */
 
 }

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

@@ -1,18 +1,14 @@
 package com.style24.admin.biz.web;
 
 import com.gagaframework.web.parameter.GagaMap;
-import com.style24.admin.biz.service.TsaCommonService;
-import com.style24.admin.biz.service.TsaMarketingService;
-import com.style24.admin.biz.service.TsaRendererService;
-import com.style24.admin.biz.service.TsaSystemService;
+import com.gagaframework.web.util.GagaDateUtil;
+import com.style24.admin.biz.service.*;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.CommonCode;
-import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.FreeGoodsPromotion;
-
+import com.style24.persistence.domain.SupplyCompany;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -20,9 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -44,6 +38,9 @@ public class TsaMarketingController extends TsaBaseController {
 	@Autowired
 	private TsaMarketingService marketingService;
 
+	@Autowired
+	private TsaBusinessService businessService;
+
 	@Autowired
 	private TsaRendererService rendererService;
 
@@ -56,7 +53,6 @@ public class TsaMarketingController extends TsaBaseController {
 	/* xodud1202 진행 */
 	/**
 	 * 사은품 프로모션 관리 화면
-	 * @return
 	 * @author xodud1202
 	 * @since 2020. 12. 16
 	 */
@@ -69,148 +65,53 @@ public class TsaMarketingController extends TsaBaseController {
 
 	/**
 	 * 사은품 프로모션 목록 조회
-	 *
-	 * @return
 	 * @author xodud1202
 	 * @since 2020. 10. 17
 	 */
 	@PostMapping("/freeGoodsPromotion/list")
 	@ResponseBody
-	public GagaMap getFreeGoodsPromotionList(@RequestBody FreeGoodsPromotion marketing) {
+	public GagaMap getFreeGoodsPromotionList(@RequestBody FreeGoodsPromotion param) {
 		GagaMap result = new GagaMap();
 
-		List<FreeGoodsPromotion> marketingList = (ArrayList<FreeGoodsPromotion>) marketingService.getFreeGoodsPromotionList(marketing);
-
-		marketing.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
-		marketing.setPageable(new TsaPageRequest(marketing.getPageNo() - 1, marketing.getPageSize()));
-		marketing.getPageable().setTotalCount(marketingList.size());
-
-		result.set("pageing", marketing);
-		result.set("freeGoodsList", marketingList);
-
-		return result;
-	}
-
-
-	/* // xodud1202 진행 */
-
-	/* JSM 진행 */
-	/**
-	 * 쿠폰 리스트 목록 화면
-	 * @author xyzp1539
-	 * @since 2020-12-21
-	 */
-	@GetMapping("/coupon/form")
-	public ModelAndView couponListForm(){
-		ModelAndView mav = new ModelAndView();
-
-		// 쿠폰 유형 조회
-		mav.addObject("cpnTypeList" ,  rendererService.getCommonCodeList("G230"));
-		// 할인 유형 조회
-		mav.addObject("dcWayList" , rendererService.getCommonCodeList("G240"));
-		// 사이트 조회
-		mav.addObject("siteCdList" , rendererService.getCommonCodeList("G000"));
-
-		mav.setViewName("marketing/CouponListForm");
-
-		return mav;
-	}
-
-	/**
-	 * 쿠폰 리스트 조회
-	 * @param  Coupon
-	 * @return GagaMap
-	 * @author xyzp1539
-	 * @since 2020-12-22
-	 */
-	@PostMapping("/coupon/list")
-	@ResponseBody
-	public GagaMap getCouponList(@RequestBody Coupon param){
-		GagaMap result =  new GagaMap();
-
-		ArrayList<Coupon> cpnList = marketingService.getCouponList(param);
-		int cpnTotCnt = marketingService.getCouponListCnt(param);
+		List<FreeGoodsPromotion> marketingList = (ArrayList<FreeGoodsPromotion>) marketingService.getFreeGoodsPromotionList(param);
 
 		param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		param.setPageable(new TsaPageRequest(param.getPageNo() - 1, param.getPageSize()));
-		param.getPageable().setTotalCount(cpnTotCnt);
+		param.getPageable().setTotalCount(marketingList.size());
 
-		result.set("pageing" , param);
-		result.set("cpnTotCnt" , cpnTotCnt);
-		result.set("cpnList" , cpnList);
+		result.set("pageing", param);
+		result.set("freeGoodsList", marketingList);
 
 		return result;
 	}
 
+
 	/**
-	 * 쿠폰 등록 팝업 화면
-	 * @return ModelAndView
-	 * @author xyzp1539
-	 * @since 2020-12-23
+	 * 세트상품구성 화면
+	 *
+	 * @param
+	 * @return
+	 * @author eskim
+	 * @since 2020. 05. 26
 	 */
-	@GetMapping("/coupon/popup/form")
 	@ResponseBody
-	public ModelAndView couponCreatePopup() {
+	@GetMapping("/freeGoodsRegiPopup/form")
+	public ModelAndView freeGoodsRegiForm(FreeGoodsPromotion param) {
 		ModelAndView mav = new ModelAndView();
-		String num = "";
-
-		// 일시 시 리스트 세팅
-		Collection<CommonCode> hhList = new ArrayList<CommonCode>();
-		for(int i = 0; i < 24; i++) {
-			num = "";
-			CommonCode temp = new CommonCode();
-			if(i < 10) {
-				num = "0" + i;
-			} else {
-				num = String.valueOf(i);
-			}
 
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
 
-			temp.setCd(num);
-			temp.setCdNm(num+"시");
-
-			hhList.add(temp);
-		}
-		// 일시 분 리스트 세팅
-		Collection<CommonCode> mmList = new ArrayList<CommonCode>();
-		for(int i = 0 ; i < 60; i++) {
-			num = "";
-			CommonCode temp = new CommonCode();
-			if(i < 10) {
-				num = "0" + i;
-			} else {
-				num = String.valueOf(i);
-			}
-			temp.setCd(num);
-			temp.setCdNm(num+"분");
-
-			mmList.add(temp);
-		}
-
-		// 쿠폰 유형 조회
-		mav.addObject("cpnTypeList" ,  rendererService.getCommonCodeList("G230"));
-		// 사용가능 고객구분 조회
-		mav.addObject("usableCustGbList", rendererService.getCommonCodeList("G100"));
-		// 사용가능 고객등급 조회
-		mav.addObject("usableCustGradeList", rendererService.getCommonCodeList("G110"));
-		// 사이트코드 조회
-		mav.addObject("siteCdList" , rendererService.getCommonCodeList("G000"));
-		// 재발급 여부 조회
-		mav.addObject("reissuanceList" , rendererService.getCommonCodeList("G231"));
-		// 할인방식 조회
-		mav.addObject("dcWayList" , rendererService.getCommonCodeList("G240"));
-		// 쿠폰다운로드 방식 조회
-		mav.addObject("dnGbList" , rendererService.getCommonCodeList("G058"));
-		// 시간 분 리스트 세팅
-		mav.addObject("mmList" , mmList);
-		// 시간 시 리스트 세팅
-		mav.addObject("hhList" , hhList);
-
-		mav.setViewName("marketing/CouponCreatePopupForm");
+		mav.addObject("param", param);
+		mav.setViewName("marketing/FreeGoodsPromotionRegiForm");
 		return mav;
 	}
+
+
+	/* // xodud1202 진행 */
+
+	/* JSM 진행 */
+
 	/* // JSM 진행 */
 }

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

@@ -1,64 +0,0 @@
-package com.style24.persistence.domain;
-
-import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.TscBaseDomain;
-import lombok.Data;
-
-/**
- * 쿠폰 도메인
- * @author xyzp1539
- * @since 2020-12-21
- */
-@SuppressWarnings("serial")
-@Data
-public class Coupon extends TscBaseDomain {
-
-	private String  cpnId;					// 쿠폰ID
-	private String  cpnNm;					// 쿠폰명
-	private String  siteCd;					// 사이트코드(공통코드G000)
-	private String  afLinkCd;				// 제휴링크코드
-	private String  usableCustGb;			// 사용가능고객구분(공통코드G100)
-	private String  useableCustGrade;		// 사용가능고객등급(공통코드G110)
-	private String  cpnType;				// 쿠폰유형(공통코드G230)
-	private String  applyScope;				// 적용범위(A:전체, I:개별). "I:개별"이고 쿠폰유형이 "20:장바구니쿠폰" 외 이면 TB_COUPON_REFVAL 참조
-	private String  dcWay;					// 할인방식(공통코드G240)
-	private Integer dcPval;					// 할인값(PC). 할인방식이 금액이면 할인금액, 율이면 할인율
-	private Integer dcMval;					// 할인값(모바일). 할인방식이 금액이면 할인금액, 율이면 할인율
-	private Integer dcAval;					// 할인값(모바일앱)
-	private Integer maxDcAmt;				// 최고할인금액
-	private String  pdGb;					// 기간/일수구분(P:기간, D:일수)
-	private String  availStdt;				// 유효시작일시(기간/일수구분 "P:기간"일 때 사용됨)
-	private String  availEddt;				// 유효종료일시(기간/일수구분 "P:기간"일 때 사용됨)
-	private Integer availDays;				// 유효일수(기간/일수구분 "D:일수"일 때 사용됨)
-	private Integer custPubLimitQty;		// 고객당발행제한수량(0은 무제한)
-	private Integer totPubLimitQty;			// 총발행제한수량(0은 무제한)
-	private Integer onePubQTy;				// 1회발행수량(기본은 1)
-	private String  dnGb;					// 다운로드구분(공통코드G058)
-	private String  downStdt;				// 다운로드시작일시
-	private String  downEddt;				// 다운로드종료일시
-	private Integer buyLimitAmt;			// 구매제한금액(0은 제한없음. 그 외는 00 이상 구매 시 사용)
-	private Integer planSq;					// 기획전번호(쿠폰유형이 플러스쿠폰 일 때 사용 기획전번호)
-	private String  reissuance;				// 쿠폰재발급여부(공통코드G231)
-	private String  cpnStat;				// 쿠폰상태(공통코드G232)
-	private String  endAlimYn;				// 만료알림여부
-	private Integer regNo;					// 등록자번호
-	private String  regDt;					// 등록일시
-	private Integer updNo;					// 수정자번호
-	private String  updDt;					// 수정일시
-	private String  firstYn;				// 첫구매여부 (Y:구매이력이없음 | N:구매이력있음)
-	private String  downYN;					// 다운로드가능여부(마이페이지, 상품상세) --> EP쿠폰, 난수쿠폰
-	private String  custJoinStdt;			// 회원가입일자(FROM) 20200101 (신규회원여부의 판단을 가입일자로 설정함)
-	private String  custJoinEddt;			// 회원가입일자(FROM) 20200101 (신규회원여부의 판단을 가입일자로 설정함)
-	private String  buyStdt;				// 회원가입일자(FROM) 20200101 (구매기간일자(FROM) (해당기간에 구매이력이 없으면 다운로드 가능))
-	private String  buyEddt;				// 구매기간일자(TO)
-
-	private Integer issueCnt;				// 쿠폰발급개수
-	private Integer useCnt;					// 쿠폰사용개수
-
-	// Pagination
-	private TsaPageRequest pageable;
-	private int pageNo = 1;
-	private int pageSize = 50;
-	private int pageUnit = 10;
-
-}

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaMarketing.xml

@@ -1,136 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaMarketingDao">
+	<!-- xodud1202 진행 -->
 
 	<!-- 품목 목록 -->
 	<select id="getFreeGoodsPromotionList" parameterType="FreeGoodsPromotion" resultType="FreeGoodsPromotion">
 		/* TsaMarketing.getFreeGoodsPromotionList */
 		SELECT FG.FREEGIFT_SQ
-		     , FG.FREEGIFT_NM
-		     , FG.FREEGIFT_STAT
-		     , DATE_FORMAT(FG.FREEGIFT_STDT, '%Y.%m.%d') AS FREEGIFT_STDT
-		     , DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y.%m.%d') AS FREEGIFT_EDDT
-		     , (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.REG_NO) AS REG_NM
-		     , DATE_FORMAT(FG.REG_DT, '%Y.%m.%d %H:%i:%S') AS REG_DT
-		     , (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.UPD_NO) AS UPD_NM
-		     , DATE_FORMAT(FG.UPD_DT, '%Y.%m.%d %H:%i:%S') AS UPD_DT
-          FROM TB_FREEGIFT FG
-         WHERE 1=1
+		, FG.FREEGIFT_NM
+		, FG.FREEGIFT_STAT
+		, DATE_FORMAT(FG.FREEGIFT_STDT, '%Y.%m.%d') AS FREEGIFT_STDT
+		, DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y.%m.%d') AS FREEGIFT_EDDT
+		, (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.REG_NO) AS REG_NM
+		, DATE_FORMAT(FG.REG_DT, '%Y.%m.%d %H:%i:%S') AS REG_DT
+		, (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.UPD_NO) AS UPD_NM
+		, DATE_FORMAT(FG.UPD_DT, '%Y.%m.%d %H:%i:%S') AS UPD_DT
+		FROM TB_FREEGIFT FG
+		WHERE 1=1
 		<if test="searchTxt != null and searchTxt != ''">
-			<if test="promotionGubun != null and promotionGubun == 'freeGiftSq'">
+			<if test="promotionGubun != null and promotionGubun == 'freegiftSq'">
 				AND FG.FREEGIFT_SQ = #{searchTxt}
 			</if>
-			<if test="promotionGubun != null and promotionGubun == 'freeGiftName'">
-				AND FG.FREEGIFT_NAME = #{searchTxt}
+			<if test="promotionGubun != null and promotionGubun == 'freegiftNm'">
+				AND FG.FREEGIFT_NM = #{searchTxt}
 			</if>
 		</if>
-         ORDER BY REG_DT DESC
+		ORDER BY REG_DT DESC
 	</select>
 
-	<!-- xodud1202 진행 -->
+
 
 	<!-- // xodud1202 진행 -->
 
 	<!-- JSM 진행 -->
-	<!-- 쿠폰리스트 조회 -->
-	<select id="getCouponList" parameterType="Coupon" resultType="Coupon">
-		/* marketing.getCouponList */
-		SELECT T.*
-		     , COUNT(CUST_CPN_SQ) AS ISSUE_CNT
-		     , COUNT(USED_DT) AS USE_CNT
-		FROM (
-				SELECT SITE_CD
-					 , CPN_ID
-					 , CPN_NM
-					 , USABLE_CUST_GB
-					 , CPN_TYPE
-					 , DC_WAY
-					 , DC_PVAL
-					 , DC_MVAL
-					 , MAX_DC_AMT
-					 , PD_GB
-					 , AVAIL_STDT
-					 , AVAIL_EDDT
-					 , REG_NO
-					 , REG_DT
-			 	  FROM TB_COUPON
-				 WHERE 1=1
-				<if test="siteCd != null and siteCd != ''">
-				   AND SITE_CD = #{siteCd}
-				</if>
-			    <if test="cpnId != null and cpnId != ''">
-			       AND CPN_ID = #{cpnId}
-				</if>
-			    <if test="cpnType != null and cpnType != ''">
-			       AND CPN_TYPE = #{cpnType}
-			    </if>
-			    <if test="regNo != null and regNo != ''">
-			       AND REG_NO = #{regNo}
-			    </if>
-			    <if test="dcWay != null and dcWay != ''">
-			       AND DC_WAY = #{dcWay}
-			    </if>
-			    <if test="cpnNm != null and cpnNm != ''">
-			       AND CPN_NM LIKE LOWER('%' || #{cpnNm} || '%')
-			    </if>
-			    <if test="pdGb != null and pdGb != ''">
-			       AND PD_GB = #{pdGb}
-			    </if>
-			    <if test="availStdt != null and availStdt != '' and availEddt != null and availEddt != ''">
-			      AND AVAIL_STDT >= DATE_FORMAT(#{availStdt} , '%Y-%m-%d')
-			      AND AVAIL_EDDT <![CDATA[ <= ]]> DATE_FORMAT(#{availEddt} , '%Y-%m-%d')
-			    </if>
-			) T
-			LEFT OUTER JOIN TB_CUST_COUPON CC
-					     ON T.CPN_ID = CC.CPN_ID
-            GROUP BY  T.SITE_CD
-					, T.CPN_ID
-					, T.CPN_NM
-					, T.USABLE_CUST_GB
-					, T.CPN_TYPE
-					, T.DC_WAY
-					, T.DC_PVAL
-					, T.DC_MVAL
-					, T.MAX_DC_AMT
-					, T.PD_GB
-					, T.AVAIL_STDT
-					, T.AVAIL_EDDT
-					, T.REG_NO
-					, T.REG_DT
-            ORDER BY  T.REG_DT DESC
-	</select>
 
-	<!-- 쿠폰 리스트 카운트 조회-->
-	<select id="getCouponListCnt" parameterType="Coupon" resultType="int">
-		/* marketing.getCouponListCnt */
-		SELECT COUNT(1)
-		  FROM TB_COUPON
-	    WHERE 1=1
-		<if test="siteCd != null and siteCd != ''">
-		  AND SITE_CD = #{siteCd}
-		</if>
-		<if test="cpnId != null and cpnId != ''">
-		  AND CPN_ID = #{cpnId}
-		</if>
-		<if test="cpnType != null and cpnType != ''">
-		  AND CPN_TYPE = #{cpnType}
-		</if>
-		<if test="regNo != null and regNo != ''">
-		  AND REG_NO = #{regNo}
-		</if>
-		<if test="dcWay != null and dcWay != ''">
-		  AND DC_WAY = #{dcWay}
-		</if>
-		<if test="cpnNm != null and cpnNm != ''">
-		  AND CPN_NM LIKE LOWER('%' || #{cpnNm} || '%')
-		</if>
-		<if test="pdGb != null and pdGb != ''">
-		  AND PD_GB = #{pdGb}
-		</if>
-		<if test="availStdt != null and availStdt != '' and availEddt != null and availEddt != ''">
-		  AND AVAIL_STDT >= DATE_FORMAT(#{availStdt} , '%Y-%m-%d')
-		  AND AVAIL_EDDT <![CDATA[ <= ]]> DATE_FORMAT(#{availEddt} , '%Y-%m-%d')
-		</if>
-	</select>
 	<!-- // JSM 진행 -->
 </mapper>

style24.admin/src/main/webapp/WEB-INF/views/marketing/CouponCreatePopupForm.html

@@ -1,220 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : CouponCreatePopupForm.html
- * @desc    : 쿠폰 등록 팝업 화면
- *============================================================================
- * ISTYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.12.23   xyzp1539       최초 작성
- *******************************************************************************
- -->	
-	<div class="modalPopup"  data-width="1250" data-height="750">
-		<div class="panelStyle">
-			<div class="panelTitle">
-				<h2>쿠폰등록</h2>
-				<button type="button" class="close" onclick="uifnPopupClose('CouponCreatePopup')"><i class="fa fa-times"></i></button>
-			</div>
-			<form id="couponCreateForm" name="couponCreateForm">
-			<div class="panelContent">
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:10%">
-						<col style="width:40%;">
-						<col style="width:10%">
-						<col style="width:40%;">
-					</colgroup>
-					<tr>
-						<th>쿠폰번호<em class="required" title="필수"></em></th>
-						<td colspan="5">
-							<input type="hidden" name="copyCpnId" maxlength="50" value="">
-							<input type="hidden" name="mode" maxlength="50" value="">
-							<input type="text" name="cpnId" maxlength="50" value="" style="width:70%;" disabled="" placeholder="자동생성">
-							<label class="chkBox">
-								<input type="checkbox" name="cpnCreateType" onchange="fnCreateCpnNoOnChange(this);" value="true" class="type-check" checked="">쿠폰번호 자동생성
-							</label>
-						</td>
-					</tr>
-					<tr>
-						<th>쿠폰명<em class="required" title="필수"></em></th>
-						<td colspan="5">
-							<input type="text" name="cpnNm" id="cpnNm" style="width: 70%;">
-						</td>
-					</tr>
-					<tr>
-						<th>쿠폰유형<em class="required" title="필수"></em></th>
-						<td colspan="5">
-							<label class="rdoBtn" th:if="${cpnTypeList}" th:each="oneData, status : ${cpnTypeList}"> <input type="radio" name="cpnType"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
-						</td>
-					</tr>
-					<tr>
-						<th>사용가능고객구분<em class="required" title="필수"></em></th>
-						<td>
-							<select name="usableCustGb" id="usableCustGb">
-								<option th:if="${usableCustGbList}" th:each="oneData , status : ${usableCustGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-						<th>사이트<em class="required" title="필수"></em></th>
-						<td>
-							<select name="siteCd" id="siteCd">
-								<option th:if="${siteCdList}" th:each="oneData , status : ${siteCdList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>사용고객등급구분<em class="required" title="필수"></em></th>
-						<td>
-							<select name="usableCustGradeList" id="usableCustGradeList">
-								<option value="">[전체]</option>
-								<option th:if="${usableCustGradeList}" th:each="oneData , status : ${usableCustGradeList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>할인방식<em class="required" title="필수"></em></th>
-						<td>
-							<label class="rdoBtn" th:if="${dcWayList}" th:each="oneData, status : ${dcWayList}"> <input type="radio" name="dcWay"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
-						</td>
-						<th>할인값(PC)<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="w200" id="dcPval" name="dcPval" value="0" style="text-align: right"><span id="dcPvalSpan">원</span>
-						</td>
-					</tr>
-					<tr>
-						<th>할인값(모바일)<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="w200" id="dcMval" name="dcMval" value="0" style="text-align: right"><span id="dcMvalSpan">원</span>
-						</td>
-						<th>최대할인금액<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="w200" id="maxDcAmt" name="maxDcAmt" value="0"><span id="maxDcAmtSpan">원</span>
-						</td>
-					</tr>
-					<tr>
-						<th>다운로드시작일시<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="schDate w100" name="downStdt" maxlength="10"/>
-							<select name="downStHH" id="downStHH">
-								<option th:if="${hhList}" th:each="oneData , status : ${hhList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-							<select name="downStMM" id="downStMM">
-								<option th:if="${mmList}" th:each="oneData , status : ${mmList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-						<th>다운로드종료일시<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="schDate w100" name="downEddt" maxlength="10"/>
-							<select name="downEdHH" id="downEdHH">
-								<option th:if="${hhList}" th:each="oneData , status : ${hhList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-							<select name="downEdMM" id="downEdMM">
-								<option th:if="${mmList}" th:each="oneData , status : ${mmList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>기간/일수구분<em class="required" title="필수"></em></th>
-						<td>
-							<select name="pdGbList" id="pdGbList">
-								<option value="">[전체]</option>
-								<option value="P">기간</option>
-								<option value="D">일수</option>
-							</select>
-						</td>
-						<th>적용범위<em class="required" title="필수"></em></th>
-						<td>
-							<label class="rdoBtn"> <input type="radio" name="appliyScope" value="A"/>전체</label>
-							<label class="rdoBtn"> <input type="radio" name="appliyScope" value="I"/>개별</label>
-						</td>
-					</tr>
-					<tr>
-						<th>유효기간시작일시<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="schDate w100" name="applyStdt" maxlength="10"/>
-							<select name="applyStHH" id="applyStHH">
-								<option th:if="${hhList}" th:each="oneData , status : ${hhList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-							<select name="applyStMM" id="applyStMM">
-								<option th:if="${mmList}" th:each="oneData , status : ${mmList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-						<th>유효기간종료일시<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="schDate w100" name="applyEddt" maxlength="10"/>
-							<select name="applyEdHH" id="applyEdHH">
-								<option th:if="${hhList}" th:each="oneData , status : ${hhList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-							<select name="applyEdMM" id="applyEdMM">
-								<option th:if="${mmList}" th:each="oneData , status : ${mmList}" th:text="${oneData.cdNm}" th:value="${oneData.cd}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>총발행제한수량<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="w200" name="totPubLimitQty" id="totPubLimitQty" value="0" style="text-align: right;">개
-						</td>
-						<th>1인당발행제한수량<em class="required" title="필수"></em></th>
-						<td>
-							<input type="text" class="w200" name="custPubLimitQty" id="custPubLimitQty" value="0" style="text-align: right;">개
-						</td>
-					</tr>
-					<tr>
-						<th>최소주문금액<em class="required" title="필수"></em></th>
-						<td><input type="text" class="w200" name="minBuyAmt" id="minBuyAmt" value="0" style="text-align: right;"></td>원
-						<th>1회발행수량<em class="required" title="필수"></em></th>
-						<td><input type="text" class="w200" name="onePubQty" id="onePubQty" value="1" style="text-align: right;"></td>개
-					</tr>
-					<tr>
-						<th>재발급여부<em class="required" title="필수"></em></th>
-						<td>
-							<select name="reissuanceList" id="reissuanceList">
-								<option th:if="${reissuanceList}" th:each="oneData , status : ${reissuanceList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-						<th>다운로드구분<em class="required" title="필수"></em></th>
-						<td>
-							<select name="dnGbList" id="dnGbList">
-								<option th:if="${dnGbList}" th:each="oneData , status:${dnGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-				</table>
-			</div>
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-info btn-lg" onclick="fnCouponCreate();">등록</button>
-				</li>
-			</ul>
-			</form>
-		</div>
-	</div>
-<script th:inline="javascript">
-/*<![CDATA[*/
-
-	$(document).ready(function(){
-
-	});
-
-	// 쿠폰 등록 버튼 클릭시
-	function fnCouponCreate(){
-		alert("쿠폰 등록 ");
-		if(!checkVelidation()) {
-			return;
-		}
-	}
-
-	// 쿠폰등록 유효성 체크
-	function checkVelidation(){
-		alert("벨리데이션 체크");
-		if()
-
-	}
-
-
-/*]]>*/
-</script>
-</html>

style24.admin/src/main/webapp/WEB-INF/views/marketing/CouponListForm.html

@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko"
-	  xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : CouponListForm.html
- * @desc    : 쿠폰관리 Page
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.12.21   xyzp1539    최초 작성
- *******************************************************************************
- -->
-<div id="main">
-	<!-- 메인타이틀 영역 -->
-	<div class="main-title">
-	</div>
-	<!-- //메인타이틀 영역 -->
-
-	<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/coupon/list'}">
-		<!-- 패널 영역1 -->
-		<div class="panelStyle" >
-			<!-- 검색조건 영역 -->
-			<!-- TITLE -->
-			<div class="panelTitle">
-				<h3>검색조건</h3>
-				<span class="panelControl">
-						<i class="fa fa-chevron-up"></i>
-					</span>
-			</div>
-			<!-- //TITLE -->
-			<div class="panelContent">
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width: 8%;"/>
-						<col style="width: 12%;"/>
-						<col style="width: 8%;"/>
-						<col style="width: 12%;"/>
-						<col style="width: 8%;"/>
-						<col style="width: 12%;"/>
-						<col style="width: 8%;"/>
-						<col style="width: 12%;"/>
-						<col style="width: 8%;"/>
-						<col style="width: 12%;"/>
-						<col/>
-					</colgroup>
-					<tr>
-						<th>사이트</th>
-						<td>
-							<select name="site" id="site">
-								<option value="">[전체]</option>
-								<option th:if="${siteCdList}" th:each="oneData, status : ${siteCdList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-						<th>쿠폰ID</th>
-						<td>
-							<input type="text" class="w900" name="cpnId" id="cpnId"/>
-						</td>
-						<th>쿠폰유형</th>
-						<td>
-							<select name="cpnType" id="cpnType">
-								<option value="">[전체]</option>
-								<option th:if="${cpnTypeList}" th:each="oneData, status : ${cpnTypeList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-						<th>등록자</th>
-						<td>
-							<input type="text" class="w200" name="regNo" id="regNo">
-						</td>
-					</tr>
-					<tr>
-						<th>할인유형</th>
-						<td>
-							<select name="dcWayList" id="dcWayList">
-								<option value="">[전체]</option> dcWayList
-								<option th:if="${dcWayList}" th:each="oneData, status : ${dcWayList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-						<th>쿠폰명</th>
-						<td colspan="10">
-							<input type="text" class="w800" id="cpnNm" name="cpnNm">
-						</td>
-					</tr>
-					<tr>
-						<th>유효기간구분</th>
-						<td>
-							<select name="pdGb" id="pdGb">
-								<option value="">[전체]</option>
-								<option value="P">기간</option>
-								<option value="D">일</option>
-							</select>
-						</td>
-						<th>유효기간</th>
-						<td colspan="5" id="sellTerms"></td>
-					</tr>
-					<tr>
-						<th colspan="1">
-						<td colspan="9">
-							<label class="chkBox"><input type="checkbox" id="endCpnExcep" name="chkExcep" value="E" checked>종료쿠폰제외</label>
-						</td>
-						</th>
-					</tr>
-				</table>
-				<ul class="panelBar">
-					<li class="center">
-						<button type="button" class="btn btn-gray btn-lg" id="btnInit" >초기화</button>
-						<button type="button" class="btn btn-info btn-lg" id="btnSearch" >조회</button>
-					</li>
-				</ul>
-			</div>
-			<!-- //검색조건 영역 -->
-		</div>
-
-		<!-- 패널 영역1 -->
-		<div class="panelStyle">
-			<!-- 상단버튼 영역  -->
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-info btn-lg" onclick="fnCouponCreateForm();">등록</button>
-					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
-					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
-					<select id="pageSize" name="pageSize">
-						<option value="50" selected="selected">50개씩 보기</option>
-						<option value="100">100개씩 보기</option>
-						<option value="500">500개씩 보기</option>
-						<option value="1000">1000개씩 보기</option>
-					</select>
-					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
-				</li>
-			</ul>
-
-			<!-- 검색결과 영역 -->
-			<div id="gridList" style="width: 100%; height: 700px;" class="ag-theme-balham lh60"></div>
-		</div>
-	</form>
-	<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
-	<script th:inline="javascript">
-		/*<![CDATA[*/
-		var columnDefs = [];
-		columnDefs = [
-			{headerName: "사이트", field: "siteCD", width: 80, cellClass: 'text-center'},
-			{headerName: "쿠폰ID", field: "cpnId", width: 130, cellClass: 'text-center'},
-			{headerName: "쿠폰명", field: "cpnNm", width: 140, cellClass: 'text-center'},
-			{headerName: "사용가능고객구분", field: "useableCustGb", width: 140, cellClass: 'text-center'},
-			{headerName: "쿠폰유형", field: "cpnType", width: 140, cellClass: 'text-center'},
-			{headerName: "할인방식", field: "dcWay", width: 140, cellClass: 'text-center'},
-			{headerName: "할인값(PC)", field: "dcPval", width: 140, cellClass: 'text-center'},
-			{headerName: "할인값(MOBILE)", field: "dcMval", width: 140, cellClass: 'text-center'},
-			{headerName: "최고할인값", field: "maxDcAmt", width: 140, cellClass: 'text-center'},
-			{headerName: "사용 수/발급 수 ", field: "useIssueCnt", width: 140, cellClass: 'text-center',
-				cellRenderer: function(params) {
-					return params.data.issueCnt + "/" + params.data.useCnt;
-				}
-			},
-			{headerName: "기간/일수구분", field: "pdGb", width: 140, cellClass: 'text-center'},
-			{headerName: "유효시작일시", field: "availStdt", width: 140, cellClass: 'text-center'},
-			{headerName: "유효종료일시", field: "availEddt", width: 140, cellClass: 'text-center'},
-			{headerName: "등록자", field: "regNo", width: 200, cellClass: 'text-left'},
-			{headerName: "등록일시", field: "regDt", width: 140, cellClass: 'text-center'},
-		];
-
-		// Get GridOptions
-		var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-
-		// 쿠폰등록 팝업창
-		function fnCouponCreateForm(){
-			cfnCouponCreatePopup();
-		}
-
-		// Row Click
-		/*
-        gridOptions.onCellClicked = function(event) {
-            var goodsCd = event.data.goodsCd;
-            if (event.colDef.field == "freeGiftName"){
-                // 수ㅜ정 필요
-                // cfnOpenGoodsDetailPopup('U',goodsCd);
-            }
-        }
-        */
-
-		// 초기화 클릭시
-		$('#btnInit').on('click', function() {
-			$('#searchForm')[0].reset();
-			//$("#searchForm input[type=radio]").removeClass("checked");
-			$("#searchForm input[type=checkbox]").removeClass("checked");
-			//$("#searchForm input[type=radio]").parent("label").removeClass("checked");
-			$("#searchForm input[type=checkbox]").parent("label").removeClass("checked");
-			$("#searchForm input[type=radio][checked]").parent("label").addClass("checked");
-		});
-
-		// 조회클릭시
-		$('#btnSearch').on('click', function() {
-			$("#searchForm input[name=pageNo]").val('1');
-			fnCouponListSearch();
-		});
-
-		// 조회
-		var fnCouponListSearch = function() {
-			if(!fnConditionCheck()) return;
-
-			gagaPaging.init('searchForm', fnSearchCallBack, 'couponListPagination', $('#searchForm').find('#pageSize').val());
-			gagaPaging.load($("#searchForm input[name=pageNo]").val());
-		}
-
-		//검색 조건 확인
-		var fnConditionCheck = function(){
-			var fromDate = $('#searchForm input[name=availStdt]').val();
-			var toDate = $('#searchForm input[name=availEddt]').val();
-
-			if (!gagajf.isNull(fromDate) || !gagajf.isNull(toDate)) {
-
-				if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
-					mcxDialog.alertC("기간 조회시 시작일자와 종료일자를 입력하세요.", {
-						sureBtnText: "확인",
-						sureBtnClick: function() {
-							$('#searchForm input[name=availStdt]').focus();
-						}
-					});
-					return false;
-				}
-
-				if (fromDate > toDate) {
-					mcxDialog.alertC("등록 시작일자는 종료일자 보다 클 수 없습니다.", {
-						sureBtnText: "확인",
-						sureBtnClick: function() {
-							$('#searchForm input[name=availEddt]').focus();
-						}
-					});
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		var fnSearchCallBack = function(result){
-
-			$('#searchForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
-			$('#searchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
-			$('#searchForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());
-			$('#searchForm').find('#endPgNo').html(result.pageing.pageable.totalPage.addComma());
-			gridOptions.api.setRowData(result.cpnList);
-			gagaPaging.createPagination(result.pageing.pageable);
-
-		}
-
-		//페이징
-		$('#searchForm select[name=pageSize]').on('change', function() {
-			$("#searchForm input[name=pageNo]").val('1');
-			fnCouponListSearch();
-		});
-
-		$(document).ready(function() {
-			cfnCreateCalendar('#sellTerms', 'availStdt', 'availEddt', true, '기간', 'X');
-
-			// Create a agGrid
-			gagaAgGrid.createGrid('gridList', gridOptions);
-		});
-
-		/*]]>*/
-	</script>
-</div>
-
-</html>

style24.admin/src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionRegiForm.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : GoodsSetForm.html
+ * @source  : FreeGoodsPromotionRegiForm.html
  * @desc    : 세트상품 구성 관리
  *============================================================================
  * SISUN
@@ -11,7 +11,7 @@
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2020.11.04   eskim       최초 작성
+ * 1.0  2020.12.23   xodud1202   최초 작성
  *******************************************************************************
  -->	
 	<div class="modalPopup frGoodsPro" data-width="1100">
@@ -650,7 +650,7 @@
 			$(this).attr("class","fa inner-fa-chevron-up");
 		});
 
-		//창종료
+		// 창 닫기
 		let fnFreeGoodsPromotionFormClose = function(){
 			uifnPopupClose('popupFreeGoodsPromotionRegi');
 		}