Merge branch 'develop' into bin2107

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

@@ -62,49 +62,31 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	public GagaMap createShoplinkerXml(Collection<GagaMap> ecxelGoodsList, ShoplinkerGoods shoplinkerGoods)throws IOException {
+	public void createShoplinkerXml(Collection<GagaMap> ecxelGoodsList, ShoplinkerGoods shoplinkerGoods) {
 		// 파일명 추가 네이밍 규칙
 		fileAddNm = shoplinkerGoods.getRegNo() +"_"+ GagaDateUtil.getToday("yyMMddHHmmss");
 
-		GagaMap rtnMap = new GagaMap();
-		int optionAll=0, optionSucc=0;
-		int excelCnt= ecxelGoodsList.size();
-		int tProdSucc = 0, productSucc=0, goodsNotiSucc=0, certSucc=0, imageSucc=0;
-		log.info(" #### SHOPLINKER CHK3 - "+excelCnt);
+		log.info(" #### SHOPLINKER CHK3 - "+ecxelGoodsList.size());
 		for (GagaMap gagaMap : ecxelGoodsList) {
 			if( !"".equals(gagaMap.getString("goodsCd").trim())) {
 				shoplinkerGoods.setGoodsCd(gagaMap.getString("goodsCd"));
 
 				// 1. 단품생성
-				rtnMap = createOptionRegisterXml(shoplinkerGoods);
-				optionAll += rtnMap.getInt("allCnt");
-				optionSucc += rtnMap.getInt("succCnt");
+				createOptionRegisterXml(shoplinkerGoods);
 
 				// 2. 상품생성
-				tProdSucc = createGoodsRegisterXml(shoplinkerGoods);
-				productSucc += tProdSucc;
+				createGoodsRegisterXml(shoplinkerGoods);
 
 				// 3. 고시정보(품목정보)
-				goodsNotiSucc += createGoodsNotiRegisterXml(shoplinkerGoods);
+				createGoodsNotiRegisterXml(shoplinkerGoods);
 
 				// 4. 인증정보
-				certSucc += createCertRegisterXml(shoplinkerGoods);
+				createCertRegisterXml(shoplinkerGoods);
 
 				// 5. 상품이미지정보
-				imageSucc += createImageRegisterXml(shoplinkerGoods);
+				createImageRegisterXml(shoplinkerGoods);
 			}
 		}
-
-		rtnMap = new GagaMap();
-		rtnMap.setInt("excelCnt", excelCnt);
-		rtnMap.setInt("optionAll", optionAll);
-		rtnMap.setInt("optionSucc", optionSucc);
-		rtnMap.setInt("productSucc", productSucc);
-		rtnMap.setInt("goodsNotiSucc", goodsNotiSucc);
-		rtnMap.setInt("certSucc", certSucc);
-		rtnMap.setInt("imageSucc", imageSucc);
-
-		return rtnMap;
 	}
 
 	/**
@@ -115,9 +97,8 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	private GagaMap createOptionRegisterXml(ShoplinkerGoods shoplinkerGoods) throws IOException {
+	private void createOptionRegisterXml(ShoplinkerGoods shoplinkerGoods) {
 
-		GagaMap returnMap = new GagaMap();
 		ShoplinkerGoods regMap = new ShoplinkerGoods();
 		regMap.setApiType("OPTION");
 		regMap.setApiSubUrl(env.getProperty("shoplinker.url.option"));
@@ -126,14 +107,10 @@ public class TsaShoplinkerService {
 		regMap.setXmlPath(shoplinkerGoods.getXmlPath());
 		regMap.setDomainUrl(shoplinkerGoods.getDomainUrl());
 
-		int succCnt = 0;
-		int allCnt = 0;
-
 		try {
 			// 옵션 목록조회
 			Collection<ShoplinkerGoods> list = admShoplinkerDao.getOptionList(shoplinkerGoods);
 			if( null != list && !list.isEmpty()) {
-				allCnt = list.size();
 
 				StringBuilder sbRequest;
 				int opCnt = 0;
@@ -166,7 +143,7 @@ public class TsaShoplinkerService {
 					regMap.setQuantity(map.getQuantity());		// 재고 기록은 실재고 기록 0일경우 샵링커에 전송하지 않기위함.(md가 샵링커에서 몰로 수동전송시 재고가 0일경우 몰에 등록안된다 함)
 
 					// api 호출 및 결과 history 저장
-					succCnt += callGoodsRegApi(regMap , sbRequest, "option_"+opCnt);
+					callGoodsRegApi(regMap , sbRequest, "option_"+opCnt);
 				}
 			}
 		}catch(Exception e) {
@@ -175,11 +152,6 @@ public class TsaShoplinkerService {
 			regMap.setApiMessage("xml 생성오류");
 			tscShoplinkerDao.insertShoplinerApiHst(regMap);
 		}
-
-		returnMap.setInt("allCnt", allCnt);
-		returnMap.setInt("succCnt", succCnt);
-
-		return returnMap;
 	}
 
 	/**
@@ -190,7 +162,7 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	public int createGoodsRegisterXml(ShoplinkerGoods shoplinkerGoods) throws IOException {
+	public void createGoodsRegisterXml(ShoplinkerGoods shoplinkerGoods) {
 
 		ShoplinkerGoods regMap = new ShoplinkerGoods();
 		regMap.setApiType("PRODUCT");
@@ -200,8 +172,6 @@ public class TsaShoplinkerService {
 		regMap.setXmlPath(shoplinkerGoods.getXmlPath());
 		regMap.setDomainUrl(shoplinkerGoods.getDomainUrl());
 
-		int succCnt = 0;
-
 		try {
 			// 상품기본정보
 			ShoplinkerGoods goodsMap = admShoplinkerDao.getGoods(shoplinkerGoods);
@@ -265,7 +235,7 @@ public class TsaShoplinkerService {
 
 			if( null != goodsMap.getShoplinkerItemkindNm()) {
 				// api 호출 및 결과 history 저장
-				succCnt = callGoodsRegApi(regMap , sbRequest, "product");
+				callGoodsRegApi(regMap , sbRequest, "product");
 
 			}else {
 				// 품목매핑정보 없음. 전송 안함
@@ -281,8 +251,6 @@ public class TsaShoplinkerService {
 			regMap.setApiMessage("xml 생성오류");
 			tscShoplinkerDao.insertShoplinerApiHst(regMap);
 		}
-
-		return succCnt;
 	}
 
 	/**
@@ -590,7 +558,7 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	private int createGoodsNotiRegisterXml(ShoplinkerGoods shoplinkerGoods) throws IOException {
+	private void createGoodsNotiRegisterXml(ShoplinkerGoods shoplinkerGoods) {
 
 		ShoplinkerGoods regMap = new ShoplinkerGoods();
 		regMap.setApiType("NOTI");
@@ -600,8 +568,6 @@ public class TsaShoplinkerService {
 		regMap.setXmlPath(shoplinkerGoods.getXmlPath());
 		regMap.setDomainUrl(shoplinkerGoods.getDomainUrl());
 
-		int succCnt = 0;
-
 		try {
 
 			Collection<ShoplinkerGoods> list = admShoplinkerDao.getGoodsNotiList(shoplinkerGoods);
@@ -636,7 +602,7 @@ public class TsaShoplinkerService {
 					sbRequest.append("</openMarket>\n");
 
 					// api 호출 및 결과 history 저장
-					succCnt = callGoodsRegApi(regMap , sbRequest, "goods");
+					callGoodsRegApi(regMap , sbRequest, "goods");
 				}
 			}
 
@@ -646,7 +612,6 @@ public class TsaShoplinkerService {
 			regMap.setApiMessage("xml 생성오류");
 			tscShoplinkerDao.insertShoplinerApiHst(regMap);
 		}
-		return succCnt;
 	}
 
 	/**
@@ -657,7 +622,7 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	private int createCertRegisterXml(ShoplinkerGoods shoplinkerGoods) throws IOException {
+	private void createCertRegisterXml(ShoplinkerGoods shoplinkerGoods) {
 
 		ShoplinkerGoods regMap = new ShoplinkerGoods();
 		regMap.setApiType("CERT");
@@ -667,8 +632,6 @@ public class TsaShoplinkerService {
 		regMap.setXmlPath(shoplinkerGoods.getXmlPath());
 		regMap.setDomainUrl(shoplinkerGoods.getDomainUrl());
 
-		int succCnt = 0;
-
 		try {
 
 			ShoplinkerGoods map = admShoplinkerDao.getCert(shoplinkerGoods);
@@ -706,7 +669,7 @@ public class TsaShoplinkerService {
 			sbRequest.append("</shoplinker>\n");
 
 			// api 호출 및 결과 history 저장
-			succCnt = callGoodsRegApi(regMap , sbRequest, "cert");
+			callGoodsRegApi(regMap , sbRequest, "cert");
 
 		}catch(Exception e) {
 			log.error("xml 생성오류 ", e);
@@ -714,8 +677,6 @@ public class TsaShoplinkerService {
 			regMap.setApiMessage("xml 생성오류");
 			tscShoplinkerDao.insertShoplinerApiHst(regMap);
 		}
-
-		return succCnt;
 	}
 
 	/**
@@ -726,7 +687,7 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	private int createImageRegisterXml(ShoplinkerGoods shoplinkerGoods) throws IOException {
+	private void createImageRegisterXml(ShoplinkerGoods shoplinkerGoods) {
 
 		ShoplinkerGoods regMap = new ShoplinkerGoods();
 		regMap.setApiType("IMAGE");
@@ -736,8 +697,6 @@ public class TsaShoplinkerService {
 		regMap.setXmlPath(shoplinkerGoods.getXmlPath());
 		regMap.setDomainUrl(shoplinkerGoods.getDomainUrl());
 
-		int succCnt = 0;
-
 		try {
 
 			// 상품이미지정보
@@ -780,7 +739,7 @@ public class TsaShoplinkerService {
 				sbRequest.append("</Shoplinker>\n");
 
 				// api 호출 및 결과 history 저장
-				succCnt = callGoodsRegApi(regMap , sbRequest, "image");
+				callGoodsRegApi(regMap , sbRequest, "image");
 			}
 
 		}catch(Exception e) {
@@ -789,8 +748,6 @@ public class TsaShoplinkerService {
 			regMap.setApiMessage("xml 생성오류");
 			tscShoplinkerDao.insertShoplinerApiHst(regMap);
 		}
-
-		return succCnt;
 	}
 
 	/**
@@ -801,13 +758,13 @@ public class TsaShoplinkerService {
 	 * @author jmh
 	 * @since 2021. 5. 20
 	 */
-	private int callGoodsRegApi(ShoplinkerGoods map, StringBuilder sbRequest, String fileNm) throws IOException {
+	private void callGoodsRegApi(ShoplinkerGoods map, StringBuilder sbRequest, String fileNm) throws Exception {
 
-		int succCnt = 0;
 		map.setApiProductId(null);
 		com.gagaframework.shoplinker.domain.goods.result.Shoplinker shoplinkerResult;
 		com.gagaframework.shoplinker.domain.goods.result.ResultMessage resultMsg;
 
+		String responseXmlData = "";
 		StringBuilder xmlFileName = new StringBuilder();
 
 		try {
@@ -824,7 +781,7 @@ public class TsaShoplinkerService {
 			String apiUrl = GagaShoplinkerConstants.API_DOMAIN + map.getApiSubUrl() + URLEncoder.encode(xmlUrl);
 
 			// API 호출결과
-			String responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(apiUrl, "");
+			responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(apiUrl, "");
 
 			// response 결과
 			shoplinkerResult = (com.gagaframework.shoplinker.domain.goods.result.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.goods.result.Shoplinker.class, responseXmlData);
@@ -836,8 +793,6 @@ public class TsaShoplinkerService {
 			map.setApiMessage(StringUtils.abbreviate(resultMsg.getMessage(), 0 , 120));
 
 			if( "true".equals(resultMsg.getResult())){
-				succCnt = 1;
-
 				// 재고 단품 생성
 				if( "OPTION".equals(map.getApiType())) {
 					admShoplinkerDao.insertStockOption(map);
@@ -845,10 +800,10 @@ public class TsaShoplinkerService {
 			}
 
 		} catch (Exception e) {
-			log.error("error", e);
+			log.error(" callGoodsRegApi error", e);
 			map.setXmlTxt(sbRequest.toString());
 			map.setApiResult("error");
-			map.setApiMessage("API 오류");
+			map.setApiMessage("API 오류 "+StringUtils.abbreviate(responseXmlData, 0 , 120));
 		}
 
 		// 전송이력 저장
@@ -856,8 +811,6 @@ public class TsaShoplinkerService {
 
 		// 생성 파일삭제
 		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString()));
-
-		return succCnt;
 	}
 
 	/**

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

@@ -1806,7 +1806,7 @@ public class TsaGoodsController extends TsaBaseController {
 		cellName = new String[2];
 		cellName[0] = "goodsCd";
 		cellName[1] = "kmcKey";
-		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.default.target.path"), "excel");
+		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 		Collection<GagaMap> dataList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsVideo.getExcelFileNm()), 0, cellName);
 
 		int cnt = goodsService.saveExcelGoodsVideo(dataList);

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

@@ -267,23 +267,28 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
-			try {
-				Payment payment = new Payment();
-				payment.setOrdNo(cnclReq.getOrdNo());
-				payment = coreOrderChangeService.getPaymentInfo(payment);
-				// 네이버페이 주문형 데이터는 알림톡, 메일 송부X
-				if(TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
-					return super.ok("성공");
-				}
+			Payment payment = new Payment();
+			payment.setOrdNo(cnclReq.getOrdNo());
+			payment = coreOrderChangeService.getPaymentInfo(payment);
+
+			// 네이버페이 주문형 데이터는 알림톡, 메일 송부X
+			if(TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
+				return super.ok("성공");
+			}
 
-				// 취소 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+			// 취소 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
 
+			try {
 				// 취소 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderCancelComplete(orderChange, userNo);
 				}
-
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			try {
 				// 취소 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
@@ -292,7 +297,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderCancel(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -505,15 +510,19 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
+			// 반품 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+
 			try {
-				// 반품 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
-				
 				// 반품 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderReturnRequest(orderChange, userNo);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 반품 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderReturnReplaceInfo(orderChange);
 
@@ -522,7 +531,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderReturn(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 		
@@ -798,15 +807,19 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
-			try {
-				// 교환 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+			// 교환 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
 
+			try {
 				// 교환 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderExchangeRequest(orderChange, userNo);
 				}
-
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			try {
 				// 교환 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderExchangeReplaceInfo(orderChange);
 
@@ -815,7 +828,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderExchange(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 

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

@@ -209,7 +209,7 @@ log.info(" #### SHOPLINKER CHK1 - "+runMap.getRunCnt() +" || "+GagaDateUtil.getT
 				shoplinkerGoods.setCustomerId(env.getProperty("shoplinker.customer_id"));
 				shoplinkerGoods.setRegNo(TsaSession.getInfo().getUserNo());
 				log.info(" #### SHOPLINKER CHK2 ");
-				rtnMap = admShoplinkerService.createShoplinkerXml(ecxelGoodsList, shoplinkerGoods);
+				admShoplinkerService.createShoplinkerXml(ecxelGoodsList, shoplinkerGoods);
 
 				// 4. 파일 삭제
 				GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(targetPath, shoplinkerGoods.getExcelFileNm()));

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

@@ -21,11 +21,11 @@ public class CustGradePolicy extends TscBaseDomain {
 	private int minBuyAmt;			// 등급산정최소구매금액
 	private int minBuyCnt;			// 등급산정최소구매건수
 	private int buyExceptAmt;		// 구매제외금액(최소구매건수제외조건)
-	private String gradeCpnId1;		// 혜택쿠폰1
+	private int gradeCpnId1;		// 혜택쿠폰1
 	private String gradeCpnNm1;		// 혜택쿠폰명1
-	private String gradeCpnId2;		// 혜택쿠폰2
+	private int gradeCpnId2;		// 혜택쿠폰2
 	private String gradeCpnNm2;		// 혜택쿠폰명2
-	private String gradeCpnId3;		// 혜택쿠폰3
+	private int gradeCpnId3;		// 혜택쿠폰3
 	private String gradeCpnNm3;		// 혜택쿠폰명3
 	private int dispOrd;			// 표시순서
 	private String useYn;			// 사용여부

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

@@ -73,5 +73,4 @@ public class SupplyCompany extends TscBaseDomain {
 	private String[] multiSupplyCompNm;
 	/* 업체검색 Multi CheckBox 항목*/
 
-
 }

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

@@ -221,9 +221,10 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       (SELECT IFNULL(MAX(SUPPLY_COMP_CD),0) + 1
-		        FROM   TB_SUPPLY_COMPANY Z
-		       )
+		        (
+		         SELECT IFNULL(MAX(SUPPLY_COMP_CD),0) + 1
+		         FROM   TB_SUPPLY_COMPANY Z
+		        )
 		     , #{supplyCompNm}
 		     , #{supplyVendorCd}
 		     , (SELECT CASE WHEN MAX(PROVIDER_NO) IS NULL THEN

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

@@ -6,58 +6,58 @@
 	<insert id="createEnvset" parameterType="Envset">
 		/* TsaEnvset.createEnvset */
 		INSERT INTO TB_ENVSET (
-								ENVSET_SQ
-							  , SITE_CD
-							  , ENVSET_TYPE
-							  , ENVSET_NM
-							  , STR_SET_VAL1
-							  , STR_SET_VAL2
-							  , STR_SET_VAL3
-							  , STR_SET_VAL4
-							  , STR_SET_VAL5
-							  , STR_SET_VAL6
-							  , STR_SET_VAL7
-							  , STR_SET_VAL8
-							  , REG_NO
-							  , REG_DT
+		       ENVSET_SQ
+		     , SITE_CD
+		     , ENVSET_TYPE
+		     , ENVSET_NM
+		     , STR_SET_VAL1
+		     , STR_SET_VAL2
+		     , STR_SET_VAL3
+		     , STR_SET_VAL4
+		     , STR_SET_VAL5
+		     , STR_SET_VAL6
+		     , STR_SET_VAL7
+		     , STR_SET_VAL8
+		     , REG_NO
+		     , REG_DT
 		)
 		VALUES (
-				   NULL
-			   , #{siteCd}
-			   , #{envsetType}
-			   , #{envsetNm}
-			   , #{strSetVal1}
-			   , #{strSetVal2}
-			   , #{strSetVal3}
-			   , #{strSetVal4}
-			   , #{strSetVal5}
-			   , #{strSetVal6}
-			   , #{strSetVal7}
-			   , #{strSetVal8}
-			   , #{regNo}
-			   , NOW()
-			   )
+		        NULL
+		     , #{siteCd}
+		     , #{envsetType}
+		     , #{envsetNm}
+		     , #{strSetVal1}
+		     , #{strSetVal2}
+		     , #{strSetVal3}
+		     , #{strSetVal4}
+		     , #{strSetVal5}
+		     , #{strSetVal6}
+		     , #{strSetVal7}
+		     , #{strSetVal8}
+		     , #{regNo}
+		     , NOW()
+		)
 	</insert>
 
 	<!-- 환경설정 목록 -->
 	<select id="getEnvsetList" parameterType="Envset" resultType="Envset">
 		/* TsaEnvset.getEnvsetList */
 		SELECT SITE_CD
-			 , ENVSET_TYPE
-			 , ENVSET_NM
-			 , STR_SET_VAL1
-			 , STR_SET_VAL2
-			 , STR_SET_VAL3
-			 , STR_SET_VAL4
-			 , STR_SET_VAL5
-			 , STR_SET_VAL6
-			 , STR_SET_VAL7
-			 , STR_SET_VAL8
-			 , FN_GET_USER_NM(REG_NO)             AS REG_NM
-			 , DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT
+		     , ENVSET_TYPE
+		     , ENVSET_NM
+		     , STR_SET_VAL1
+		     , STR_SET_VAL2
+		     , STR_SET_VAL3
+		     , STR_SET_VAL4
+		     , STR_SET_VAL5
+		     , STR_SET_VAL6
+		     , STR_SET_VAL7
+		     , STR_SET_VAL8
+		     , FN_GET_USER_NM(REG_NO)             AS REG_NM
+		     , DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT
 		FROM   TB_ENVSET
 		WHERE  SITE_CD = #{siteCd}
-		  AND    ENVSET_TYPE = #{envsetType}
+		AND    ENVSET_TYPE = #{envsetType}
 		ORDER  BY ENVSET_SQ DESC
 	</select>
 
@@ -65,80 +65,80 @@
 	<insert id="createCustomerGradePolicy" parameterType="CustGradePolicy">
 		/* TsaEnvset.createCustomerGradePolicy */
 		INSERT INTO TB_CUST_GRADE_POLICY (
-										   SITE_CD
-										 , GRADE_CD
-										 , ICON_NM
-										 , CAL_MONTHS
-										 , MIN_BUY_AMT
-										 , MIN_BUY_CNT
-										 , BUY_EXCEPT_AMT
-										 , GRADE_CPN_ID1
-										 , GRADE_CPN_ID2
-										 , GRADE_CPN_ID3
-										 , DISP_ORD
-										 , USE_YN
-										 , REG_NO
-										 , REG_DT
-										 , UPD_NO
-										 , UPD_DT
+		       SITE_CD
+		     , GRADE_CD
+		     , ICON_NM
+		     , CAL_MONTHS
+		     , MIN_BUY_AMT
+		     , MIN_BUY_CNT
+		     , BUY_EXCEPT_AMT
+		     , GRADE_CPN_ID1
+		     , GRADE_CPN_ID2
+		     , GRADE_CPN_ID3
+		     , DISP_ORD
+		     , USE_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
 		)
 		VALUES (
-				   #{siteCd}
-			   , #{gradeCd}
-			   , #{iconNm}
-			   , #{calMonths}
-			   , #{minBuyAmt}
-			   , #{minBuyCnt}
-			   , #{buyExceptAmt}
-			   , #{gradeCpnId1}
-			   , #{gradeCpnId2}
-			   , #{gradeCpnId3}
-			   , #{dispOrd}
-			   , #{useYn}
-			   , #{regNo}
-			   , NOW()
-			   , #{updNo}
-			   , NOW()
-			   )
-			ON DUPLICATE KEY UPDATE
-								 ICON_NM = #{iconNm}
-								 , CAL_MONTHS = #{calMonths}
-								 , MIN_BUY_AMT = #{minBuyAmt}
-								 , MIN_BUY_CNT = #{minBuyCnt}
-								 , BUY_EXCEPT_AMT = #{buyExceptAmt}
-								 , GRADE_CPN_ID1 = #{gradeCpnId1}
-								 , GRADE_CPN_ID2 = #{gradeCpnId2}
-								 , GRADE_CPN_ID3 = #{gradeCpnId3}
-								 , DISP_ORD = #{dispOrd}
-								 , USE_YN = #{useYn}
-								 , UPD_NO = #{updNo}
-								 , UPD_DT = NOW()
+		       #{siteCd}
+		     , #{gradeCd}
+		     , #{iconNm}
+		     , #{calMonths}
+		     , #{minBuyAmt}
+		     , #{minBuyCnt}
+		     , #{buyExceptAmt}
+		     , #{gradeCpnId1}
+		     , #{gradeCpnId2}
+		     , #{gradeCpnId3}
+		     , #{dispOrd}
+		     , #{useYn}
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		       ICON_NM = #{iconNm}
+		     , CAL_MONTHS = #{calMonths}
+		     , MIN_BUY_AMT = #{minBuyAmt}
+		     , MIN_BUY_CNT = #{minBuyCnt}
+		     , BUY_EXCEPT_AMT = #{buyExceptAmt}
+		     , GRADE_CPN_ID1 = #{gradeCpnId1}
+		     , GRADE_CPN_ID2 = #{gradeCpnId2}
+		     , GRADE_CPN_ID3 = #{gradeCpnId3}
+		     , DISP_ORD = #{dispOrd}
+		     , USE_YN = #{useYn}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
 	</insert>
 
 	<!-- 회원등급정책 목록 -->
 	<select id="getCustomerGradePolicyList" parameterType="CustGradePolicy" resultType="CustGradePolicy">
 		/* TsaEnvset.getCustomerGradePolicyList */
 		SELECT SITE_CD
-		, GRADE_CD
-		, ICON_NM
-		, CAL_MONTHS
-		, MIN_BUY_AMT
-		, MIN_BUY_CNT
-		, BUY_EXCEPT_AMT
-		, GRADE_CPN_ID1
-		, FN_GET_COUPON_NM(GRADE_CPN_ID1)    AS GRADE_CPN_NM1
-		, GRADE_CPN_ID2
-		, FN_GET_COUPON_NM(GRADE_CPN_ID2)    AS GRADE_CPN_NM2
-		, GRADE_CPN_ID3
-		, FN_GET_COUPON_NM(GRADE_CPN_ID3)    AS GRADE_CPN_NM3
-		, DISP_ORD
-		, USE_YN
-		, FN_GET_USER_NM(UPD_NO)             AS UPD_NM
-		, DATE_FORMAT(UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
+		     , GRADE_CD
+		     , ICON_NM
+		     , CAL_MONTHS
+		     , MIN_BUY_AMT
+		     , MIN_BUY_CNT
+		     , BUY_EXCEPT_AMT
+		     , GRADE_CPN_ID1
+		     , FN_GET_COUPON_NM(GRADE_CPN_ID1)    AS GRADE_CPN_NM1
+		     , GRADE_CPN_ID2
+		     , FN_GET_COUPON_NM(GRADE_CPN_ID2)    AS GRADE_CPN_NM2
+		     , GRADE_CPN_ID3
+		     , FN_GET_COUPON_NM(GRADE_CPN_ID3)    AS GRADE_CPN_NM3
+		     , DISP_ORD
+		     , USE_YN
+		     , FN_GET_USER_NM(UPD_NO)             AS UPD_NM
+		     , DATE_FORMAT(UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		FROM   TB_CUST_GRADE_POLICY A
 		WHERE  SITE_CD = #{siteCd}
 		<if test="gradeCd != null and gradeCd != ''">
-			AND    GRADE_CD = #{gradeCd}
+		AND    GRADE_CD = #{gradeCd}
 		</if>
 		ORDER  BY SITE_CD, GRADE_CD
 	</select>

src/main/webapp/WEB-INF/views/goods/GoodsNoticeForm.html

@@ -68,7 +68,7 @@
 					<tr>
 						<th>공지제목</th>
 						<td>
-							<input name="noteicTitle" type="text" maxlength="200"/>
+							<input name="noticeTitle" type="text" maxlength="200"/>
 						</td>
 						<th>사용여부</th>
 						<td>
@@ -405,22 +405,21 @@
 			return;
 		}
 		
-		var removedData = gagaAgGrid.removeRowData(gridNoticeGoodsOptions, false);
-		
 		// 신규 상세 공지일경우 화면에서만 삭제
 		if (gagajf.isNull($('#goodsNoticeForm input[name=noticeSq]').val())){
 			return;
 		}
 		
-		var arrGoodsCd = [];
-		$.each(selectedData, function(idx, item) {
-			arrGoodsCd.push(item.goodsCd);
-		});
-		
 		mcxDialog.confirm('삭제하시겠습니까?',  {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function(){
+				var removedData = gagaAgGrid.removeRowData(gridNoticeGoodsOptions, false);
+				var arrGoodsCd = [];
+				$.each(selectedData, function(idx, item) {
+					arrGoodsCd.push(item.goodsCd);
+				});
+				
 				var data = {arrGoodsCd : arrGoodsCd
 							,noticeSq : $('#goodsNoticeForm input[name=noticeSq]').val()
 			};

src/main/webapp/WEB-INF/views/goods/GoodsReserveSellForm.html

@@ -375,7 +375,7 @@
 	});
 	
 	var fnGoodsResSellDeleteCallBack = function(){
-		//fnGoodsResSellRegistListSearch($("#goodsResSellListForm input[name=searchGb]").val());
+		fnGoodsResSellRegistListSearch($("#goodsResSellListForm input[name=searchGb]").val());
 	}
 	
 	$(document).ready(function() {

src/main/webapp/WEB-INF/views/goods/GoodsTitleReservePopupForm.html

@@ -167,7 +167,7 @@
 		}
 
 		if (fromDate > toDate) {
-			mcxDialog.alertC("예약 시작일자는 종료일자 보다 클 수 없습니다.", {
+			mcxDialog.alertC("예약 종료일시는 시작료일시 보다 작을 수 없습니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#goodsRsvtTnmForm input[name=applyEdYMD]').focus();

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

@@ -296,6 +296,10 @@
 		// Create a summernote
 		var snOptions = gagaSn.getToolbarOptions('media');
 		gagaSn.createSummernote(snOptions, '#note');
+		
+		var date = new Date();
+		$('#cardInterestForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
+		$('#cardInterestForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
 	});
 
 /*]]>*/

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

@@ -40,7 +40,7 @@
 					</tr>
 					<tr>
 						<th>행사기간<em class="required" title="필수"></em></th>
-						<td >
+						<td id="sellTermsP">
 							<input name="prmtStd" id="prmtStd" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="행사시작일" th:value="${cardPrmt.prmtStd}"/>
 							~
 							<input name="prmtEdd" id="prmtEdd" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="행사종료일" th:value="${cardPrmt.prmtEdd}"/>
@@ -319,7 +319,10 @@
 	}
 
 	$(document).ready(function() {
-
+		//gagajf.setDate('#sellTermsP','prmtStd', 'prmtEdd', 't');
+		var date = new Date();
+		$('#cardPromotionForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
+		$('#cardPromotionForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
 	});
 
 /*]]>*/

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -29,7 +29,7 @@
 
 			<div class="panelStyle">
 				<div class="panelTitle">
-					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 -T1</h3>
+					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 -v1</h3>
 					<span class="panelControl">
 						<i class="fa fa-chevron-up"></i>
 					</span>