Merge branch 'develop' into bin2107

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

@@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
 import com.style24.admin.biz.dao.TsaCouponDao;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.support.env.TscConstants;
 import com.style24.persistence.domain.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -166,7 +167,7 @@ public class TsaCouponService {
 		}
 
 		// 시리얼 쿠폰 생성(최초 쿠폰 생성일 경우에만)
-		if(cpnId == 0 && params.getCpnType().equals(TsaConstants.CpnType.PAY_CPN.value()) && params.getDcCdGb().equals(TsaConstants.DcCdGb.SERIAL.value())) {
+		if(cpnId == 0 && params.getCpnType().equals(TscConstants.CpnType.PAY_CPN.value()) && params.getDcCdGb().equals(TscConstants.DcCdGb.SERIAL.value())) {
 			// 시리얼 쿠폰명이 동일한 쿠폰이 일정 겹치는 부분이 있는지 확인
 			int overlapCheck = couponDao.getSerialOverlapCheck(params);
 			if(overlapCheck < 1) {
@@ -176,7 +177,7 @@ public class TsaCouponService {
 			} else {
 				throw new IllegalStateException("같은 시리얼명이 사용되는 쿠폰이 중복됩니다. 기간을 확인해주세요.");
 			}
-		} else if(cpnId == 0 && params.getCpnType().equals(TsaConstants.CpnType.PAY_CPN.value()) && params.getDcCdGb().equals(TsaConstants.DcCdGb.RANDOM.value())) {
+		} else if(cpnId == 0 && params.getCpnType().equals(TscConstants.CpnType.PAY_CPN.value()) && params.getDcCdGb().equals(TscConstants.DcCdGb.RANDOM.value())) {
 			Random random = new Random();
 			String prefixRandomCpn = "" + params.getCpnId();		// 랜덤 번호는 쿠폰번호 + 랜덤문자 = 12로 처리함
 			// 랜덤 문자 발급 수 만큼 진행

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

@@ -1,14 +1,11 @@
 package com.style24.admin.biz.web;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
 
-import com.gagaframework.web.util.GagaDateUtil;
-import com.style24.admin.biz.service.TsaSystemService;
-import com.style24.core.biz.service.TscPointService;
-import com.style24.core.support.env.TscConstants;
-import com.style24.persistence.domain.Point;
-import com.style24.persistence.domain.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -27,8 +24,11 @@ import com.style24.admin.biz.service.TsaFreegiftPromotionService;
 import com.style24.admin.biz.service.TsaMorebetterService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.biz.service.TsaReviewService;
+import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscPointService;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.CommonCode;
@@ -40,12 +40,15 @@ import com.style24.persistence.domain.MoreBetter;
 import com.style24.persistence.domain.MoreBetterBurden;
 import com.style24.persistence.domain.MoreBetterGoods;
 import com.style24.persistence.domain.MoreBetterSection;
+import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.Review;
+import com.style24.persistence.domain.User;
 
 import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.util.GagaDateUtil;
 
 /**
  * 마케팅 Controller
@@ -120,10 +123,10 @@ public class TsaMarketingController extends TsaBaseController {
 
 //		// 품목
 //		mav.addObject("itemkindList", rendererService.getAllItemkindList());
-//		
+//
 //		// 브랜드그룹
 //		mav.addObject("brandGrpNmList", rendererService.getBrandGroupList());
-//		
+//
 //		// MD
 //		mav.addObject("brandMdList", rendererService.getBrandMdList());
 //
@@ -171,7 +174,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author xodud1202
 	 * @since 2020. 12. 16
 	 */
-	@GetMapping("/freeGoods/promotion/form")
+	@GetMapping("/freegoods/promotion/form")
 	public ModelAndView freeGoodsPromotionForm() {
 		ModelAndView mav = new ModelAndView();
 		mav.setViewName("marketing/FreeGoodsPromotionForm");
@@ -183,7 +186,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author xodud1202
 	 * @since 2020. 12. 16
 	 */
-	@PostMapping("/freeGoodsPromotion/list")
+	@PostMapping("/freegoods/promotion/list")
 	@ResponseBody
 	public GagaMap getFreeGoodsPromotionList(@RequestBody FreeGoodsPromotion param) {
 		GagaMap result = new GagaMap();
@@ -206,7 +209,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @since 2020. 12. 23
 	 */
 	@ResponseBody
-	@GetMapping("/freeGoodsRegiPopup/form")
+	@GetMapping("/freegoods/promotion/popup/form")
 	public ModelAndView freeGoodsRegiForm(FreeGoodsPromotion param) {
 		ModelAndView mav = new ModelAndView();
 
@@ -248,11 +251,11 @@ public class TsaMarketingController extends TsaBaseController {
 	}
 
 	/**
-	 * 사은품 프로모션 목록 조회
+	 * 사은품 프로모션 상세 조회
 	 * @author xodud1202
 	 * @since 2021. 01. 28
 	 */
-	@PostMapping("/freeGoodsPromotion/detail")
+	@PostMapping("/freegoods/promotion/detail")
 	@ResponseBody
 	public GagaMap getFreeGoodsPromotionDetail(FreeGoodsPromotion param) {
 		return freegiftService.getFreegiftDetailInfo(param);
@@ -266,7 +269,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @since 2021. 01. 14
 	 */
 	@ResponseBody
-	@PostMapping("/freeGoodsPromotion/save")
+	@PostMapping("/freegoods/promotion/save")
 	public GagaResponse freeGoodsPromotionSave(@RequestBody FreeGoodsPromotion param) {
 		try {
 			freegiftService.saveFreegoodsPromotionInfo(param);
@@ -286,7 +289,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @since 2021. 01. 14
 	 */
 	@ResponseBody
-	@PostMapping("/freeGoodsPromotion/changeStat")
+	@PostMapping("/freegoods/promotion/change/stat")
 	public GagaResponse freeGoodsPromotionChangeStat(@RequestBody FreeGoodsPromotion param) {
 		try {
 			freegiftService.updateFreegoodsPromotionStat(param);
@@ -946,4 +949,14 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
+	/**
+	 *   카드관련 작업 시작 - eskim
+	 */
+
+
+
+	/**
+	 *   카드관련 작업 종료 - eskim
+	 */
+
 }

src/main/java/com/style24/admin/support/env/TsaConstants.java

@@ -41,35 +41,4 @@ public class TsaConstants {
 			return value;
 		}
 	}
-
-	// 쿠폰유형
-	public enum CpnType {
-		CATE_CPN("G230_13"),			// 장바구니쿠폰
-		PAY_CPN("G230_20");			// 주문서쿠폰
-
-		private String value;
-
-		private CpnType(String value) {
-			this.value = value;
-		}
-
-		public String value() {
-			return value;
-		}
-	}
-
-	// 할인 코드 유형
-	public enum DcCdGb {
-		NARMAL("G233_00"),			// 일반 쿠폰 유형
-		SERIAL("G233_10"),			// 시리얼 쿠폰 유형
-		RANDOM("G233_20");			// 랜덤 쿠폰 유형
-
-		private String value;
-
-		private DcCdGb(String value) {	this.value = value;	}
-
-		public String value() {
-			return value;
-		}
-	}
 }

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

@@ -22,7 +22,7 @@
 		<!-- 메뉴 설명 -->
 		<div class="infoBox menu-desc"></div>
 
-		<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/freeGoodsPromotion/list'}">
+		<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/freegoods/promotion/list'}">
 			<input type="hidden" id="searchGb" name="searchGb" />
 			<input type="hidden" id="imageViewYn" name="imageViewYn" />
 			<input type="hidden" id="goodsPriceYn" name="goodsPriceYn" value="Y"/> <!-- 즉시할인판매가 조회 -->

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

@@ -595,7 +595,7 @@
 		params.gbn = $('#freeGoodsPromotionForm input[name=gbn]').val();
 		params.freegiftSq = $('#freeGoodsPromotionForm input[name=freegiftSq]').val();
 
-		cfnAjaxSubmit("/marketing/freeGoodsPromotion/detail", "json", fnFreeGoodsPromotionSearchCallback, params);
+		cfnAjaxSubmit("/marketing/freegoods/promotion/detail", "json", fnFreeGoodsPromotionSearchCallback, params);
 	}
 
 	$(document).ready(function() {
@@ -887,7 +887,7 @@
 		};
 
 		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/marketing/freeGoodsPromotion/save', jsonData, fnFreeGoodsPromotionSaveFin);
+		gagajf.ajaxJsonSubmit('/marketing/freegoods/promotion/save', jsonData, fnFreeGoodsPromotionSaveFin);
 	});
 
 	// 할인방식 변경
@@ -915,7 +915,7 @@
 						, freegiftSq : $("#freeGoodsPromotionForm input[name=freegiftSq]").val()
 					}
 					var jsonData = JSON.stringify(data);
-					gagajf.ajaxJsonSubmit('/marketing/freeGoodsPromotion/changeStat', jsonData, fnFreeGoodsPromotionSaveFin);
+					gagajf.ajaxJsonSubmit('/marketing/freegoods/promotion/change/stat', jsonData, fnFreeGoodsPromotionSaveFin);
 				}
 			}
 		});
@@ -932,7 +932,7 @@
 						, freegiftSq: $("#freeGoodsPromotionForm input[name=freegiftSq]").val()
 					}
 					var jsonData = JSON.stringify(data);
-					gagajf.ajaxJsonSubmit('/marketing/freeGoodsPromotion/changeStat', jsonData, function() {
+					gagajf.ajaxJsonSubmit('/marketing/freegoods/promotion/change/stat', jsonData, function() {
 						uifnPopupClose('popupFreeGoodsPromotionRegi');
 					});
 				}
@@ -951,7 +951,7 @@
 						, freegiftSq: $("#freeGoodsPromotionForm input[name=freegiftSq]").val()
 					}
 					var jsonData = JSON.stringify(data);
-					gagajf.ajaxJsonSubmit('/marketing/freeGoodsPromotion/changeStat', jsonData, fnFreeGoodsPromotionSaveFin);
+					gagajf.ajaxJsonSubmit('/marketing/freegoods/promotion/change/stat', jsonData, fnFreeGoodsPromotionSaveFin);
 				}
 			}
 		});

src/main/webapp/ux/js/admin.popup.js

@@ -704,7 +704,7 @@ var cfnOpenBrandListPopup = function(callbackfn, multiGb, searchTxt) {
  * @author : xodud1202
  */
 var cfnOpenFreeGoodsPromotionSetPopup = function(gbn, freegiftSq) {
-	var actionUrl = "/marketing/freeGoodsRegiPopup/form?gbn=" + gbn;
+	var actionUrl = "/marketing/freegoods/promotion/popup/form?gbn=" + gbn;
 	if (typeof(freegiftSq) != 'undefined') actionUrl += "&freegiftSq=" + freegiftSq;
 
 	uifnPopupClose('popupFreeGoodsPromotionRegi');