Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -80,7 +80,7 @@ public interface TsaBusinessDao {
 	 * @author gagamel
 	 * @since 2020. 11. 24
 	 */
-	Collection<DelvFeePolicy> getDeliveryFeePolicyList(String supplyCompCd);
+	Collection<DelvFeePolicy> getDeliveryFeePolicyList(DelvFeePolicy delvFeePolicy);
 
 	/**
 	 * 배송비정책 생성

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

@@ -54,6 +54,15 @@ public interface TsaCustomerDao {
 	 */
 	void updateCustomerInfo(Customer customer);
 
+
+	/**
+	 * 회원 휴대전화번호 수정
+	 * @param customer - 고객정보
+	 * @author jsshin
+	 * @since 2021. 01. 25
+	 */
+	void updateCustomerCellPhnno(Customer customer);
+
 	/**
 	 * 회원 주문내역
 	 * @param custNo - 고객번호
@@ -101,6 +110,16 @@ public interface TsaCustomerDao {
 	 */
 	Collection<Coupon> getCustomerCouponList(Integer custNo);
 
+	/**
+	 * 회원상세-포인트
+	 *
+	 * @param custNo -고객일련번호
+	 * @return Point
+	 * @author jsshin
+	 * @since 2021. 01. 25
+	 */
+	Point getCustomerPoint(Integer custNo);
+
 	/**
 	 * 회원상세-포인트내역
 	 *

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

@@ -13,6 +13,7 @@ import com.style24.persistence.domain.GoodsDesc;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -1129,4 +1130,31 @@ public interface TsaGoodsDao {
 	 */
 	void createCategoryGoods(Goods goods);
 
+	/**
+	 * 상품 등록 로그 생성
+	 *
+	 * @param goodsMass
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	void createGoodsRegLog(GoodsMass goodsMass);
+
+	/**
+	 * 상품 기본 정보 수정 - 대량엑셀
+	 *
+	 * @param goods
+	 * @author eskim
+	 * @since 2021. 1. 25
+	 */
+	void updateGoodsMass(Goods goods);
+
+	/**
+	 * 상품등록로그 목록
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	Collection<GoodsMass> getGoodsRegLogList(GoodsSearch goodsSearch);
 }

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

@@ -0,0 +1,26 @@
+package com.style24.admin.biz.dao;
+
+import java.util.Collection;
+
+import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.Review;
+
+/**
+ * 상품평 Dao
+ *
+ * @author gagamel
+ * @since 2021. 1. 25
+ */
+@ShopDs
+public interface TsaReviewDao {
+
+	/**
+	 * 상품평 목록
+	 * @param review - 상품평 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 25
+	 */
+	Collection<Review> getReviewList(Review review);
+
+}

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

@@ -107,8 +107,8 @@ public class TsaBusinessService {
 	 * @author gagamel
 	 * @since 2020. 11. 24
 	 */
-	public Collection<DelvFeePolicy> getDeliveryFeePolicyList(String supplyCompCd) {
-		return businessDao.getDeliveryFeePolicyList(supplyCompCd);
+	public Collection<DelvFeePolicy> getDeliveryFeePolicyList(DelvFeePolicy delvFeePolicy) {
+		return businessDao.getDeliveryFeePolicyList(delvFeePolicy);
 	}
 
 	/**

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

@@ -89,6 +89,21 @@ public class TsaCustomerService {
 		coreCustomerService.updateCustomerPassword(customer);
 	}
 
+	/**
+	 * 회원 휴대전화번호 수정
+	 * @param customer - 고객정보
+	 * @author jsshin
+	 * @since 2020. 01. 25
+	 */
+	@Transactional("shopTxnManager")
+	public void updateCustomerCellphnno(Customer customer) {
+		Integer userNo = TsaSession.getInfo().getUserNo();
+		customer.setRegNo(userNo);
+		customer.setUpdNo(userNo);
+		coreCustomerService.createCustomerHistory(customer);
+		customerDao.updateCustomerCellPhnno(customer);
+	}
+
 	/**
 	 * 회원 주문내역
 	 * @param custNo - 고객번호
@@ -142,6 +157,18 @@ public class TsaCustomerService {
 		return customerDao.getCustomerCouponList(custNo);
 	}
 
+	/**
+	 * 회원상세-포인트
+	 *
+	 * @param custNo -고객일련번호
+	 * @return Point
+	 * @author jsshin
+	 * @since 2021. 01. 25
+	 */
+	public Point getCustomerPoint(Integer custNo){
+		return customerDao.getCustomerPoint(custNo);
+	}
+
 	/**
 	 * 회원상세-포인트내역
 	 *

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

@@ -2,6 +2,7 @@ package com.style24.admin.biz.service;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +23,8 @@ import com.style24.persistence.domain.AdKeyword;
 import com.style24.persistence.domain.AdKeywordGoods;
 import com.style24.persistence.domain.Brand;
 import com.style24.persistence.domain.Color;
+import com.style24.persistence.domain.CommonCode;
+import com.style24.persistence.domain.DelvFeePolicy;
 import com.style24.persistence.domain.FreeGoods;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsCategory;
@@ -30,6 +33,7 @@ import com.style24.persistence.domain.GoodsDesc;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -46,6 +50,7 @@ import com.style24.persistence.domain.NoticeGoods;
 import com.style24.persistence.domain.Option;
 import com.style24.persistence.domain.ReinboundInform;
 import com.style24.persistence.domain.SearchData;
+import com.style24.persistence.domain.SupplyCompany;
 import com.style24.persistence.domain.Video;
 import com.style24.persistence.domain.WmsColorMapping;
 import com.style24.persistence.domain.WmsGoods;
@@ -94,6 +99,9 @@ public class TsaGoodsService {
 	@Autowired
 	private TsaDisplayService displayService;
 
+	@Autowired
+	private TsaRendererService rendererService;
+
 	@Autowired
 	private SafetyKoreaApi safetyKoreaApi;
 
@@ -105,6 +113,8 @@ public class TsaGoodsService {
 
 	private static final String NUMBER_PATTERN = "^[0-9]+$";
 
+	private static final String UPDATE_NO_PATTERN = "X";
+
 	private static final String SELF_GOOODS_AFTER = "STY";
 
 	/**
@@ -873,7 +883,7 @@ public class TsaGoodsService {
 			}
 			goodsDao.updateGoodsSnm(goods);
 
-			//상품 등록후에는 고시정보는 품목과 상관없이 변경처리 가능하게 
+			//상품 등록후에는 고시정보는 품목과 상관없이 변경처리 가능하게
 //			Collection<GoodsNotiInfo> goodsNotiInfoList = goodsDao.getNewNotiInfo(goods);
 //			goodsDao.deleteGoodsNotiInfo(goods);
 //
@@ -1353,6 +1363,11 @@ public class TsaGoodsService {
 				regGoods.setSupplyCompCd(extendGoods.getSupplyCompCd());
 				regGoods.setFormalGb(extendGoods.getFormalGb());
 			}
+
+			if ("Y".equals(goodsCompose.getRepYn())) {
+				regGoods.setListPrice(extendGoods.getCurrPrice());
+				regGoods.setCurrPrice(extendGoods.getCurrPrice());
+			}
 		}
 
 		this.createGoodsExtend(regGoods, goodsComposeList); // 딜상품 관련 정보 저장
@@ -1459,8 +1474,6 @@ public class TsaGoodsService {
 
 		float pntPrate = 0f;
 		float pntMrate = 0f;
-		float sellFeeRate = 0f;
-		//String delvFeeCd = "";
 		for (Brand tmpBrand : brandList) {
 
 			if ("10".equals(regGoods.getFormalGb())) {
@@ -1470,15 +1483,31 @@ public class TsaGoodsService {
 				pntPrate = tmpBrand.getPntPrate20();
 				pntMrate = tmpBrand.getPntMrate20();
 			}
-			sellFeeRate = tmpBrand.getSellFeeRate();
-			//delvFeeCd = tmpBrand.getDelvFeeCd();
 		}
-		//regGoods.setDelvFeeCd(delvFeeCd);// 배송비전책코드
+
 		regGoods.setPntPrate(pntPrate); // 포인트적립율(PC)
 		regGoods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
-		regGoods.setSellFeeRate(sellFeeRate); // 판매수수료율
+
 		regGoods.setSelfGoodsYn("Y");
 
+		SupplyCompany supplyCompany = new SupplyCompany();
+		supplyCompany.setSupplyCompCd(regGoods.getSupplyCompCd());
+		Collection<SupplyCompany> supplyCompanyList = businessService.getSupplyCompanyList(supplyCompany);
+		if (supplyCompanyList == null || supplyCompanyList.isEmpty()) {
+			throw new IllegalStateException(message.getMessage("구성상품 중 기준 상품의 업체(판매수수율를 확인해 주세요."));
+		}
+		regGoods.setSellFeeRate(supplyCompanyList.iterator().next().getSellFeeRate()); // 판매수수료율
+
+
+		DelvFeePolicy delvFeePolicy = new DelvFeePolicy();
+		delvFeePolicy.setSupplyCompCd(regGoods.getSupplyCompCd());
+		Collection<DelvFeePolicy> deliveryFeePolicyList = businessService.getDeliveryFeePolicyList(delvFeePolicy);
+		if (deliveryFeePolicyList == null || deliveryFeePolicyList.isEmpty()) {
+			throw new IllegalStateException(message.getMessage("구성상품 중 기준 상품의 업체(배송비정책)를 확인해 주세요."));
+		}
+		regGoods.setDelvFeeCd(deliveryFeePolicyList.iterator().next().getDelvFeeCd());// 배송비정책코드
+
+
 		// 스타일 연도
 		regGoods.setStyleYear(regGoods.getStyleYear());
 
@@ -2696,4 +2725,794 @@ public class TsaGoodsService {
 		return goodsDao.getNotiClsfColumnInfo(niClsfCd);
 	}
 
+	/**
+	 * 상품대량수정 엑셀 저장
+	 *
+	 * @param ecxelGoodsList, procJob(updateGoods)
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	@Transactional("shopTxnManager")
+	public String updateMassExceluploadGoods(GagaMap gagaMap, String procJob) {
+
+		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
+
+		if (StringUtils.isBlank(goodsMass.getGoodsCd())) {
+			throw new IllegalStateException("상품코드가 없습니다.");
+		}
+
+		// 상품기본정보
+		Goods goodsData = new Goods();
+		goodsData.setGoodsCd(goodsMass.getGoodsCd().trim().toUpperCase());
+		Goods goodsOrigin = goodsDao.getGoods(goodsData);
+		if (goodsOrigin == null) {
+			goodsData.setGoodsRegMsg("미등록 상품코드");
+			goodsData.setGoodsStat("10");
+			this.setGoodsRegResult(goodsData, goodsMass, procJob);
+			return goodsData.getGoodsStat();
+		}
+		Goods goods = this.updateMassGoodsInfo(goodsMass, procJob, goodsOrigin);
+
+		if ("10".equals(goods.getGoodsStat())) { // 정보 오류
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		// 상품 고시
+		Collection<GoodsNotiInfo> newGoodsNotiList = new ArrayList<>(); //적용할 고시 정보
+		goods = this.getUpdateMassGoodsNotiCheck(goods, gagaMap, goodsOrigin, newGoodsNotiList);
+		if ("10".equals(goods.getGoodsStat())) { // 정보 오류
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		// 상품상세 (html, as-is/입점)
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getGoodsContent().trim())) {
+			if (goodsMass.getGoodsContent().toLowerCase().indexOf("script") >= 0) {
+				goods.setGoodsRegMsg("상품상세 html script 선언 오류");
+				goods.setGoodsStat("10");
+				this.setGoodsRegResult(goods, goodsMass, procJob);
+				return goods.getGoodsStat();
+			}
+			goods.setChkDescKeep("Y");
+		}
+
+		if ("N".equals(goods.getChDataYn()) && "N".equals(goods.getChkDescKeep()) && "N".equals(goods.getChNotiYn())) {
+			goods.setGoodsRegMsg("변경정보 없음");
+			goods.setGoodsStat("10");
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		//상품 기본정보 변경여부 와 촬영업체가 아닌경우
+		if ("Y".equals(goods.getChDataYn()) && !"G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+
+			goodsDao.createGoodsHst(goods); // 이력생성
+			goodsDao.updateGoodsMass(goods); // 상품기본 저장
+
+			if (!StringUtils.isBlank(goods.getGoodsSnm1()) && !UPDATE_NO_PATTERN.equals(goods.getGoodsSnm1())) {
+				// 사용자 검색어를 검색어에 적용
+				String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
+
+				String[] arrGoodsSnm = goods.getGoodsSnm1().split(";");
+				StringBuilder tempGoodsSnm = new StringBuilder();
+				for (String loopGoodsSnm : arrGoodsSnm) {
+					if (goodsSnm.toUpperCase().indexOf(loopGoodsSnm.toUpperCase()) <= -1) {
+						tempGoodsSnm.append(loopGoodsSnm).append(";");
+					}
+				}
+				goods.setGoodsSnm(tempGoodsSnm.toString() + goodsSnm);
+				goodsDao.updateGoodsSnm(goods);
+			}
+		}
+
+		//상품 상세 변경여부 와 촬영업체가 아닌경우
+		if ("Y".equals(goods.getChkDescKeep()) && !"G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+			GoodsDesc goodsDesc = new GoodsDesc();
+			goodsDesc.setGoodsCd(goods.getGoodsCd());
+			goodsDesc.setRegNo(goods.getRegNo());
+			goodsDesc.setUpdNo(goods.getUpdNo());
+
+			goodsDesc.setDescGb("80");
+			goodsDesc.setGoodsDesc(goodsMass.getGoodsContent().trim());
+			this.saveGoodsDesc(goodsDesc);
+		}
+
+		// 상품고시정보 적용
+		if ("Y".equals(goods.getChNotiYn()) && newGoodsNotiList != null && !newGoodsNotiList.isEmpty()) {
+
+			int index = 0;
+			for (GoodsNotiInfo goodsNotiInfo : newGoodsNotiList) {
+
+				if (index == 0) {
+					goodsDao.deleteGoodsNotiInfo(goods);
+				}
+				goodsDao.saveGoodsNotiInfo(goodsNotiInfo);
+				index++;
+			}
+		}
+
+		// 품목변경시 카테고리 자동 전시
+		if (!UPDATE_NO_PATTERN.equals(goods.getItemkindCd().trim())) {
+			GoodsCategory goodsCategory = new GoodsCategory();
+			goodsCategory.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsCategory.setUpdNo(TsaSession.getInfo().getUserNo());
+			goodsCategory.setGoodsCd(goods.getGoodsCd());
+			goodsCategory.setCateType("G031_10");	//상품분류카테고리
+			displayService.deleteGoodsCategory(goodsCategory);
+			goodsDao.createCategoryGoods(goods);
+
+		}
+
+		this.setGoodsRegResult(goods, goodsMass, procJob);
+
+		return goods.getGoodsStat();
+	}
+
+	/**
+	 * 상품 대량 등록 결과 정보
+	 *
+	 * @param goods
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	private void setGoodsRegResult(Goods goods, GoodsMass goodsMass, String procJob) {
+		// 결과 저장
+		goodsMass.setBrandCd(goods.getBrandCd());
+		goodsMass.setGoodsStat(goods.getGoodsStat());
+		goodsMass.setRegSuccYn("Y");
+		goodsMass.setRegFailRsn(goods.getGoodsRegMsg());
+		goodsMass.setRegNo(TsaSession.getInfo().getUserNo());
+		//model은 string 테이블은 number 형이라 ,,,
+//		if (StringUtils.isBlank(goodsMass.getListPrice())) {
+//			goodsMass.setListPrice("0");
+//		}
+//		if (UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice()) || StringUtils.isBlank(goodsMass.getCurrPrice())) {
+//			goodsMass.setCurrPrice("0");
+//		}
+//		if (StringUtils.isBlank(goodsMass.getCostPrice())) {
+//			goodsMass.setCostPrice("0");
+//		}
+//		if ("10".equals(goods.getGoodsStat())) {
+//			goodsMass.setRegSuccYn("N");
+//		}
+		goodsMass.setProcGb("C");
+		if ("updateGoods".equals(procJob)) {
+			goodsMass.setProcGb("U");
+		}
+		goodsDao.createGoodsRegLog(goodsMass);
+	}
+
+	/**
+	 * 상품대량수정 - 상품기본정보
+	 *
+	 * @param goodsMass
+	 * @param excelFilename
+	 * @author eskim
+	 * @since 2021. 1. 20
+	 */
+	private Goods updateMassGoodsInfo(GoodsMass goodsMass, String procJob, Goods goodsOrigin) {
+
+		Goods goods = new Goods();
+		goods.setChDataYn("N"); // 데이터 변경여부
+		goods.setGoodsRegMsg("상품정보 변경");
+		goods.setRegNo(TsaSession.getInfo().getUserNo());
+		goods.setUpdNo(TsaSession.getInfo().getUserNo());
+
+		goods.setGoodsCd(goodsMass.getGoodsCd().toUpperCase().trim().toUpperCase()); // 상품코드
+
+		if (StringUtils.isBlank(goodsMass.getGoodsNm())) {
+			goods.setGoodsRegMsg("상품명 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setGoodsNm(goodsMass.getGoodsNm().trim()); // 상품명
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsNm())) {
+			goods.setGoodsNm(goods.getGoodsNm().replaceAll("(\\r\\n|\\r|\\n|\\n\\r)", "")); // 상품명
+			goods.setChDataYn("Y");
+		}
+		goods.setGoodsTnm(goodsMass.getGoodsTnm().trim()); // 상품 타이틀
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsTnm())) {
+			goods.setChDataYn("Y");
+			if (!StringUtils.isBlank(goods.getGoodsTnm())) {
+				goods.setGoodsTnm(goods.getGoodsTnm().replaceAll("(\\r\\n|\\r|\\n|\\n\\r)", "")); // 상품 타이틀
+			}
+		}
+		goods.setGoodsSnm1(goodsMass.getGoodsSnm1().trim()); // 상품 사용자 검색어
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsSnm1())) {
+			goods.setChDataYn("Y");
+			if (!StringUtils.isBlank(goods.getGoodsSnm1())) {
+				goods.setGoodsSnm1(goods.getGoodsSnm1().replaceAll("(\\r\\n|\\r|\\n|\\n\\r|\\s)", "")); // 상품 사용자 검색어
+			}
+		}
+		// 품목확인
+		if (StringUtils.isBlank(goodsMass.getItemkindCd())) {
+			goods.setGoodsRegMsg("품목코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setItemkindCd(goodsMass.getItemkindCd().trim().toUpperCase()); // 품목
+
+		if (!UPDATE_NO_PATTERN.equals(goods.getItemkindCd())) {
+			Itemkind itemkind = new Itemkind();
+			itemkind.setItemkindCd(goods.getItemkindCd());
+			itemkind.setUseYn("Y");
+			Collection<Itemkind> itemkindList = goodsDao.getItemkindList(itemkind);
+			if (itemkindList == null || itemkindList.isEmpty()) {
+				goods.setGoodsRegMsg("품목 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		CommonCode commonCode = new CommonCode();
+		commonCode.setUseYn("Y");
+		// 시즌코드
+		if (StringUtils.isBlank(goodsMass.getSeasonCd())) {
+			goods.setGoodsRegMsg("시즌코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSeasonCd(goodsMass.getSeasonCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getSeasonCd())) {
+			commonCode.setCdGb("G006"); // 시즌
+			commonCode.setCd(goods.getSeasonCd());
+			Collection<CommonCode> seassonList = rendererService.getCommonCodeList(commonCode);
+			if (seassonList == null || seassonList.isEmpty()) {
+				goods.setGoodsRegMsg("시즌 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+		// 성별
+		if (StringUtils.isBlank(goodsMass.getSexGb())) {
+			goods.setGoodsRegMsg("성별코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSexGb(goodsMass.getSexGb().trim().toUpperCase());
+		// 성별
+		if (!UPDATE_NO_PATTERN.equals(goods.getSexGb())) {
+			commonCode.setCdGb("G007"); // 성별
+			commonCode.setCd(goods.getSexGb());
+			Collection<CommonCode> genderList = rendererService.getCommonCodeList(commonCode);
+			if (genderList == null || genderList.isEmpty()) {
+				goods.setGoodsRegMsg("성별 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+		//판매가
+		if (StringUtils.isBlank(goodsMass.getCurrPrice())) {
+			goods.setGoodsRegMsg("판매가 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
+			goods.setCurrPrice(0);
+		} else {
+
+			if (!GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", "").matches(NUMBER_PATTERN)) {
+				goods.setGoodsRegMsg("판매가 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			if (Integer.parseInt(goodsMass.getCurrPrice().trim()) == 0) {
+				goods.setGoodsRegMsg("판매가 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+		//판매수수료율
+		if (StringUtils.isBlank(goodsMass.getSellFeeRate())) {
+			goods.setGoodsRegMsg("판매수수료율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		float sellFeeRate = 0f;
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+			goods.setSellFeeRate(0);
+		} else {
+			try {
+				sellFeeRate = Float.valueOf(goodsMass.getSellFeeRate().trim());
+				//goods.setSellFeeRate(sellFeeRate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			//비교값 크면 1, 같으면 0, 작은면 -1 리턴
+			if (Float.compare(sellFeeRate, 0) == 0) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			if (Float.compare(sellFeeRate, 100) >= 0) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		//판매가나 판매수수료율이 변경되었을 때
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim()) || !UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+			//자사
+			if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+				//판매가 변경시
+				if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
+					goods.setCurrPrice(Integer.parseInt(GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", ""))); // 판매가
+					goods.setCurrBprice(goodsOrigin.getCurrPrice());
+					goods.setDcRate((int)(this.getDcRate(goodsOrigin.getListPrice(), goods.getCurrPrice())));
+					goods.setChDataYn("Y");
+				}
+				//판매수수료율 변경시
+				if (!UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+					goods.setSellFeeRate(sellFeeRate); // 판매수수료율
+					goods.setChDataYn("Y");
+				}
+			} else {
+				//입점
+				GoodsPriceRes goodsPriceRes = new GoodsPriceRes();
+				goodsPriceRes.setGoodsCd(goods.getGoodsCd());
+				if (goods.getCurrPrice() != goodsOrigin.getCurrPrice()) {
+					goodsPriceRes.setResGoodsPrice(goods.getCurrPrice());
+					goodsPriceRes.setEndGoodsPrice(goods.getCurrPrice());
+				}
+				if (goods.getSellFeeRate() != goodsOrigin.getSellFeeRate()) {
+					goodsPriceRes.setSellFeeRate(sellFeeRate);
+				}
+				goodsPriceRes.setApplyStdt(GagaDateUtil.getTodayDateTime());	//yyyymmddhhmiss
+				int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) + 4;
+				goodsPriceRes.setApplyEddt(Integer.toString(toYear) + "1231235959");	//yyyymmddhhmiss
+				goodsPriceRes.setCfrmYn("N");
+				goodsPriceRes.setApplyYn("N");
+				goodsPriceRes.setRegNo(goods.getRegNo());
+				goodsPriceRes.setUpdNo(goods.getUpdNo());
+				goodsDao.createGoodPriceRes(goodsPriceRes);
+
+				// 상품테이블에 바로 변경하지 않고 입점상품가격관리에서 승인해야함
+				goods.setCurrPrice(goodsOrigin.getCurrPrice());
+				goods.setSellFeeRate(goodsOrigin.getSellFeeRate());
+			}
+		}
+
+		// 상품구분
+		if (StringUtils.isBlank(goodsMass.getGoodsGb())) {
+			goods.setGoodsRegMsg("상품구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSexGb(goodsMass.getGoodsGb().trim().toUpperCase());
+		// 상품구분
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsGb())) {
+			commonCode.setCdGb("G073"); // 상품구분
+			commonCode.setCd(goods.getGoodsGb());
+			Collection<CommonCode> goodsGbList = rendererService.getCommonCodeList(commonCode);
+			if (goodsGbList == null || goodsGbList.isEmpty()) {
+				goods.setGoodsRegMsg("상품구분 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//정상이월구분
+		if (StringUtils.isBlank(goodsMass.getFormalGb())) {
+			goods.setGoodsRegMsg("정상이월구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setFormalGb(goodsMass.getFormalGb().trim().toUpperCase()); // 정상이월
+		if (!UPDATE_NO_PATTERN.equals(goods.getFormalGb())
+			&& !"G009_10".equals(goods.getFormalGb())
+			&& !"G009_20".equals(goods.getFormalGb())) {
+			goods.setGoodsRegMsg("정상이월구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		if (!UPDATE_NO_PATTERN.equals(goods.getFormalGb())) {
+			goods.setPntPrate(goodsOrigin.getPntPrate()); // 포인트적립율(PC)
+			goods.setPntMrate(goodsOrigin.getPntMrate()); // 포인트적립율(MOBILE)
+			Brand brand = new Brand();
+			brand.setBrandCd(goodsOrigin.getBrandCd());
+			Collection<Brand> brandList = businessService.getBrandList(brand);
+			if (brandList != null && !brandList.isEmpty()) {
+				// 브랜드 확인
+				float pntPrate = 0f;
+				float pntMrate = 0f;
+				for (Brand tmpBrand : brandList) {
+					if ("G009_10".equals(goods.getFormalGb())) {
+						pntPrate = tmpBrand.getPntPrate10();
+						pntMrate = tmpBrand.getPntMrate10();
+					} else {
+						pntPrate = tmpBrand.getPntPrate20();
+						pntMrate = tmpBrand.getPntMrate20();
+					}
+				}
+				goods.setPntPrate(pntPrate); // 포인트적립율(PC)
+				goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//최소주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getMinOrdQty().trim())) {
+			goods.setMinOrdQty(0);
+		} else {
+			if (!goodsMass.getMinOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getMinOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("최소주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setMinOrdQty(Integer.parseInt(goodsMass.getMinOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+		//최대주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getMaxOrdQty().trim())) {
+			goods.setMaxOrdQty(0);
+		} else {
+			if (!goodsMass.getMaxOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getMaxOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("최대주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setMaxOrdQty(Integer.parseInt(goodsMass.getMaxOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+		//ID당1일최대주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getDayMaxOrdQty().trim())) {
+			goods.setMaxOrdQty(0);
+		} else {
+			if (!goodsMass.getDayMaxOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getDayMaxOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("ID당1일최대주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setDayMaxOrdQty(Integer.parseInt(goodsMass.getDayMaxOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+
+		if (goods.getMinOrdQty() > goods.getMaxOrdQty()) {
+			goods.setGoodsRegMsg("최소주문수량 오류(최대주문수량보다 클 수 없음)");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		if (goods.getMaxOrdQty() > goods.getDayMaxOrdQty()) {
+			goods.setGoodsRegMsg("최대주문수량 오류(ID당1일최대구매수량보다 클 수 없음)");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		//선물주문가능여부
+		if (StringUtils.isBlank(goodsMass.getGiftPackYn())) {
+			goods.setGoodsRegMsg("선물주문가능여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+			if (!UPDATE_NO_PATTERN.equals(goodsMass.getGiftPackYn().trim().toUpperCase())) {
+				goods.setGiftPackYn(goodsMass.getGiftPackYn().trim().toUpperCase());
+				if (!"Y".equals(goods.getGiftPackYn()) && !"N".equals(goods.getGiftPackYn())) {
+					goods.setGoodsRegMsg("선물주문가능여부 오류");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+				goods.setChDataYn("Y");
+			}
+		} else {
+			goods.setGiftPackYn(goodsOrigin.getGiftPackYn().trim().toUpperCase());
+		}
+
+		//신규가입구매가능여부
+		if (StringUtils.isBlank(goodsMass.getNewCustOrdYn())) {
+			goods.setGoodsRegMsg("신규가입구매가능여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+			if (!UPDATE_NO_PATTERN.equals(goodsMass.getNewCustOrdYn().trim().toUpperCase())) {
+				goods.setNewCustOrdYn(goodsMass.getNewCustOrdYn().trim().toUpperCase());
+				if (!"Y".equals(goods.getNewCustOrdYn()) && !"N".equals(goods.getNewCustOrdYn())) {
+					goods.setGoodsRegMsg("신규가입구매가능여부 오류");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+				goods.setChDataYn("Y");
+			}
+		} else {
+			goods.setNewCustOrdYn(goodsOrigin.getNewCustOrdYn().toUpperCase());
+		}
+
+		//반품여부
+		if (StringUtils.isBlank(goodsMass.getReturnableYn())) {
+			goods.setGoodsRegMsg("반품여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setReturnableYn(goodsMass.getReturnableYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getReturnableYn().trim())) {
+			if (!"Y".equals(goods.getReturnableYn()) && !"N".equals(goods.getReturnableYn())) {
+				goods.setGoodsRegMsg("반품여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//교환여부
+		if (StringUtils.isBlank(goodsMass.getChangeableYn())) {
+			goods.setGoodsRegMsg("교환여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setChangeableYn(goodsMass.getChangeableYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getChangeableYn().trim())) {
+			if (!"Y".equals(goods.getChangeableYn()) && !"N".equals(goods.getChangeableYn())) {
+				goods.setGoodsRegMsg("교환여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//과세구분
+		if (StringUtils.isBlank(goodsMass.getTaxGb())) {
+			goods.setGoodsRegMsg("과세구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setTaxGb(goodsMass.getTaxGb().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getTaxGb().trim())) {
+			if (!"Y".equals(goods.getTaxGb()) && !"N".equals(goods.getTaxGb())) {
+				goods.setGoodsRegMsg("과세구분 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//상품연령
+		if (StringUtils.isBlank(goodsMass.getAgeGrpCd())) {
+			goods.setGoodsRegMsg("상품연령 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setAgeGrpCd(goodsMass.getAgeGrpCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getAgeGrpCd())) {
+			commonCode.setCdGb("G023");
+			commonCode.setCd(goods.getAgeGrpCd());
+			Collection<CommonCode> ageGrpCdList = rendererService.getCommonCodeList(commonCode);
+			if (ageGrpCdList == null || ageGrpCdList.isEmpty()) {
+				goods.setGoodsRegMsg("상품연령 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//성인용품여부
+		if (StringUtils.isBlank(goodsMass.getAdultYn())) {
+			goods.setGoodsRegMsg("성인용품여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setAdultYn(goodsMass.getAdultYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getAdultYn())) {
+			if (!"Y".equals(goods.getAdultYn()) && !"N".equals(goods.getAdultYn())) {
+				goods.setGoodsRegMsg("성인용품여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//PC포인트적립율
+		if (StringUtils.isBlank(goodsMass.getPntPrate())) {
+			goods.setGoodsRegMsg("PC포인트적립율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntPrate().trim())) {
+			try {
+				float pntPrate = Float.valueOf(goodsMass.getPntPrate().trim());
+				goods.setPntPrate(pntPrate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("PC포인트적립율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPrePpntUsableYn())) {
+			goods.setGoodsRegMsg("PC선포인트 사용여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPrePpntUsableYn().trim())) {
+			if ("Y".equals(goodsMass.getPrePpntUsableYn().trim()) || "N".equals(goodsMass.getPrePpntUsableYn().trim())) {
+				goods.setPrePpntUsableYn(goodsMass.getPrePpntUsableYn().trim());
+				goods.setChDataYn("Y");
+			} else {
+				goods.setGoodsRegMsg("PC선포인트 사용여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPntMrate())) {
+			goods.setGoodsRegMsg("모바일포인트적립율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntMrate().trim())) {
+			try {
+				int pntMrate = Integer.parseInt(goodsMass.getPntMrate().trim());
+				goods.setPntMrate(pntMrate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("모바일포인트적립율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPreMpntUsableYn())) {
+			goods.setGoodsRegMsg("모바일선포인트 사용여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPreMpntUsableYn().trim())) {
+			if ("Y".equals(goodsMass.getPreMpntUsableYn().trim()) || "N".equals(goodsMass.getPreMpntUsableYn().trim())) {
+				goods.setPreMpntUsableYn(goodsMass.getPreMpntUsableYn().trim());
+				goods.setChDataYn("Y");
+			} else {
+				goods.setGoodsRegMsg("모바일선포인트 사용여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		// 배송비 정책 확인
+		if (StringUtils.isBlank(goodsMass.getDelvFeeCd())) {
+			goods.setGoodsRegMsg("배송비정책코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setDelvFeeCd(goodsMass.getDelvFeeCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getDelvFeeCd())) {
+
+			DelvFeePolicy delvFeePolicy = new DelvFeePolicy();
+			delvFeePolicy.setSupplyCompCd(goods.getSupplyCompCd());
+			delvFeePolicy.setDelvFeeCd(goods.getDelvFeeCd());
+			delvFeePolicy.setUseYn("Y");
+			Collection<DelvFeePolicy> deliveryFeePolicyList =  businessService.getDeliveryFeePolicyList(delvFeePolicy);
+			if (deliveryFeePolicyList != null && !deliveryFeePolicyList.isEmpty()) {
+				goods.setGoodsRegMsg("배송비정책코드 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		return goods;
+	}
+
+	/**
+	 * 상품대량수정 - 상품고시정보 check
+	 *
+	 * @param goods
+	 * @param excelMap
+	 * @param goodsOrigin
+	 * @param newGoodsNotiList
+	 * @return Goods
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	private Goods getUpdateMassGoodsNotiCheck(Goods goods, GagaMap excelMap, Goods goodsOrigin, Collection<GoodsNotiInfo> newGoodsNotiList) {
+
+		goods.setChNotiYn("N");
+		String oldNiClsfCd = "";
+		String newNiClsfCd = "";
+
+		newNiClsfCd = excelMap.getString("niClsfCd").trim();
+		for (int i = 0; i < 28; i++) {
+			if (StringUtils.isBlank(excelMap.getString("niContent" + (i + 1)))) {
+				goods.setGoodsRegMsg("고시항목정보 없음 (" + (i + 1) + "번째 항목)");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			if (!UPDATE_NO_PATTERN.equals(excelMap.getString("niContent" + (i + 1)).trim())) {
+				goods.setChNotiYn("Y");
+			}
+		}
+		// 변경사항이 있는지 확인
+		if (UPDATE_NO_PATTERN.equals(newNiClsfCd) && "N".equals(goods.getChNotiYn())) {
+			return goods;
+		}
+
+		Collection<GoodsNotiInfo> goodsNotiList = new ArrayList<>();
+		//고시분류 코드의 고시항목 조회
+		NotiInfo notiInfo = new NotiInfo();
+		notiInfo.setSupplyVendorCd(goodsOrigin.getSupplyVendorCd());
+		if (!UPDATE_NO_PATTERN.equals(newNiClsfCd)) {
+			notiInfo.setNiClsfCd(newNiClsfCd);
+		} else {
+			GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
+			goodsNotiInfo.setGoodsCd(goods.getGoodsCd());
+			goodsNotiList = goodsDao.getGoodsNotiInfoList(goodsNotiInfo);
+			if (goodsNotiList != null && !goodsNotiList.isEmpty()) {
+				oldNiClsfCd = goodsNotiList.iterator().next().getNiClsfCd();
+			}
+			notiInfo.setNiClsfCd(oldNiClsfCd);
+			newNiClsfCd = oldNiClsfCd;
+		}
+		Collection<NotiInfo> notiInfolist = goodsDao.getNotiInfoItemList(notiInfo);  // 항목별 기본값 조회
+		// 상품의 고시 분류코드 조회
+		if (notiInfolist == null || notiInfolist.isEmpty()) {
+			goods.setGoodsRegMsg("고시분류정보 없음");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		int index = 0;
+		// 같은 고시분류 일경우 기존 고시항목 정보 적용
+		if (oldNiClsfCd.equals(newNiClsfCd)) {
+			for (NotiInfo notiInfoData : notiInfolist) {
+				for (GoodsNotiInfo goodsNotiInfoTemp : goodsNotiList) {
+					if (notiInfoData.getNiItemCd().equals(goodsNotiInfoTemp.getNiItemCd())) {
+						notiInfoData.setNiContent(goodsNotiInfoTemp.getNiContent());
+						break;
+					}
+				}
+				index++;
+			}
+		}
+
+		index = 0;
+		for (NotiInfo notiInfoTmp : notiInfolist) {
+			GoodsNotiInfo goodsNotiInfoTmp = new GoodsNotiInfo();
+			goodsNotiInfoTmp.setGoodsCd(goods.getGoodsCd());
+			goodsNotiInfoTmp.setNiClsfCd(notiInfoTmp.getNiClsfCd());
+			goodsNotiInfoTmp.setNiItemCd(notiInfoTmp.getNiItemCd());
+			goodsNotiInfoTmp.setDispOrd(index + 1);
+			goodsNotiInfoTmp.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsNotiInfoTmp.setUpdNo(TsaSession.getInfo().getUserNo());
+			if (UPDATE_NO_PATTERN.equals(excelMap.getString("niContent" + (index + 1)))) {
+				goodsNotiInfoTmp.setNiContent(notiInfoTmp.getNiContent());
+			} else {
+				goodsNotiInfoTmp.setNiContent(excelMap.getString("niContent" + (index + 1)));
+			}
+
+			newGoodsNotiList.add(goodsNotiInfoTmp);
+			index++;
+		}
+
+		return goods;
+	}
+
+	/**
+	 * 상품등록로그 목록
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 25
+	 */
+	public Collection<GoodsMass> getGoodsRegLogList(GoodsSearch goodsSearch) {
+
+		// 입점업체담당자는 업체코드 설정
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd()) || "G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
+			goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());
+		}
+		return goodsDao.getGoodsRegLogList(goodsSearch);
+	}
 }

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

@@ -104,6 +104,42 @@ public class TsaKakaoService {
 		}
 	}
 
+	/**
+	 * 인증번호발송
+	 * @param customer - 인증번호 발송
+	 * @author jsshin
+	 * @since 2021. 01. 25
+	 */
+	public void sendCustomerCertNo(Customer customer) {
+		SsgDirectMessage dm = new SsgDirectMessage();
+		dm.setFdestine(customer.getCellPhnno());
+		dm.setFkkoresendtype("LMS");
+
+		GagaMap replaceInfo = new GagaMap();
+		replaceInfo.setString("siteNm", TscConstants.Style24Infomation.SITE_NAME.value());
+		replaceInfo.setString("custNm", customer.getCustNm());
+		replaceInfo.setString("certNo", customer.getCertNo());
+
+		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.CertNoSend.value(), dm, replaceInfo);
+
+		try {
+			// 고객접촉이력 정보
+			Integer userNo = TsaSession.getInfo().getUserNo();
+			CustContactHst custContactHst = new CustContactHst();
+			custContactHst.setContactType(TscConstants.ContactType.CELLPHONE_AUTHENTICATION.value()); // 접촉유형:회원-휴대전화인증(공통코드G054)
+			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
+			custContactHst.setContactContents("인증번호");
+			custContactHst.setReceiverNo(customer.getCustNo());
+			custContactHst.setSenderNo(userNo);
+			custContactHst.setRegNo(userNo);
+			custContactHst.setUpdNo(userNo);
+			coreCustomerService.createCustomerContactHistory(custContactHst);
+		} catch (Exception e) {
+			log.error("error", e);
+			// Do nothing
+		}
+	}
+
 //
 //	/**
 //	 * 일대일문의 답변 알림톡 발송
@@ -139,36 +175,7 @@ public class TsaKakaoService {
 //		}
 //	}
 //
-//	/**
-//	 * 인증번호발송
-//	 * @param customer - 인증번호 발송
-//	 * @author jsshin
-//	 * @since 2020. 4. 8
-//	 */
-//	public void sendCustomerCertNo(AdmCustomer customer) {
-//		SsgDirectMessage dm = new SsgDirectMessage();
-//		dm.setFdestine(customer.getCellPhnno());
-//		dm.setFkkoresendtype("LMS");
-//
-//		GagaMap replaceInfo = new GagaMap();
-//		replaceInfo.setString("siteNm", customer.getSiteNm());
-//		replaceInfo.setString("custNm", customer.getCustNm());
-//		replaceInfo.setString("certNo", customer.getCertNo());
-//
-//		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.CertNoSend.value(), dm, replaceInfo);
-//
-//		try {
-//			// 고객접촉이력 정보
-//			customer.setContactType("209"); // 접촉유형:1:1문의답변(공통코드G054)
-//			customer.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
-//			customer.setContactContents("인증번호");
-//			customer.setReceiverId(customer.getCustNo());
-//			customerService.createCustomerContactHistory(customer);
-//		} catch (Exception e) {
-//			log.error("error", e);
-//			// Do nothing
-//		}
-//	}
+
 //
 //	/**
 //	 * 품절에의한 주문취소 안내

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

@@ -127,49 +127,30 @@ public class TsaMorebetterService {
      */
     @Transactional("shopTxnManager")
     public void saveMoreBetterDetail(MoreBetter moreBetter) {
-        Gson gson = new Gson();
-        String jsonData = gson.toJson(moreBetter);
-        log.info("{ saveMoreBetterDetail jsonData}",jsonData);
-
         // <,> replace 처리
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
         moreBetter.setUpdNo(TsaSession.getInfo().getUserNo());
+        Gson gson = new Gson();
+        String jsonData = gson.toJson(moreBetter);
+        log.info("{ saveMoreBetterDetail jsonData}",jsonData);
+        log.info("{ saveMoreBetterDetail moreBetter}",moreBetter);
 
         // TMTB 마스터(TB_TMTB) 저장
         morebetterDao.saveMorebetterMst(moreBetter);
 
-        // 다다익선 적용대상 설정
         // 공급업체
-        Collection<MoreBetterGoods> supplyCompList = gson.fromJson(moreBetter.getSupplyCompList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
-        for(MoreBetterGoods regSupplyComp : supplyCompList){
-            // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
-            // tmtbGoodsSq 생성
-            log.info("regSupplyComp.getTmtbGoodsSq = {}",regSupplyComp.getTmtbGoodsSq());
-            Integer tmtbGoodsSq = regSupplyComp.getTmtbGoodsSq();
-            if(tmtbGoodsSq == null){
-                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
-                regSupplyComp.setTmtbGoodsSq(tmtbGoodsSq);
-            }
+        for(MoreBetterGoods regSupplyComp : moreBetter.getSupplyCompList()){
             regSupplyComp.setTmtbSq(moreBetter.getTmtbSq());
             regSupplyComp.setGoodsGb("G800_20");
             regSupplyComp.setTargetVal(regSupplyComp.getSupplyCompCd());
             regSupplyComp.setRegNo(moreBetter.getRegNo());
             regSupplyComp.setUpdNo(moreBetter.getUpdNo());
-
             morebetterDao.saveMorebetterGoods(regSupplyComp);
         }
 
         // 브랜드
-        Collection<MoreBetterGoods> brandList = gson.fromJson(moreBetter.getBrandList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
-        for(MoreBetterGoods regBrand : brandList){
+        for(MoreBetterGoods regBrand : moreBetter.getBrandList()){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
-            // tmtbGoodsSq 생성
-            log.info("regBrand.getTmtbGoodsSq = {}",regBrand.getTmtbGoodsSq());
-            Integer tmtbGoodsSq = regBrand.getTmtbGoodsSq();
-            if(tmtbGoodsSq == null){
-                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
-                regBrand.setTmtbGoodsSq(tmtbGoodsSq);
-            }
             regBrand.setTmtbSq(moreBetter.getTmtbSq());
             regBrand.setGoodsGb("G800_20");
             regBrand.setTargetVal(regBrand.getBrandCd());
@@ -180,23 +161,8 @@ public class TsaMorebetterService {
         }
 
         // 적용상품
-        Collection<MoreBetterGoods> applyGoodsList = gson.fromJson(moreBetter.getApplyGoodsList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
-        for(MoreBetterGoods regApplyGoods : applyGoodsList){
+        for(MoreBetterGoods regApplyGoods : moreBetter.getApplyGoodsList()){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
-            // tmtbGoodsSq 생성
-            log.info("regApplyGoods.getTmtbGoodsSq = {}",regApplyGoods.getTmtbGoodsSq());
-            Integer tmtbGoodsSq = regApplyGoods.getTmtbGoodsSq();
-            if(tmtbGoodsSq == null){
-                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
-                regApplyGoods.setTmtbGoodsSq(tmtbGoodsSq);
-            }
-
-            log.info("regApplyGoods.getTmtbApplyGoodsSq = {}",regApplyGoods.getTmtbApplyGoodsSq());
-            Integer tmtbApplyGoodsSq = regApplyGoods.getTmtbApplyGoodsSq();
-            if(tmtbApplyGoodsSq == null){
-                tmtbApplyGoodsSq =  commonService.getNextSequence("SEQ_TMTB_APPLY_GOODS");
-                regApplyGoods.setTmtbApplyGoodsSq(tmtbApplyGoodsSq);
-            }
             regApplyGoods.setTmtbSq(moreBetter.getTmtbSq());
             regApplyGoods.setTargetVal(regApplyGoods.getGoodsCd());
             regApplyGoods.setRegNo(moreBetter.getRegNo());
@@ -207,23 +173,8 @@ public class TsaMorebetterService {
         }
 
         // 제외상품
-        Collection<MoreBetterGoods> exceptGoodsList = gson.fromJson(moreBetter.getExceptGoodsList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
-        for(MoreBetterGoods regExceptGoods : exceptGoodsList){
+        for(MoreBetterGoods regExceptGoods : moreBetter.getExceptGoodsList()){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
-            // tmtbGoodsSq 생성
-            log.info("regExceptGoods.getTmtbGoodsSq = {}",regExceptGoods.getTmtbGoodsSq());
-            Integer tmtbGoodsSq = regExceptGoods.getTmtbGoodsSq();
-            if(tmtbGoodsSq == null){
-                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
-                regExceptGoods.setTmtbGoodsSq(tmtbGoodsSq);
-            }
-
-            log.info("regExceptGoods.getTmtbApplyGoodsSq = {}",regExceptGoods.getTmtbApplyGoodsSq());
-            Integer tmtbApplyGoodsSq = regExceptGoods.getTmtbApplyGoodsSq();
-            if(tmtbApplyGoodsSq == null){
-                tmtbApplyGoodsSq =  commonService.getNextSequence("SEQ_TMTB_APPLY_GOODS");
-                regExceptGoods.setTmtbApplyGoodsSq(tmtbApplyGoodsSq);
-            }
             regExceptGoods.setTmtbSq(moreBetter.getTmtbSq());
             regExceptGoods.setTargetVal(regExceptGoods.getGoodsCd());
             regExceptGoods.setRegNo(moreBetter.getRegNo());
@@ -234,25 +185,8 @@ public class TsaMorebetterService {
         }
 
         // 다다익선 할인구간 저장
-        Collection<MoreBetterSection> sectionGbList = gson.fromJson(moreBetter.getSectionGbList() , new TypeToken<Collection<MoreBetterSection>>(){}.getType());
-        for(MoreBetterSection regSection : sectionGbList){
-            log.info("regSection.getTmtbSectionSq = {}",regSection.getTmtbSectionSq());
-            log.info("regSection.getTmtbValSq = {}",regSection.getTmtbValSq());
+        for(MoreBetterSection regSection : moreBetter.getSectionGbList()){
             // 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
-            // tmtbSectionSq 생성
-            Integer tmtbSectionSq = regSection.getTmtbSectionSq();
-            //if("".equals(regSection.getTmtbSectionSq()) || regSection.getTmtbSectionSq() == null){
-            if(tmtbSectionSq == null){
-                tmtbSectionSq =  commonService.getNextSequence("SEQ_TMTB_SECTION");
-                regSection.setTmtbSectionSq(tmtbSectionSq);
-            }
-            // 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 저장
-            // tmtbValSq 생성
-            Integer tmtbValSq = regSection.getTmtbValSq();
-            if(tmtbValSq == null){
-                tmtbValSq =  commonService.getNextSequence("SEQ_TMTB_VAL");
-                regSection.setTmtbValSq(tmtbValSq);
-            }
             regSection.setTmtbSq(moreBetter.getTmtbSq());
             regSection.setRegNo(moreBetter.getRegNo());
             regSection.setUpdNo(moreBetter.getUpdNo());
@@ -262,15 +196,7 @@ public class TsaMorebetterService {
         }
 
         // 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
-        Collection<MoreBetterBurden> burdenList = gson.fromJson(moreBetter.getBurdenList() , new TypeToken<Collection<MoreBetterBurden>>(){}.getType());
-        for (MoreBetterBurden regBurden : burdenList) {
-            // tmtbBurdenSq 생성
-            log.info("regBurden.getTmtbBurdenSq = {}",regBurden.getTmtbBurdenSq());
-            Integer tmtbBurdenSq = regBurden.getTmtbBurdenSq();
-            if(tmtbBurdenSq == null){
-                tmtbBurdenSq =  commonService.getNextSequence("SEQ_TMTB_BURDEN");
-                regBurden.setTmtbBurdenSq(tmtbBurdenSq);
-            }
+        for (MoreBetterBurden regBurden : moreBetter.getBurdenList()) {
             regBurden.setTmtbSq(moreBetter.getTmtbSq());
             regBurden.setRegNo(moreBetter.getRegNo());
             regBurden.setUpdNo(moreBetter.getUpdNo());

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

@@ -0,0 +1,41 @@
+package com.style24.admin.biz.service;
+
+import java.util.Collection;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.style24.admin.biz.dao.TsaReviewDao;
+import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.domain.Review;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 상품평 Service
+ *
+ * @author gagamel
+ * @since 2021. 1. 25
+ */
+@Service
+@Slf4j
+public class TsaReviewService {
+
+	@Autowired
+	private TscMessageByLocale message;
+
+	@Autowired
+	private TsaReviewDao reviewDao;
+
+	/**
+	 * 상품평 목록
+	 * @param review - 상품평 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 25
+	 */
+	public Collection<Review> getReviewList(Review review) {
+		return reviewDao.getReviewList(review);
+	}
+
+}

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

@@ -249,7 +249,9 @@ public class TsaBusinessController extends TsaBaseController {
 	@GetMapping("/delivery/fee/policy/list/{supplyCompCd}")
 	@ResponseBody
 	public Collection<DelvFeePolicy> getDeliveryFeePolicyList(@PathVariable String supplyCompCd) {
-		return businessService.getDeliveryFeePolicyList(supplyCompCd);
+		DelvFeePolicy delvFeePolicy = new DelvFeePolicy();
+		delvFeePolicy.setSupplyCompCd(supplyCompCd);
+		return businessService.getDeliveryFeePolicyList(delvFeePolicy);
 	}
 
 	/**

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

@@ -2,7 +2,9 @@ package com.style24.admin.biz.web;
 
 import java.util.Collection;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.security.GagaPasswordEncoder;
+import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.admin.biz.service.TsaCustomerService;
 import com.style24.admin.biz.service.TsaKakaoService;
 import com.style24.admin.biz.service.TsaSystemService;
@@ -500,6 +502,32 @@ public class TsaCustomerController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0005"));
 	}
 
+	/**
+	 * 메시지 발송 팝업 화면
+	 *
+	 * @param elementCellPhnno - 휴대폰
+	 * @param elementCustNo - 고객일련번호
+	 * @return ModelAndView
+	 * @author jsshin
+	 * @since 2021. 01. 25
+	 */
+	@GetMapping("/cellphone/change/popup/form")
+	public ModelAndView cellphoneChangePopupForm(@RequestParam(value = "elementCellPhnno", required = false) String elementCellPhnno
+			, @RequestParam(value = "elementCustNo") String elementCustNo) {
+		ModelAndView mav = new ModelAndView();
+		// 휴대폰 번호
+		mav.addObject("elementCellPhnno", elementCellPhnno);
+
+		// 고객 아이디
+		mav.addObject("elementCustNo", elementCustNo);
+
+		mav.addObject("callBack", TscConstants.CALLCENTER_TEL_NO);
+
+		mav.setViewName("customer/CellphoneChangePopupForm");
+
+		return mav;
+	}
+
 	/**
 	 * 인증번호 발송
 	 *
@@ -511,21 +539,25 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/certno/send")
 	@ResponseBody
 	public GagaResponse sendCustomerCertNo(@RequestBody Customer customer) {
-//		String certNo = GagaStringUtil.getRandomNumber(6);
-//		TsaSession.setAttribute("certNo", certNo);
-//		customer.setCertNo(certNo);
-//		log.info("certNo {}", certNo);
-//
-//		// 카카오알림톡 발송(카카오 템플릿 문구검수 후 변경 해야함)
-//		// 광고가 아니므로 SMS수신동의여부 체크할 필요 없음. 무조건 발송해야 함
-//		if (StringUtils.isNotBlank(customer.getCellPhnno())) {
-//			try {
-//				kakaoService.sendCustomerCertNo(customer);
-//			} catch (Exception e) {
-//				log.error(e.getMessage());
-//			}
-//
-//		}
+		String certNo = GagaStringUtil.getRandomNumber(6);
+		TsaSession.setAttribute("certNo", certNo);
+		TsaSession.setAttribute("cellPhnno", customer.getCellPhnno());
+
+		Customer custInfo = customerService.getCustomerInfo(customer.getCustNo());
+		customer.setCustNm(custInfo.getCustNm());
+		customer.setCertNo(certNo);
+		log.info("certNo {}", certNo);
+
+		// 카카오알림톡 발송(카카오 템플릿 문구검수 후 변경 해야함)
+		// 광고가 아니므로 SMS수신동의여부 체크할 필요 없음. 무조건 발송해야 함
+		if (StringUtils.isNotBlank(customer.getCellPhnno())) {
+			try {
+				kakaoService.sendCustomerCertNo(customer);
+			} catch (Exception e) {
+				log.error(e.getMessage());
+			}
+
+		}
 
 		return super.ok(message.getMessage("SUCC_0005"));
 	}
@@ -534,21 +566,28 @@ public class TsaCustomerController extends TsaBaseController {
 	 * 인증번호 확인
 	 *
 	 * @param customer -고객정보
-	 * @return Customer
+	 * @return GagaMap
 	 * @author jsshin
-	 * @since 2021. 01. 21
+	 * @since 2021. 01. 25
 	 */
 	@PostMapping("/certno/confirm")
 	@ResponseBody
-	public Customer confirmCustomerCertNo(@RequestBody Customer customer) {
-		Customer custResult = new Customer();
-//		String certNo = TsaSession.getAttribute("certNo");
-//		String result = "N";
-//		if (certNo.equals(customer.getCrtfdNo())) {
-//			result = "Y";
-//		}
-//		custResult.setCrtfdNoYn(result);
-		return custResult;
+	public GagaMap confirmCustomerCertNo(@RequestBody Customer customer) {
+		String certNo = TsaSession.getAttribute("certNo");
+		String cellPhnno = TsaSession.getAttribute("cellPhnno");
+		String crtfdNoYn = "N";
+
+		if (certNo.equals(customer.getCertNo())) {
+			customer.setCellPhnno(cellPhnno);
+			if (StringUtils.isNotBlank(cellPhnno)) {
+				customerService.updateCustomerCellphnno(customer);
+			}
+			crtfdNoYn = "Y";
+		}
+
+		GagaMap result = new GagaMap();
+		result.setString("crtfdNoYn", crtfdNoYn);
+		return result;
 	}
 
 	/**
@@ -668,15 +707,15 @@ public class TsaCustomerController extends TsaBaseController {
 	 * 회원상세-포인트
 	 *
 	 * @param custNo -고객일련번호
-	 * @return TsaPoint
+	 * @return Point
 	 * @author jsshin
 	 * @since 2021. 01. 21
 	 */
-	//	@GetMapping("/point/{custNo}")
-	//	@ResponseBody
-	//	public Point getCustomerPoint(@PathVariable Integer custNo) {
-	//		return customerService.getCustomerPoint(custNo);
-	//	}
+	@GetMapping("/point/{custNo}")
+	@ResponseBody
+	public Point getCustomerPoint(@PathVariable Integer custNo) {
+		return customerService.getCustomerPoint(custNo);
+	}
 
 	/**
 	 * 회원상세-포인트내역

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

@@ -41,6 +41,7 @@ import com.style24.persistence.domain.GoodsCompose;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -2421,7 +2422,7 @@ public class TsaGoodsController extends TsaBaseController {
 	@ResponseBody
 	public Collection<GoodsNotiInfo> getGoodsNotiInfoListByNotiClsf(@RequestBody GoodsNotiInfo goodsNotiInfo) {
 		// multi row 검색관련 처리
-		if (!StringUtils.isBlank(goodsNotiInfo.getGoodsCd())) {
+		if (StringUtils.isNotBlank(goodsNotiInfo.getGoodsCd())) {
 			goodsNotiInfo.setGoodsCds(goodsNotiInfo.getGoodsCd().replaceAll("\r", "").split("\n"));
 		}
 
@@ -2540,4 +2541,66 @@ public class TsaGoodsController extends TsaBaseController {
 		goodsService.updateFreeGoods(freeGoods);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
+
+	/**
+	 * 상품대량수정 엑셀 저장
+	 *
+	 * @param goodsMass
+	 * @return
+	 * @throws Exception
+	 * @author eskim
+	 * @since 2021. 1. 25
+	 */
+	@PostMapping("/mass/excelupload/update")
+	@ResponseBody
+	public GagaResponse updateMassExceluploadGoods(@RequestBody GoodsMass goodsMass) throws Exception {
+
+		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
+		Collection<GagaMap> ecxelGoodsList = new ArrayList<>();
+
+		// 상품수장
+		// DB 처리 시 사용되는 파라미터명(셀명) 설정 -
+		String[] goodsNames = {"goodsCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd", "seasonCd",
+			"sexGb", "currPrice", "sellFeeRate", "goodsGb", "formalGb", "minOrdQty", "maxOrdQty", "dayMaxOrdQty",
+			"giftPackYn", "newCustOrdYn","pntPrate","prePpntUsableYn", "pntMrate","preMpntUsableYn",
+			"returnableYn", "changeableYn","taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "goodsContent",
+			"niClsfCd", "niContent1", "niContent2",
+			"niContent3", "niContent4", "niContent5", "niContent6", "niContent7", "niContent8", "niContent9",
+			"niContent10", "niContent11", "niContent12", "niContent13", "niContent14", "niContent15", "niContent16",
+			"niContent17", "niContent18", "niContent19", "niContent20", "niContent21", "niContent22", "niContent23",
+			"niContent24", "niContent25", "niContent26", "niContent27", "niContent28"};
+
+		ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
+
+		// 입점담당자, 촬영업체
+		if (!"G001_0000".equals(TsaSession.getInfo().getRoleCd()) && !"G001_A000".equals(TsaSession.getInfo().getRoleCd()) &&
+			!"G001_A001".equals(TsaSession.getInfo().getRoleCd()) && !"G001_A100".equals(TsaSession.getInfo().getRoleCd()) &&
+			!"G001_A101".equals(TsaSession.getInfo().getRoleCd()) ) {
+			throw new IllegalStateException("권한이 없습니다.");
+		}
+
+		for (GagaMap gagaMap : ecxelGoodsList) {
+			goodsService.updateMassExceluploadGoods(gagaMap, goodsMass.getProcJob());
+		}
+
+		// 파일 삭제
+		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()));
+
+		return super.ok("");
+	}
+
+	/**
+	 * 상품 대량등록 결과 조회
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 25
+	 */
+	@PostMapping("/reg/log/list")
+	@ResponseBody
+	public Collection<GoodsMass> getGoodsRegLogList(@RequestBody GoodsSearch goodsSearch) {
+		return goodsService.getGoodsRegLogList(goodsSearch);
+	}
+
 }

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

@@ -1,22 +1,12 @@
 package com.style24.admin.biz.web;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
-import com.style24.persistence.TscPageRequest;
-import com.style24.persistence.domain.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,24 +15,32 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.style24.admin.biz.service.TsaBusinessService;
 import com.style24.admin.biz.service.TsaCommonService;
 import com.style24.admin.biz.service.TsaCouponService;
 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.TsaSystemService;
+import com.style24.admin.biz.service.TsaReviewService;
 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.TscPageRequest;
+import com.style24.persistence.domain.CommonCode;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.CouponRefval;
+import com.style24.persistence.domain.CustCoupon;
+import com.style24.persistence.domain.FreeGoodsPromotion;
+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.Review;
 
 import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 마케팅 Controller
  * @author xodud1202
@@ -62,24 +60,99 @@ public class TsaMarketingController extends TsaBaseController {
 	@Autowired
 	private TsaFreegiftPromotionService freegiftService;
 
-	@Autowired
-	private TsaBusinessService businessService;
-
 	@Autowired
 	private TsaRendererService rendererService;
 
 	@Autowired
 	private TsaCommonService commonService;
 
-	@Autowired
-	private TsaSystemService systemService;
-
 	@Autowired
 	private TsaMorebetterService morebetterService;
 
 	@Autowired
 	private TsaCouponService couponService;
 
+	@Autowired
+	private TsaReviewService reviewService;
+
+	/**
+	 * 상품평관리 화면
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 25
+	 */
+	@GetMapping("/review/form")
+	public ModelAndView reviewForm() {
+		ModelAndView mav = new ModelAndView("marketing/ReviewForm");
+
+		// 사이즈점수
+		mav.addObject("scoreSizeList", rendererService.getAvailCommonCodeList("G040"));
+
+		// 색상점수
+		mav.addObject("scoreColorList", rendererService.getAvailCommonCodeList("G039"));
+
+		// 핏점수
+		mav.addObject("scoreFitList", rendererService.getAvailCommonCodeList("G042"));
+
+		// 두께감점수
+		mav.addObject("scoreThickList", rendererService.getAvailCommonCodeList("G079"));
+
+		// 무게감점수
+		mav.addObject("scoreWeightList", rendererService.getAvailCommonCodeList("G080"));
+
+		// 발볼넓이점수(G041)
+		mav.addObject("scoreBallList", rendererService.getAvailCommonCodeList("G041"));
+
+		// 포인트지급상태
+		mav.addObject("pntGiveStatList", rendererService.getAvailCommonCodeList("G043"));
+
+//		// 품목
+//		mav.addObject("itemkindList", rendererService.getAllItemkindList());
+//		
+//		// 브랜드그룹
+//		mav.addObject("brandGrpNmList", rendererService.getBrandGroupList());
+//		
+//		// MD
+//		mav.addObject("brandMdList", rendererService.getBrandMdList());
+//
+//		// 카테고리
+//		mav.addObject("tCateList", rendererService.getTCategoryList(""));
+//
+//		// 브랜드 조회
+//		mav.addObject("brandList", rendererService.getSupplyCompanyBrandList(""));
+
+		return mav;
+	}
+
+	/**
+	 * 상품평 목록
+	 * @param review - 상품평 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 25
+	 */
+	@PostMapping("/review/list")
+	@ResponseBody
+	public GagaMap getReviewList(@RequestBody Review review) {
+		GagaMap result = new GagaMap();
+
+		// multi row 검색관련 처리
+		if (StringUtils.isNotBlank(review.getGoodsCd())) {
+			review.setGoodsCds(review.getGoodsCd().replaceAll("\r", "").split("\n"));
+		}
+
+		// 상품평 목록
+		Collection<Review> reviewList = reviewService.getReviewList(review);
+
+		review.setPageable(new TscPageRequest(review.getPageNo() - 1, review.getPageSize()));
+		review.getPageable().setTotalCount(reviewList.size());
+
+		result.set("paging", review);
+		result.set("dataList", reviewList);
+
+		return result;
+	}
+
 	/* xodud1202 진행 */
 	/**
 	 * 사은품 프로모션 관리 화면
@@ -160,7 +233,7 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaResponse freeGoodsPromotionSave(@RequestBody FreeGoodsPromotion param) {
 		try {
 			freegiftService.saveFreegoodsPromotionInfo(param);
-		} catch(Exception e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 			return super.error(message.getMessage("FAIL_0001"));
 		}
@@ -180,7 +253,7 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaResponse freeGoodsPromotionChangeStat(@RequestBody FreeGoodsPromotion param) {
 		try {
 			freegiftService.updateFreegoodsPromotionStat(param);
-		} catch(Exception e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 			return super.error(message.getMessage("FAIL_0001"));
 		}
@@ -188,7 +261,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-
 	/* // xodud1202 진행 */
 
 	/* JSM 진행 */
@@ -249,7 +321,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@GetMapping("/coupon/popup/form")
 	@ResponseBody
-	public ModelAndView couponCreatePopup(@RequestParam(value="cpnId") String cpnId ) {
+	public ModelAndView couponCreatePopup(@RequestParam(value = "cpnId") String cpnId) {
 		ModelAndView mav = new ModelAndView();
 		String num = "";
 		String mode = "N";
@@ -299,17 +371,17 @@ public class TsaMarketingController extends TsaBaseController {
 		// 할인 쿠폰 코드 조회
 		mav.addObject("dcCdList", rendererService.getCommonCodeList("G233", "Y"));
 		// 정상/이월 조회
-		mav.addObject("formalGbList" , rendererService.getCommonCodeList("G009"));
+		mav.addObject("formalGbList", rendererService.getCommonCodeList("G009"));
 		// 카테고리 구분 조회
-		mav.addObject("cateGbList" , rendererService.getCommonCodeList("G032"));
+		mav.addObject("cateGbList", rendererService.getCommonCodeList("G032"));
 		// 자사 브랜드 조회
-		mav.addObject("selfBrandList" , couponService.getSelfBrandList());
+		mav.addObject("selfBrandList", couponService.getSelfBrandList());
 		// 사이트코드 조회
 		mav.addObject("siteCdList", rendererService.getCommonCodeList("G000"));
 		// 쿠폰상태 조회
 		mav.addObject("cpnStatList", rendererService.getCommonCodeList("G232"));
 		// 쿠폰 유형 조회
-		mav.addObject("cpnTypeList", rendererService.getCommonCodeList("G230" , "Y"));
+		mav.addObject("cpnTypeList", rendererService.getCommonCodeList("G230", "Y"));
 		// 사용가능 고객구분 조회
 		mav.addObject("usableCustGbList", rendererService.getCommonCodeList("G100"));
 		// 사용가능 고객등급 조회
@@ -326,29 +398,29 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("upperAfLinkCdList", rendererService.getCommonCodeList("G053"));
 
 		// 이미 쿠폰 아이디가 있으면 적용대상 조회
-		if(!StringUtils.isBlank(cpnId)) {
+		if (!StringUtils.isBlank(cpnId)) {
 			mode = "U";
 			issueCnt = couponService.getCouponIssueCnt(cpnId);
 			// 쿠폰상세조회
-			mav.addObject("cpnDetail" , couponService.getCouponDetail(cpnId));
+			mav.addObject("cpnDetail", couponService.getCouponDetail(cpnId));
 			// 쿠폰적용대상 - 공급업체 조회
-			mav.addObject("cpnDtlRefvalSupplyCompList" , couponService.getCouponRefvalSupplyCompList(cpnId));
+			mav.addObject("cpnDtlRefvalSupplyCompList", couponService.getCouponRefvalSupplyCompList(cpnId));
 			// 쿠폰적용대상 - 적용상품 조회
-			mav.addObject("cpnDtlRefvalApplyGoodsList" , couponService.getCouponRefvalGoodsList(cpnId , "G260_10"));
+			mav.addObject("cpnDtlRefvalApplyGoodsList", couponService.getCouponRefvalGoodsList(cpnId, "G260_10"));
 			// 쿠폰적용대상 - 카테고리 조회
-			mav.addObject("cpnDtlRefvalCateList" , couponService.getCouponRefvalCategoryList(cpnId));
+			mav.addObject("cpnDtlRefvalCateList", couponService.getCouponRefvalCategoryList(cpnId));
 			// 쿠폰적용대상 - 브랜드 조회
-			mav.addObject("cpnDtlRefvalBrandList" , couponService.getCouponRefvalBrandList(cpnId));
+			mav.addObject("cpnDtlRefvalBrandList", couponService.getCouponRefvalBrandList(cpnId));
 			// 쿠폰적용대상 - 제외상품 조회
-			mav.addObject("cpnDtlRefvalExceptGoodsList" , couponService.getCouponRefvalGoodsList(cpnId , "G260_14"));
+			mav.addObject("cpnDtlRefvalExceptGoodsList", couponService.getCouponRefvalGoodsList(cpnId, "G260_14"));
 			// 쿠폰 입점업체분담율 조회
-			mav.addObject("cpnDtlBurdenList" , couponService.getCouponBurdenList(cpnId));
+			mav.addObject("cpnDtlBurdenList", couponService.getCouponBurdenList(cpnId));
 		}
 
 		//issueCnt = 3;
 
-		mav.addObject("mode" , mode);
-		mav.addObject("issueCnt" , issueCnt);
+		mav.addObject("mode", mode);
+		mav.addObject("issueCnt", issueCnt);
 
 		mav.setViewName("marketing/CouponPopupForm");
 		return mav;
@@ -391,7 +463,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-
 	/**
 	 * 쿠폰발행팝업
 	 * @param
@@ -444,14 +515,14 @@ public class TsaMarketingController extends TsaBaseController {
 		// 시간 시 리스트 세팅
 		mav.addObject("hhList", hhList);
 		// 사이트조회
-		mav.addObject("siteCdList" , rendererService.getCommonCodeList("G000"));
+		mav.addObject("siteCdList", rendererService.getCommonCodeList("G000"));
 		// 사용가능 고객구분 조회
 		mav.addObject("usableCustGbList", rendererService.getCommonCodeList("G100"));
 		// 사용가능 고객등급 조회
 		mav.addObject("usableCustGradeList", rendererService.getCommonCodeList("G110"));
 		// 쿠폰발행사유 조회
 		mav.addObject("cpnPubReasonList", rendererService.getCommonCodeList("G068"));
-		
+
 		mav.setViewName("marketing/CouponPubForCustPopupForm");
 
 		return mav;
@@ -466,7 +537,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@PostMapping("/coupon/insertCustPub")
 	@ResponseBody
-	public GagaResponse saveCouponCustPub(@RequestBody CustCoupon custCoupon ){
+	public GagaResponse saveCouponCustPub(@RequestBody CustCoupon custCoupon) {
 		couponService.saveCouponCustPub(custCoupon);
 
 		return super.ok(message.getMessage("SUCC_0006"));
@@ -543,13 +614,6 @@ public class TsaMarketingController extends TsaBaseController {
 		// 다다익선 상태 목록
 		mav.addObject("tmtbStatList", rendererService.getAvailCommonCodeList("G232"));
 
-		//tmtb sq 자동생성
-		Integer tmtbSq;
-		if ("N".equals(mode)) {
-			tmtbSq = commonService.getNextSequence("SEQ_TMTB");
-			moreBetter.setTmtbSq(tmtbSq);
-		}
-
 		if ("U".equals(mode)) {
 			// 다다익선 정보
 			mav.addObject("tmtbMstInfo", morebetterService.getMorebetterMstInfo(tmtbSeq));
@@ -567,12 +631,22 @@ public class TsaMarketingController extends TsaBaseController {
 			mav.addObject("tmtbExceptGoodsList", new MoreBetterGoods());
 			mav.addObject("tmtbSectionValList", new MoreBetterSection());
 			mav.addObject("tmtbBurdenList", new MoreBetterBurden());
+			// 날짜형식
+			MoreBetter moreBetter1 = new MoreBetter();
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+
+			moreBetter1.setEventStdt(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+			moreBetter1.setEventEdHH(new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()));
+			moreBetter1.setEventEdHH("23");
+			moreBetter1.setEventEdMM("59");
+			mav.addObject("tmtbMstInfo", moreBetter1);
 		}
 
 		mav.addObject("mode", mode);
 		mav.addObject("tmtbSeq", tmtbSeq);
 		mav.addObject("params", moreBetter);
-		log.info("CHECK param tmtbSq::{}", moreBetter.getTmtbSq());
+		log.info("MorebetterPopupForm tmtbSeq::{}", tmtbSeq);
 		mav.setViewName("marketing/MorebetterPopupForm");
 		return mav;
 	}
@@ -587,74 +661,15 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@PostMapping("/morebetter/save")
 	@ResponseBody
-	public GagaMap saveMorebetterDetail(@RequestBody MoreBetter moreBetter){
-		String result = "";
-		GagaMap map = new GagaMap();
-
-		String[] multiSupplyCompCd = moreBetter.getSupplyCompArr().split(",");
-		String[] multiBrand = moreBetter.getBrandArr().split(",");
-		String[] multiGoods = moreBetter.getGoodsArr().split(",");
-
-		MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
-
-		moreBetterGoods.setMultiSupplyCompCd(multiSupplyCompCd);
-		moreBetterGoods.setMultiBrand(multiBrand);
-		moreBetterGoods.setMultiGoods(multiGoods);
-		log.info("[1 saveMorebetterDetail moreBetterGoods]{}",moreBetterGoods);
-
-		// TMTB_GOODS_TEMP TABLE TRUNCATE -> 다른 다다에서 사용중인 상품 조회 -> INSERT
-		morebetterService.createMorebetterGoodsTemp(moreBetterGoods);
-		//log.info("[saveMorebetterDetail createMorebetterGoodsTemp a]{}");
-		// 다른 다다에서 사용중인 상품 조회
-		Collection<MoreBetterGoods> duplicateGoodsList = morebetterService.getMorebetterDuplicateList(moreBetterGoods);
-
-		log.info("[1 duplicateGoodsList size]{}",duplicateGoodsList.size());
-
-		// SELECT -> 지금 내가 선택한 업체&브랜드 + 적용상품에 해당하는 상품 조회 MINUS TMTB_GOODS_TEMP 상품
-		// 조회 건수 있으면 -> 해당 상품코드 엑셀로 던져주기
-		if(duplicateGoodsList.size() > 0){
-			map.set("duplicateYn","Y");
-			map.set("msg", result);
-			map.set("duplicateGoodsList",duplicateGoodsList);
-		}else{
-			// 조회 건수 없으면 -> 저장으로 넘어감
-			//morebetterService.saveMoreBetterDetail(moreBetter);
-			map.set("duplicateYn","N");
-			map.set("msg", message.getMessage("SUCC_0001"));
+	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter moreBetter){
+		try {
+			morebetterService.saveMoreBetterDetail(moreBetter);
+		} catch(Exception e) {
+			e.printStackTrace();
+			return super.error(message.getMessage("FAIL_0001"));
 		}
-
-		return map;
-	}
-
-	@PostMapping("/morebetter/save2")
-	@ResponseBody
-	public GagaResponse saveMorebetterDetail2(@RequestBody MoreBetter moreBetter){
-		String[] multiSupplyCompCd = moreBetter.getSupplyCompArr().split(",");
-		String[] multiBrand = moreBetter.getBrandArr().split(",");
-		String[] multiGoods = moreBetter.getGoodsArr().split(",");
-
-		MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
-
-		moreBetterGoods.setMultiSupplyCompCd(multiSupplyCompCd);
-		moreBetterGoods.setMultiBrand(multiBrand);
-		moreBetterGoods.setMultiGoods(multiGoods);
-		log.info("[saveMorebetterDetail moreBetterGoods]{}",moreBetterGoods);
-
-		// TMTB_GOODS_TEMP TABLE TRUNCATE -> 다른 다다에서 사용중인 상품 조회 -> INSERT
-		morebetterService.createMorebetterGoodsTemp(moreBetterGoods);
-		//log.info("[saveMorebetterDetail createMorebetterGoodsTemp a]{}");
-		// 다른 다다에서 사용중인 상품 조회
-		Collection<MoreBetterGoods> duplicateGoodsList = morebetterService.getMorebetterDuplicateList(moreBetterGoods);
-
-		log.info("[duplicateGoodsList size]{}",duplicateGoodsList.size());
-
-		// SELECT -> 지금 내가 선택한 업체&브랜드에 해당하는 상품 조회 MINUS TMTB_GOODS_TEMP 상품
-		// 조회 건수 있으면 -> 해당 상품코드 엑셀로 던져주기
-		// 조회 건수 없으면 -> 저장으로 넘어감
-
-
-		//morebetterService.saveMoreBetterDetail(moreBetter);
 		return super.ok(message.getMessage("SUCC_0001"));
+
 	}
 
 	/**
@@ -795,4 +810,4 @@ public class TsaMarketingController extends TsaBaseController {
 	public Collection<Coupon> getCouponRetrieveList(@RequestBody Coupon coupon) {
 		return couponService.getCouponRetrieveList(coupon);
 	}
-}
+}

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

@@ -4,7 +4,6 @@ import java.util.Collection;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,7 +16,6 @@ import org.springframework.web.servlet.ModelAndView;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.style24.admin.biz.service.TsaDeliveryService;
 import com.style24.admin.biz.service.TsaOrderChangeService;
 import com.style24.admin.biz.service.TsaOrderService;
 import com.style24.admin.biz.service.TsaRendererService;
@@ -27,7 +25,6 @@ import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.persistence.domain.Delivery;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 
@@ -71,13 +68,48 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @author jsh77b
 	 * @since 2020. 12. 22
 	 */
-	@GetMapping("/cancel/request/form")
-	public ModelAndView cancelRequestFrom(@RequestParam(value = "ordNo") int ordNo) {
+	@GetMapping("/cncl/req/form")
+	public ModelAndView cnclReqForm(@RequestParam(value = "ordNo") int ordNo) {
+
+		Order order = new Order();
+		ModelAndView mav = new ModelAndView();
+		order.setOrdNo(ordNo);
+				
+		// 취소가능 주문상세상탭값 설정
+		String[] ordDtlStatArr = new String[4];
+		ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
+		ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
+		ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
+		ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
+		order.setOrdDtlStatArr(ordDtlStatArr);
+
+		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G686"));				// 취소사유
+		mav.addObject("cancelRequestTargetList"		, coreOrderChangeService.getCancelRequestTargetList(order));	// 취소요청대상목록
+		mav.addObject("orderInfoList"				, orderService.getOrderInfoList(order));						// 주문정보
+		mav.addObject("ordNo"						, ordNo);														// 주문번호
+
+		mav.setViewName("order/CnclReqForm");
+		
+		return mav;
+	}
+	
+	/**
+	 * 취소요청 화면 (관리자)
+	 * 
+	 * @param ordNo - 주문번호
+	 * @param cncWait - 취소대기요청 구분
+	 * @return ModelAndView
+	 * @author jsh77b
+	 * @since 2020. 12. 22
+	 */
+	@GetMapping("/cncl/req/view/form")
+	public ModelAndView cnclReqViewForm(@RequestParam(value = "ordNo") int ordNo ,@RequestParam(value = "ordChgSq") int ordChgSq) {
 
 		Order order = new Order();
 		ModelAndView mav = new ModelAndView();
 		
 		order.setOrdNo(ordNo);
+		order.setOrdChgSq(ordChgSq);
 		
 		// 취소가능 주문상세상탭값 설정
 		String[] ordDtlStatArr = new String[4];
@@ -91,8 +123,10 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("cancelRequestTargetList"		, coreOrderChangeService.getCancelRequestTargetList(order));	// 취소요청대상목록
 		mav.addObject("orderInfoList"				, orderService.getOrderInfoList(order));						// 주문정보
 		mav.addObject("ordNo"						, ordNo);														// 주문번호
+		mav.addObject("ordChgSq"					, ordChgSq);													// 주문변경번호
+		mav.addObject("orderChangeList"				, orderService.getOrderChangeList(order));						// 취소/반품/교환 요청 정보
 
-		mav.setViewName("order/CancelRequestForm");
+		mav.setViewName("order/CnclReqViewForm");
 		
 		return mav;
 	}
@@ -235,7 +269,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @author jsh77b
 	 * @since 2020. 12. 22
 	 */
-	@GetMapping("/return/request/form")
+	@GetMapping("/rtn/req/form")
 	public ModelAndView returnRequestFrom(@RequestParam(value = "ordNo") int ordNo) {
 
 		Order order = new Order();
@@ -304,7 +338,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 4. 주문변경 회수지정보 추가
 		mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
 		mav.set("chgerEmail"	, rtnReq.getChgerEmail());			// 변경자이메일주소
-		mav.set("chgerZipNo"	, rtnReq.getChgerZipNo());			// 회수지우편번호
+		mav.set("chgerZipcode"	, rtnReq.getChgerZipcode());		// 회수지우편번호
 		mav.set("chgerBaseAddr"	, rtnReq.getChgerBaseAddr());		// 회수지기본주소
 		mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
 		mav.set("chgerPhnno"	, rtnReq.getChgerPhnno());			// 변경자핸드폰번호
@@ -490,9 +524,14 @@ public class TsaOrderChangeController extends TsaBaseController {
 			return result;
 		}
 
+		// 세션 회원번호 설정
+		int userNo = TsaSession.getInfo().getUserNo();
+		excReq.setUpdNo(userNo);
+		excReq.setRegNo(userNo);
+
 		log.info("excReq >>> {}", excReq);
-		// orderChangeService.changeRequest()
-		// result.set("status", GagaResponseStatus.SUCCESS.getCode());
+
+		result = coreOrderChangeService.exchReq(excReq);
 
 		return result;
 	}

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

@@ -32,7 +32,7 @@ public class Brand extends TscBaseDomain {
 //	private String delvFeeCd;		// 배송비정책코드
 //	private int delvFee;			// 기본배송비
 //	private int minOrdAmt;			// 무료배송비최소주문금액
-	private float sellFeeRate;		// 판매수수료율
+//	private float sellFeeRate;		// 판매수수료율
 	private float pntPrate10;		// 포인트적립율(PC정상)
 	private float pntMrate10;		// 포인트적립율(모바일정상)
 	private float pntPrate20;		// 포인트적립율(PC이월)

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

@@ -0,0 +1,102 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * 상품 대량등록 Domain
+ *
+ * @author eskim
+ * @since 2021. 01. 12
+ */
+@SuppressWarnings("serial")
+@Data
+public class GoodsMass extends TscBaseDomain {
+
+	private String goodsCd;
+	private String goodsNum;
+	private String brandCd;		//브랜드코드
+	private String itemkindCd;	//품목코드
+	private String goodsNm;		//상품명
+	private String styleYear;	//스타일연도
+	private String seasonCd;	//시즌코드(공통코드G006)
+	private String sexGb;		//성별구분(공통코드G007)
+	private String listPrice;	//정상가(최초판매가)
+	private String currPrice;	//현재판매가
+	private String costPrice;	//원가
+	private String delvFeeCd;	//배송비정책코드
+	private String originCd;	//제조국(원산지)
+	private String makeYmd;		//제조연월일
+
+	private String supplyCompCd;	//공급업체코드
+	private String supplyGoodsCd;	//공급업체상품코드(원코드)
+	private String goodsTnm;		//상품타이틀명
+	private String goodsSnm1;		//상품검색명1(사용자등록용)
+	private String goodsGb;			//상품구분(공콩코드 G073)
+	private String formalGb; 		//정상이월구분(공통코드G009)
+//	private String distributionGb;	//유통구분(공콩코드 G065)
+	private String taxGb;			//과세구분(10:과세, 20:비과세)
+	private String ageGrpCd;		//상품연령코드(공통코드G023)
+	private String adultYn;			//성인용품여부 'Y', 'N'
+
+	private String pntPrate;		//포인트적립율(PC)
+	private String pntMrate;		//포인트적립율(모바일)
+	private String prePpntUsableYn;	//선포인트사용가능여부(PC)
+	private String preMpntUsableYn;	//선포인트사용가능여부(모바일)
+	private String sellFeeRate;		//판매수수료율
+	private String changeableYn;	//교환가능여부
+	private String returnableYn;	//반품가능여부
+	private String minOrdQty;		//최소주문수량
+	private String maxOrdQty;		//최대주문수량
+	private String dayMaxOrdQty;	//ID당1일최대구매수량
+	private String giftPackYn;		//선물포장여부
+	private String newCustOrdYn;	//신규고객 구매가능여부(Y:신규고객만 구매가능)
+
+	private String optStr;			//옵션(입점용)
+	private String opt1Str;			//옵션1
+	private String opt2Str;			//옵션2
+	private String goodsContent;	//상품상세 html(입점용)
+
+	private String niClsfCd;
+	private String niContent1;
+	private String niContent2;
+	private String niContent3;
+	private String niContent4;
+	private String niContent5;
+	private String niContent6;
+	private String niContent7;
+	private String niContent8;
+	private String niContent9;
+	private String niContent10;
+	private String niContent11;
+	private String niContent12;
+	private String niContent13;
+	private String niContent14;
+	private String niContent15;
+	private String niContent16;
+	private String niContent17;
+	private String niContent18;
+	private String niContent19;
+	private String niContent20;
+	private String niContent21;
+	private String niContent22;
+	private String niContent23;
+	private String niContent24;
+	private String niContent25;
+	private String niContent26;
+	private String niContent27;
+	private String niContent28;
+
+	private String excelFileNm;
+	private String procJob;
+	private String procGb;
+
+	private int goodsRegSq;
+	private String regSuccYn;
+	private String regFailRsn;
+	private String goodsStat;		//상품상태(공통코드G008)
+
+	private String mainColorCd;
+
+}

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

@@ -6,6 +6,7 @@ import com.style24.persistence.TscPageRequest;
 import lombok.Data;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 품목 Domain
@@ -57,20 +58,20 @@ public class MoreBetter extends TscBaseDomain {
 	//private String burdenRate;	// 업체분담율
 	private String useYn;			// 사용여부
 
-	private String supplyCompList;
-	private String brandList;
-	private String applyGoodsList;
-	private String exceptGoodsList;
-	private String burdenList;
-	private String sectionGbList;
-	private String compBrandGoodsList;
+	List<MoreBetterGoods> supplyCompList;
+	List<MoreBetterGoods> brandList;
+	List<MoreBetterGoods> applyGoodsList;
+	List<MoreBetterGoods> exceptGoodsList;
+	List<MoreBetterBurden> burdenList;
+	List<MoreBetterSection> sectionGbList;
 
-	private String supplyCompArr;
-	private String brandArr;
-	private String goodsArr;
-
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] arrCompBrandGoods;
+	// 날짜+시간
+	private String eventStdt;				// 다다익선시작일시
+	private String eventStHH;				// 다다익선시작일시
+	private String eventStMM;				// 다다익선시작일시
+	private String eventEddt;				// 다다익선종료일시
+	private String eventEdHH;				// 다다익선종료일시
+	private String eventEdMM;				// 다다익선종료일시
 
 	// Pagination
 	private TscPageRequest pageable;

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

@@ -14,7 +14,8 @@ import lombok.Data;
 @Data
 public class MoreBetterBurden extends TscBaseDomain {
 	// 다다익선 업체 분담율
-	private Integer tmtbBurdenSq;		// 업체분담율Sq
+	private Integer tbTmtbBurdenSq;		// 업체분담율Sq
+	private Integer tmtbBurdenSq;
 	private Integer tmtbSq;				// 프로모션Sq
 	private String tmtbSupplyCd;	// 업체코드
 	private String tmtbBurdenRate;	// 업체분담율

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

@@ -272,7 +272,7 @@
 	</update>
 	
 	<!-- 배송비정책 목록 -->
-	<select id="getDeliveryFeePolicyList" parameterType="String" resultType="DelvFeePolicy">
+	<select id="getDeliveryFeePolicyList" parameterType="DelvFeePolicy" resultType="DelvFeePolicy">
 		/* TsaBusiness.getDeliveryFeePolicyList */
 		SELECT DELV_FEE_CD    /*배송비정책코드*/
 		     , SUPPLY_COMP_CD /*공급업체코드*/
@@ -477,14 +477,9 @@
 		     , A.DISP_NM_LANG                /*노출명언어*/
 		     , A.RGB_CD                      /*RGB코드*/
 		     , A.DISTRIBUTION_GB             /*유통구분*/
-		     -- , A.SUPPLY_COMP_CD              /*업체코드*/
 		     , B.SUPPLY_COMP_NM              /*업체명*/
-		     -- , A.DELV_LOC_CD                 /*출고처코드*/
-		     , C.DELV_LOC_NM                 /*출고처명*/
 		     , A.ERP_BRAND_CD                /*ERP브랜드코드*/
 		     , A.SELF_YN                     /*자사여부*/
-		     -- , A.DELV_FEE_CD                 /*배송비정책코드*/
-		     , A.SELL_FEE_RATE               /*판매수수료율*/
 		     , A.USE_YN                      /*사용여부*/
 		     , A.PNT_PRATE10                 /*포인트적립율(PC)*/
 		     , A.PNT_MRATE10                 /*포인트적립율(모바일)*/
@@ -492,13 +487,8 @@
 		     , A.PNT_MRATE20                 /*포인트적립율(모바일)*/
 		     , A.LOGO_FILE_NM                 /*로고파일명*/
 		     , A.DISP_ORD                    /*표시순서*/
-		    -- , D.MIN_ORD_AMT                 /*무료배송최소금액*/
-		    -- , D.DELV_FEE                    /*배송비*/
 		FROM   TB_BRAND A
 		INNER JOIN TB_SUPPLY_COMPANY B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
-		LEFT OUTER JOIN TB_DELIVERY_LOC C ON A.DELV_LOC_CD = C.DELV_LOC_CD
-		-- LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON A.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
-		--                                  AND A.DELV_FEE_CD =  D.DELV_FEE_CD
 		WHERE  1 = 1
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 		AND    A.SUPPLY_COMP_CD = #{supplyCompCd}
@@ -660,7 +650,6 @@
 		     , DISTRIBUTION_GB
 		     , SELF_YN
 		     , ERP_BRAND_CD
-		     , SELL_FEE_RATE
 		     , PNT_PRATE10
 		     , PNT_MRATE10
 		     , PNT_PRATE20
@@ -689,7 +678,6 @@
 		            ELSE 'N'
 		       END
 		     , #{erpBrandCd}
-		     , IFNULL(#{sellFeeRate},0)
 		     , IFNULL(#{pntPrate10},0)
 		     , IFNULL(#{pntMrate10},0)
 		     , IFNULL(#{pntPrate20},0)
@@ -724,7 +712,6 @@
 		                      ELSE 'N'
 		                 END
 		     , ERP_BRAND_CD = #{erpBrandCd}
-		     , SELL_FEE_RATE = IFNULL(#{sellFeeRate},0)
 		     , PNT_PRATE10 = IFNULL(#{pntPrate10},0)
 		     , PNT_MRATE10 = IFNULL(#{pntMrate10},0)
 		     , PNT_PRATE20 = IFNULL(#{pntPrate20},0)

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

@@ -208,9 +208,6 @@
 		    <if test="birthYmd != null and birthYmd != ''">
 		     BIRTH_YMD = REPLACE(#{birthYmd}, '-', ''),
 		    </if>
-		    <if test="cellPhnno != null and cellPhnno != ''">
-		     CELL_PHNNO = #{cellPhnno},
-		    </if>
 		    <if test="email != null and email != ''">
 		     EMAIL = #{email},
 		    </if>
@@ -234,6 +231,16 @@
 		WHERE CUST_NO = #{custNo}
 	</update>
 
+	<!-- 회원 휴대전화번호 수정 -->
+	<update id="updateCustomerCellPhnno" parameterType="Customer">
+		/* TsaCustomer.updateCustomerCellPhnno */
+		UPDATE TB_CUSTOMER
+		SET    CELL_PHNNO = #{cellPhnno}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
+		WHERE  CUST_NO = #{custNo}
+	</update>
+
 	<!-- 회원 주문내역 -->
 	<select id="getCustomerOrderList" parameterType="Integer" resultType="Order">
 		/* TsaCustomer.getCustomerOrderList */
@@ -317,7 +324,8 @@
 	<update id="saveCustomerDeliveryAddr" parameterType="Delivery">
 		/* TsaCustomer.saveCustomerDeliveryAddr */
 		INSERT INTO TB_CUST_DELIVERY_ADDR (
-		       CUST_NO
+		       CUST_DELV_ADDR_SQ
+		     , CUST_NO
 		     , DELV_ADDR_NM
 		     , DEFAULT_YN
 		     , RECIP_NM
@@ -334,7 +342,8 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       #{custNo}
+		       #{custDelvAddrSq}
+		     , #{custNo}
 		     , #{delvAddrNm}
 		     , IFNULL(#{defaultYn}, 'N')
 		     , #{recipNm}
@@ -426,13 +435,67 @@
 		ORDER BY E.ORD_NO DESC, CC.REG_DT DESC
 	</select>
 
+	<select id="getCustomerPoint" parameterType="Integer" resultType="Point">
+		/* TsaCustomer.getCustomerPoint */
+		SELECT IFNULL((
+		               SELECT SUM(RM_PNT_AMT)
+		               FROM  TB_CUST_POINT
+		               WHERE CUST_NO = C.CUST_NO
+		               AND   EXP_CMP_DT IS NULL
+		               ), 0)                           AS RM_PNT_AMT -- 가용포인트
+		     , IFNULL((
+		                SELECT SUM(GV_PNT_AMT)
+		                FROM   TB_CUST_POINT
+		                WHERE  CUST_NO = C.CUST_NO
+		               ), 0)                           AS GV_PNT_AMT -- 누적포인트
+		     , IFNULL((
+		                SELECT SUM(US_PNT_AMT)
+		                FROM  TB_CUST_POINT
+		                WHERE CUST_NO = C.CUST_NO
+		               ), 0)                           AS US_PNT_AMT -- 사용포인트
+		     , IFNULL((
+		                SELECT SUM(RM_PNT_AMT)
+		                FROM  TB_CUST_POINT
+		                WHERE CUST_NO = C.CUST_NO
+		                AND   EXP_CMP_DT IS NOT NULL
+		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
+		     , IFNULL((
+		               SELECT SUM(A.PNT_AMT + B.PNT_AMT) AS PNT_AMT
+		               FROM (
+		                     SELECT SUM(PNT_AMT) AS PNT_AMT
+		                          , ORD_NO
+		                     FROM   TB_CUST_POINT_HST
+		                     WHERE  OCCUR_GB = 'G069_12' -- 적립예정
+		                     AND    CUST_NO = #{custNo}
+		                     GROUP BY ORD_NO
+		                    ) A
+		                 , (
+		                    SELECT SUM(PNT_AMT) AS PNT_AMT
+		                         , ORD_NO
+		                    FROM TB_CUST_POINT_HST
+		                    WHERE OCCUR_GB = 'G069_13' -- 적립예정취소
+		                    AND   CUST_NO = #{custNo}
+		                    GROUP BY ORD_NO
+		                    ) B
+		               WHERE A.ORD_NO = B.ORD_NO
+		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
+		     , IFNULL((
+		               SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
+		               FROM  TB_CUST_POINT
+		               WHERE EXP_BE_DT >= NOW()
+		               AND   EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
+		                ), 0)                          AS EXPECTED_EXPIRE_PNT_AMT -- 소멸예정포인트(30일)
+		FROM   TB_CUSTOMER C
+		WHERE  C.CUST_NO = #{custNo}
+	</select>
+
 
 	<!--회원 포인트내역  -->
 	<select id="getCustomerPointList" parameterType="Integer" resultType="Point">
 		/* TsaCustomer.getCustomerPointList */
 		SELECT CC.*
 		FROM (
-		      SELECT DATE_FORMAT(CASE WHEN CPH.PNT_UPLOAD_STAT = '30'
+		      SELECT DATE_FORMAT(CASE WHEN CPH.PNT_UPLOAD_STAT = 'G070_30'
 		                              THEN CPH.PNT_UPLOAD_DT
 		                          ELSE CPH.REG_DT END, '%Y-%m-%d' ) AS DT
 		           , CPH.PNT_HST_SQ
@@ -482,7 +545,7 @@
 	<select id="getCustomerReviewList" parameterType="Integer" resultType="Review">
 		/* TsaCustomer.getCustomerReviewList */
 		SELECT CASE WHEN REVIEW_GB = 'P'
-		            THEN '[포토]'||R.REVIEW_TITLE
+		            THEN '[포토/동영상]'||R.REVIEW_TITLE
 		            ELSE R.REVIEW_TITLE
 		       END                          AS REVIEW_TITLE
 		     , R.REVIEW_SQ
@@ -508,9 +571,9 @@
 		     , R.CONFIRM_YN
 		     , FN_GET_USER_NM(R.CONFIRM_UNO)             AS CONFIRM_UNM
 		     , DATE_FORMAT(R.CONFIRM_DT, '%Y%m%d%H%i%S') AS CONFIRM_DT
-		     , FN_GET_USER_NM(R.REG_NO) AS REG_NM
+		     , R.REG_NO
 		     , R.REG_DT
-		     , FN_GET_USER_NM(R.UPD_NO) AS UPD_NM
+		     , R.UPD_NO
 		     , R.UPD_DT
 		     , R.ADM_RPL
 		     , R.ADM_RPL_REG_NO

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

@@ -3804,7 +3804,7 @@
 		             , RANK() OVER(PARTITION BY GOODS_CD ORDER BY NI_ITEM_CD) AS RK /*정렬순서 중요함. 변경하지 마세요.*/
 		        FROM   TB_GOODS_NOTI_INFO
 		        WHERE  NI_CLSF_CD = #{niClsfCd}
-		        <if test="goodsCds != '' and goodsCds != ''">
+		        <if test="goodsCds != null and goodsCds != ''">
 		        AND    (
 		                <foreach collection="goodsCds" item="item" index="index" separator="or">
 		                UPPER(GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
@@ -3947,4 +3947,339 @@
 		                AND GOODS_CD = A.GOODS_CD
 		                )
 	</insert>
+	
+	<!-- 상품  등록 로그 생성 -->
+	<insert id="createGoodsRegLog" parameterType="GoodsMass">
+		/* TsaGoods.createGoodsRegLog */
+		INSERT INTO TB_GOODS_REG_LOG (
+		    PROC_GB
+		  , GOODS_CD
+		  , SUPPLY_COMP_CD
+		  , GOODS_NM
+		  , GOODS_TNM
+		  , GOODS_SNM1
+		  , ORIGIN_CD
+		  , MAKE_YMD
+		  , BRAND_CD
+		  , ITEMKIND_CD
+		  , STYLE_YEAR
+		  , SEASON_CD
+		  , SEX_GB
+		  , GOODS_NUM
+		  , LIST_PRICE
+		  , CURR_PRICE
+		  , COST_PRICE
+		  , SUPPLY_GOODS_CD
+		  , FORMAL_GB
+		  , SELL_FEE_RATE
+		  , GOODS_GB
+		  , TAX_GB
+		  , ADULT_YN
+		  , MIN_ORD_QTY
+		  , MAX_ORD_QTY
+		  , DAY_MAX_ORD_QTY
+		  , PNT_PRATE
+		  , PNT_MRATE
+		  , PRE_PPNT_USABLE_YN
+		  , PRE_MPNT_USABLE_YN
+		  , CHANGEABLE_YN
+		  , RETURNABLE_YN
+		  , GIFT_PACK_YN
+		  , NEW_CUST_ORD_YN
+		  , OPT_STR
+		  , GOODS_CONTENT
+		  , NI_CLSF_CD
+		  , NI_CONTENT1
+		  , NI_CONTENT2
+		  , NI_CONTENT3
+		  , NI_CONTENT4
+		  , NI_CONTENT5
+		  , NI_CONTENT6
+		  , NI_CONTENT7
+		  , NI_CONTENT8
+		  , NI_CONTENT9
+		  , NI_CONTENT10
+		  , NI_CONTENT11
+		  , NI_CONTENT12
+		  , NI_CONTENT13
+		  , NI_CONTENT14
+		  , NI_CONTENT15
+		  , NI_CONTENT16
+		  , NI_CONTENT17
+		  , NI_CONTENT18
+		  , NI_CONTENT19
+		  , NI_CONTENT20
+		  , NI_CONTENT21
+		  , NI_CONTENT22
+		  , NI_CONTENT23
+		  , NI_CONTENT24
+		  , NI_CONTENT25
+		  , NI_CONTENT26
+		  , NI_CONTENT27
+		  , NI_CONTENT28
+		  , REG_SUCC_YN
+		  , REG_FAIL_RSN
+		  , REG_NO
+		  , REG_DT
+		)
+		VALUES(
+		    #{procGb}
+		  , #{goodsCd}
+		  , #{supplyCompCd}
+		  , #{goodsNm}
+		  , #{goodsTnm}
+		  , #{goodsSnm1}
+		  , #{originCd}
+		  , #{makeYmd}
+		  , #{brandCd}
+		  , #{itemkindCd}
+		  , #{styleYear}
+		  , #{seasonCd}
+		  , #{sexGb}
+		  , #{goodsNum}
+		  , #{listPrice}
+		  , #{currPrice}
+		  , #{costPrice}
+		  , #{supplyGoodsCd}
+		  , #{formalGb}
+		  , #{sellFeeRate}
+		  , #{goodsGb}
+		  , #{taxGb}
+		  , #{adultYn}
+		  , #{minOrdQty}
+		  , #{maxOrdQty}
+		  , #{dayMaxOrdQty}
+		  , #{pntPrate}
+		  , #{pntMrate}
+		  , #{prePpntUsableYn}
+		  , #{preMpntUsableYn}
+		  , #{changeableYn}
+		  , #{returnableYn}
+		  , #{giftPackYn}
+		  , #{newCustOrdYn}
+		  , #{optStr}
+		  , #{goodsContent}
+		  , #{niClsfCd}
+		  , #{niContent1}
+		  , #{niContent2}
+		  , #{niContent3}
+		  , #{niContent4}
+		  , #{niContent5}
+		  , #{niContent6}
+		  , #{niContent7}
+		  , #{niContent8}
+		  , #{niContent9}
+		  , #{niContent10}
+		  , #{niContent11}
+		  , #{niContent12}
+		  , #{niContent13}
+		  , #{niContent14}
+		  , #{niContent15}
+		  , #{niContent16}
+		  , #{niContent17}
+		  , #{niContent18}
+		  , #{niContent19}
+		  , #{niContent20}
+		  , #{niContent21}
+		  , #{niContent22}
+		  , #{niContent23}
+		  , #{niContent24}
+		  , #{niContent25}
+		  , #{niContent26}
+		  , #{niContent27}
+		  , #{niContent28}
+		  , #{regSuccYn}
+		  , #{regFailRsn}
+		  , #{regNo}
+		  , NOW()
+		)
+	</insert>
+	
+	<!-- 상품 기본 정보 수정  - 대량엑셀 -->
+	<update id="updateGoodsMass" parameterType="Goods">
+		/* TsaGoods.updateGoodsMass */
+		UPDATE TB_GOODS
+		SET UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
+		<if test='goodsNm != null and goodsNm != "X"'>
+		  , GOODS_NM = #{goodsNm} 
+		</if>
+		<if test='goodsTnm != null and goodsTnm != "X"'>
+		  , GOODS_TNM = #{goodsTnm}
+		</if>
+		<if test='goodsSnm1 != null and goodsSnm1 != "X"'>
+		  , GOODS_SNM1 = #{goodsSnm1}
+		</if>
+		<if test='itemkindCd != null and itemkindCd != "X"'>
+		  , ITEMKIND_CD = #{itemkindCd}
+		</if>
+		<if test='seasonCd != null and seasonCd != "X"'>
+		  , SEASON_CD = #{seasonCd}
+		</if>
+		<if test='sexGb != null and sexGb != "X"'>
+		  , SEX_GB = #{sexGb}
+		</if>
+		<if test="currPrice != null and currPrice > 0">
+		  , CURR_PRICE = #{currPrice}
+		  , CURR_BPRICE = #{currBprice}
+		  , PRICE_UPD_DT = NOW()
+		  , DC_RATE = #{dcRate}
+		</if>
+		<if test="sellFeeRate != null and sellFeeRate > 0">
+		  , SELL_FEE_RATE = #{sellFeeRate}
+		</if>
+		<if test='goodsGb != null and goodsGb != "X"'>
+		  , GOODS_GB = #{goodsGb}
+		</if>
+		<if test='formalGb != null and formalGb != "X"'>
+		  , FORMAL_GB = #{formalGb}
+		  , PNT_PRATE = NVL(#{pntPrate}, PNT_PRATE)
+		  , PNT_MRATE = NVL(#{pntMrate}, PNT_MRATE)
+		</if>
+		<if test="minOrdQty != null and minOrdQty > 0">
+		  , MIN_ORD_QTY = #{minOrdQty}
+		</if>
+		<if test="maxOrdQty != null and maxOrdQty > 0">
+		  , MAX_ORD_QTY = #{maxOrdQty}
+		</if>
+		<if test="dayMaxOrdQty != null and dayMaxOrdQty > 0">
+		  , DAY_MAX_ORD_QTY = #{dayMaxOrdQty}
+		</if>
+		<if test='giftPackYn != null and giftPackYn != "X"'>
+		  , GIFT_PACK_YN = #{giftPackYn}
+		</if>
+		<if test='newCustOrdYn != null and newCustOrdYn != "X"'>
+		  , NEW_CUST_ORD_YN = #{newCustOrdYn}
+		</if>
+		<if test='returnableYn != null and returnableYn != "X"'>
+		  , RETURNABLE_YN = #{returnableYn}
+		</if>
+		<if test='changeableYn != null and changeableYn != "X"'>
+		  , CHANGEABLE_YN = #{changeableYn}
+		</if>
+		<if test='taxGb != null and taxGb != "X"'>
+		  , TAX_GB = #{taxGb}
+		</if>
+		<if test='ageGrpCd != null and ageGrpCd != "X"'>
+		  , AGE_GRP_CD = #{ageGrpCd}
+		</if>
+		<if test='adultYn != null and adultYn != "X"'>
+		  , ADULT_YN = #{adultYn}
+		</if>
+		<if test='pntPrate != null and pntPrate >= 0'>
+		  , PNT_PRATE = #{pntPrate}
+		</if>
+		<if test='prePpntUsableYn != null and prePpntUsableYn != "X"'>
+		  , PRE_PPNT_USABLE_YN = DECODE(#{prePpntUsableYn}, 'Y', 'Y', 'N', 'N', PRE_PPNT_USABLE_YN)
+		</if>
+		<if test='pntMrate != null and pntMrate >= 0'>
+		  , PNT_MRATE = #{pntMrate}
+		</if>
+		<if test='makeYmd != preMpntUsableYn and preMpntUsableYn != "X"'>
+		  , PRE_MPNT_USABLE_YN = DECODE(#{preMpntUsableYn}, 'Y', 'Y', 'N', 'N', PRE_MPNT_USABLE_YN)
+		</if>
+		WHERE GOODS_CD = #{goodsCd}
+	</update>
+	
+	<!-- 상품등록로그 목록 조회 -->
+	<select id="getGoodsRegLogList" parameterType="GoodsSearch" resultType="GoodsMass">
+		/* TsaGoods.getGoodsRegLogList */
+		SELECT A.GOODS_REG_SQ
+		     , A.PROC_GB
+		     , A.GOODS_CD
+		     , A.SUPPLY_COMP_CD
+		     , A.GOODS_NM
+		     , A.GOODS_TNM
+		     , A.GOODS_SNM1
+		     , A.ORIGIN_CD
+		     , A.MAKE_YMD
+		     , A.BRAND_CD
+		     , A.ITEMKIND_CD
+		     , A.STYLE_YEAR
+		     , A.SEASON_CD
+		     , A.SEX_GB
+		     , A.GOODS_NUM
+		     , A.LIST_PRICE
+		     , A.CURR_PRICE
+		     , A.COST_PRICE
+		     , A.SUPPLY_GOODS_CD
+		     , A.FORMAL_GB
+		     , A.GOODS_GB
+		     , A.TAX_GB
+		     , A.ADULT_YN
+		     , A.SELL_FEE_RATE
+		     , A.MIN_ORD_QTY
+		     , A.MAX_ORD_QTY
+		     , A.DAY_MAX_ORD_QTY
+		     , A.PNT_PRATE
+		     , A.PNT_MRATE
+		     , A.PRE_PPNT_USABLE_YN
+		     , A.PRE_MPNT_USABLE_YN
+		     , A.CHANGEABLE_YN
+		     , A.RETURNABLE_YN
+		     , A.GIFT_PACK_YN
+		     , A.NEW_CUST_ORD_YN
+		     , A.OPT_STR
+		     , A.GOODS_CONTENT
+		     , A.NI_CLSF_CD
+		     , A.NI_CONTENT1
+		     , A.NI_CONTENT2
+		     , A.NI_CONTENT3
+		     , A.NI_CONTENT4
+		     , A.NI_CONTENT5
+		     , A.NI_CONTENT6
+		     , A.NI_CONTENT7
+		     , A.NI_CONTENT8
+		     , A.NI_CONTENT9
+		     , A.NI_CONTENT10
+		     , A.NI_CONTENT11
+		     , A.NI_CONTENT12
+		     , A.NI_CONTENT13
+		     , A.NI_CONTENT14
+		     , A.NI_CONTENT15
+		     , A.NI_CONTENT16
+		     , A.NI_CONTENT17
+		     , A.NI_CONTENT18
+		     , A.NI_CONTENT19
+		     , A.NI_CONTENT20
+		     , A.NI_CONTENT21
+		     , A.NI_CONTENT22
+		     , A.NI_CONTENT23
+		     , A.NI_CONTENT24
+		     , A.NI_CONTENT25
+		     , A.NI_CONTENT26
+		     , A.NI_CONTENT27
+		     , A.NI_CONTENT28
+		     , A.REG_SUCC_YN
+		     , A.REG_FAIL_RSN
+		     , A.REG_NO
+		     , FN_GET_USER_NM(A.REG_NO) AS REG_NM 
+		     , DATE_FORMAT(A.REG_DT, '%Y%m%d%H%i%S') AS REG_DT
+		FROM TB_GOODS_REG_LOG A
+		-- LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
+		WHERE 1 = 1 
+		<if test='condition != null and condition != "" '>
+		AND (UPPER(A.GOODS_NUM) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     OR 
+		     UPPER(A.GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     OR 
+		     UPPER(A.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		    )
+		</if>
+		<if test='regSuccYn != null and regSuccYn != "" '>
+		AND A.REG_SUCC_YN  = #{regSuccYn}
+		</if>
+		<if test='regNo != null and regNo != "" '>
+		AND A.REG_No = #{regNo}
+		</if>
+		<if test="stDate != null and stDate != ''">
+		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		</if>
+		<if test="edDate != null and edDate != ''">
+		<![CDATA[
+		AND A.REG_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S') 
+		]]>
+		</if>
+		ORDER BY A.REG_DT DESC, A.GOODS_CD
+	</select>
 </mapper>

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

@@ -36,8 +36,8 @@
 		SELECT	   	   TT.TMTB_SQ
 					 , TT.TMTB_NM
 					 , TT.TMTB_STAT
-					 , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS TMTB_ST_DT
-					 , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS TMTB_ED_DT
+					 , TT.TMTB_ST_DT
+					 , TT.TMTB_ED_DT
 					 , TT.MULTI_YN
 					 , TT.DEL_YN
 					 , TT.REG_NO
@@ -48,6 +48,12 @@
 					 , TS.SECTION_VAL
 					 , TV.DC_WAY
 					 , TV.DC_VAL
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS EVENT_STDT
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%H') AS EVENT_STHH
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%i') AS EVENT_STMM
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS EVENT_EDDT
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%H') AS EVENT_EDHH
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%i') AS EVENT_EDMM
 		FROM 	TB_TMTB TT
 		INNER 	JOIN TB_TMTB_SECTION TS
 		ON 		TT.TMTB_SQ = TS.TMTB_SQ
@@ -185,7 +191,7 @@
 
 	<select id="getMorebetterBurdenList" parameterType="Integer" resultType="MoreBetterBurden">
 		/* TsaMarketing.getMorebetterBurdenList */
-		SELECT 		TB_TMTB_BURDEN_SQ AS TMTB_BURDEN_SQ
+		SELECT 		TB_TMTB_BURDEN_SQ
 				   , TMTB_SQ
 				   , TMTB_SUPPLY_CD
 				   , TMTB_BURDEN_RATE
@@ -199,47 +205,46 @@
 		  AND TMTB_SQ = #{tmtbSq}
 	</select>
 
-	<insert id="saveMorebetterMst" parameterType="MoreBetter" >
+	<insert id="saveMorebetterMst" parameterType="MoreBetter" keyProperty="tmtbSq">
 		/* TsaMarketing.saveMorebetterMst */
 		INSERT INTO TB_TMTB(
-					 TMTB_SQ
-					,TMTB_NM
-					,TMTB_STAT
-					,TMTB_ST_DT
-					,TMTB_ED_DT
-					,APPLY_GB
-					,MULTI_YN
-					,DEL_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
-			)
-			VALUES (
-			         #{tmtbSq}
-					,#{tmtbNm}
-				    ,#{tmtbStat}
-				    ,#{tmtbStdt}
-				    ,#{tmtbEddt}
-				    ,#{applyGb}
-				    ,#{multiYn}
-				    ,'N'
-				    ,#{regNo}
-				    ,NOW()
-				    ,#{updNo}
-				    ,NOW()
-				   )
-			ON DUPLICATE KEY UPDATE
-						 TMTB_NM = #{tmtbNm}
-						,TMTB_STAT = #{tmtbStat}
-						,TMTB_ST_DT = #{tmtbStdt}
-						,TMTB_ED_DT = #{tmtbEddt}
-						,MULTI_YN = #{multiYn}
-						,UPD_NO = #{updNo}
-						,UPD_DT = NOW()
+		        TMTB_SQ
+		        ,TMTB_NM
+				,TMTB_STAT
+				,TMTB_ST_DT
+				,TMTB_ED_DT
+				,APPLY_GB
+				,MULTI_YN
+				,DEL_YN
+				,REG_NO
+				,REG_DT
+				,UPD_NO
+				,UPD_DT
+		) VALUES (
+			#{tmtbSq}
+		    ,#{tmtbNm}
+			,#{tmtbStat}
+			,DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
+			,DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
+			,#{applyGb}
+			,#{multiYn}
+			,'N'
+			,#{regNo}
+			,NOW()
+			,#{updNo}
+			,NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+			TMTB_NM = #{tmtbNm}
+			,TMTB_STAT = #{tmtbStat}
+			,TMTB_ST_DT = #{tmtbStdt}
+			,TMTB_ED_DT = #{tmtbEddt}
+			,MULTI_YN = #{multiYn}
+			,UPD_NO = #{updNo}
+			,UPD_DT = NOW()
 	</insert>
 
-	<insert id="saveMorebetterGoods" parameterType="MoreBetterGoods" >
+	<insert id="saveMorebetterGoods" parameterType="MoreBetterGoods" keyProperty="tmtbGoodsSq">
 		/* TsaMarketing.saveMorebetterGoods */
 		INSERT INTO TB_TMTB_GOODS(
 		         	 TMTB_GOODS_SQ
@@ -273,7 +278,7 @@
 						,UPD_DT = NOW()
 	</insert>
 
-	<insert id="saveMorebetterApplyGoods" parameterType="MoreBetterGoods" >
+	<insert id="saveMorebetterApplyGoods" parameterType="MoreBetterGoods" keyProperty="tmtbApplyGoodsSq">
 		/* TsaMarketing.saveMorebetterApplyGoods */
 		INSERT INTO TB_TMTB_APPLY_GOODS(
 					TMTB_APPLY_GOODS_SQ
@@ -304,7 +309,7 @@
 								 ,UPD_DT = NOW()
 	</insert>
 
-	<insert id="saveMorebetterSection" parameterType="MoreBetterSection" >
+	<insert id="saveMorebetterSection" parameterType="MoreBetterSection" keyProperty="tmtbSectionSq">
 		/* TsaMarketing.saveMorebetterSection */
 		INSERT INTO TB_TMTB_SECTION(
 					 TMTB_SECTION_SQ
@@ -335,7 +340,7 @@
 						,UPD_DT = NOW()
 	</insert>
 
-	<insert id="saveMorebetterVal" parameterType="MoreBetterSection" >
+	<insert id="saveMorebetterVal" parameterType="MoreBetterSection" keyProperty="tmtbValSq">
 		/* TsaMarketing.saveMorebetterVal */
 		INSERT INTO TB_TMTB_VAL(
 					 TMTB_VAL_SQ
@@ -368,36 +373,35 @@
 						,UPD_DT = NOW()
 	</insert>
 
-	<insert id="saveMorebetterBurden" parameterType="MoreBetterBurden" >
+	<insert id="saveMorebetterBurden" parameterType="MoreBetterBurden" keyProperty="tbTmtbBurdenSq">
 		/* TsaMarketing.saveMorebetterBurden */
 		INSERT INTO TB_TMTB_BURDEN(
-					 TB_TMTB_BURDEN_SQ
-					,TMTB_SQ
-					,TMTB_SUPPLY_CD
-					,TMTB_BURDEN_RATE
-					,USE_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
-			)
-			VALUES (
-			         #{tmtbBurdenSq}
-			        ,#{tmtbSq}
-			        ,#{tmtbSupplyCd}
-			        ,#{tmtbBurdenRate}
-			        ,#{useYn}
-				    ,#{regNo}
-				    ,NOW()
-				    ,#{updNo}
-				    ,NOW()
-				   )
-		ON DUPLICATE KEY UPDATE
-					 TMTB_SUPPLY_CD = #{tmtbSupplyCd}
-					,TMTB_BURDEN_RATE = #{tmtbBurdenRate}
-					,USE_YN = #{useYn}
-					,UPD_NO = #{updNo}
-					,UPD_DT = NOW()
+								  TB_TMTB_BURDEN_SQ
+		                          ,TMTB_SQ
+								  ,TMTB_SUPPLY_CD
+								  ,TMTB_BURDEN_RATE
+								  ,USE_YN
+								  ,REG_NO
+								  ,REG_DT
+								  ,UPD_NO
+								  ,UPD_DT
+		) VALUES (
+			    #{tbTmtbBurdenSq}
+		       ,#{tmtbSq}
+			   ,#{tmtbSupplyCd}
+			   ,#{tmtbBurdenRate}
+			   ,#{useYn}
+			   ,#{regNo}
+			   ,NOW()
+			   ,#{updNo}
+			   ,NOW()
+			   )
+			ON DUPLICATE KEY UPDATE
+								 TMTB_SUPPLY_CD = #{tmtbSupplyCd}
+								 ,TMTB_BURDEN_RATE = #{tmtbBurdenRate}
+								 ,USE_YN = #{useYn}
+								 ,UPD_NO = #{updNo}
+								 ,UPD_DT = NOW()
 	</insert>
 
 	<delete id="deleteTmtbSupplyCompanyList" parameterType="MoreBetterGoods">
@@ -539,7 +543,7 @@
 							</foreach>
 						</if>
 						<if test="multiGoods != null and multiGoods != ''">
-							AND G.GOODS_CD IN
+							OR G.GOODS_CD IN
 							<foreach collection="multiGoods" item="item" index="index"  open="(" close=")" separator=",">
 								#{item}
 							</foreach>

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

@@ -613,7 +613,7 @@
 		     , Z.RECIP_NM
 		     , Z.RECIP_PHNNO
 		     , Z.RECIP_TELNO
-		     , Z.RECIP_ZIP_NO
+		     , Z.RECIP_ZIPCODE
 		     , Z.RECIP_BASE_ADDR
 		     , Z.RECIP_DTL_ADDR
 		     , Z.ORD_EMAIL
@@ -632,7 +632,7 @@
 			     , DA.RECIP_NM 
 			     , DA.RECIP_PHNNO 
 			     , DA.RECIP_TELNO 
-			     , DA.RECIP_ZIP_NO 
+			     , DA.RECIP_ZIPCODE 
 			     , DA.RECIP_BASE_ADDR
 			     , DA.RECIP_DTL_ADDR
 			     , O.ORD_EMAIL
@@ -720,7 +720,7 @@
 		     , OC.CHG_MEMO
 		     , OC.CHGER_NM
 		     , OC.CHGER_PHNNO 
-		     , OC.CHGER_ZIP_NO
+		     , OC.CHGER_ZIPCODE
 		     , OC.CHGER_BASE_ADDR
 		     , OC.CHGER_DTL_ADDR
 		     , OC.WD_INVOICE_SEND_YN
@@ -730,10 +730,22 @@
 		ON     OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ 
 		INNER  JOIN TB_ORDER_DETAIL OD
 		ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO 
-		INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
-		ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
+		INNER  JOIN (
+			SELECT X.ORD_DTL_ITEM_SQ
+			     , X.ORD_DTL_NO
+			     , X.ITEM_CD
+			     , X.OPT_CD
+			     , X.OPT_CD1
+			     , X.OPT_CD2
+			FROM   TB_ORDER_DETAIL_ITEM X
+			WHERE  X.ORD_NO = #{ordNo}
+			LIMIT  1
+		) ODI 
 		WHERE  1=1
 		AND    OD.ORD_NO = #{ordNo}
+		<if test='ordChgSq != null and ordChgSq != ""'>
+		AND    OCD.ORD_CHG_SQ = #{ordChgSq}	
+		</if>
 		AND    OCD.DEL_YN = 'N'
 		ORDER  BY OC.ORD_CHG_SQ
 		     , OCD.ORD_DTL_NO 
@@ -831,7 +843,7 @@
 		     , O.ORD_PHNNO 
 		     , DA.RECIP_NM 
 		     , DA.RECIP_PHNNO 
-		     , DA.RECIP_ZIP_NO 
+		     , DA.RECIP_ZIPCODE 
 		     , DA.RECIP_BASE_ADDR 
 		     , DA.RECIP_DTL_ADDR 
 		     , G2.SUPPLY_GOODS_CD
@@ -1115,7 +1127,7 @@
 		     , O.ORD_PHNNO 
 		     , DA.RECIP_NM 
 		     , DA.RECIP_PHNNO 
-		     , DA.RECIP_ZIP_NO 
+		     , DA.RECIP_ZIPCODE 
 		     , DA.RECIP_BASE_ADDR 
 		     , DA.RECIP_DTL_ADDR 
 		     , G2.SUPPLY_GOODS_CD
@@ -1545,7 +1557,7 @@
 		SET    RECIP_NM        	= #{recipNm}
 		     , RECIP_PHNNO     	= #{recipPhnno}
 		     , RECIP_TELNO     	= #{recipTelno}
-		     , RECIP_ZIP_NO    	= #{recipZipNo}
+		     , RECIP_ZIPCODE    = #{recipZipcode}
 		     , RECIP_BASE_ADDR 	= #{recipBaseAddr}
 		     , RECIP_DTL_ADDR  	= #{recipDtlAddr}
 		     , DELV_MEMO       	= #{delvMemo}
@@ -1558,7 +1570,7 @@
 	<update id="updateOrderChange" parameterType="Order">
 		/* order.updateOrderChange : 반품/교환 > 회수지 정보 수정 */
 		UPDATE TB_ORDER_CHANGE
-		SET    CHGER_ZIP_NO    	= #{chgerZipNo}
+		SET    CHGER_ZIPCODE    = #{chgerZipCode}
 		     , CHGER_BASE_ADDR 	= #{chgerBaseAddr}
 		     , CHGER_DTL_ADDR  	= #{chgerDtlAddr}
 		     , UPD_NO          	= #{updNo}

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

@@ -152,7 +152,7 @@
 			, CHGER_PHNNO
 			, CHGER_TELNO
 			, CHGER_EMAIL
-			, CHGER_ZIP_NO
+			, CHGER_ZIPCODE
 			, CHGER_BASE_ADDR
 			, CHGER_DTL_ADDR
 			, CHGER_RTN_MEMO

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

@@ -0,0 +1,80 @@
+<?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.TsaReviewDao">
+
+	<!--상품평 목록  -->
+	<select id="getReviewList" parameterType="Review" resultType="Review">
+		/* TsaReview.getReviewList */
+		SELECT R.REVIEW_SQ                                                /*상품평일련번호*/
+		     , R.GOODS_CD                                                 /*상품코드*/
+		     , G.GOODS_NM                                                 /*상품명*/
+		     , (SELECT SYS_IMG_NM
+		        FROM   TB_GOODS_IMG
+		        WHERE  GOODS_CD = G.GOODS_CD
+		        AND    COLOR_CD = G.MAIN_COLOR_CD
+		        AND    DEFAULT_IMG_YN = 'Y' /*디폴트이미지*/
+		        LIMIT 1
+		       )                                        AS GOODS_IMG      /*상품이미지*/
+		     , R.REVIEW_GB                                                /*상품평구분*/
+		     , R.CUST_NO                                                  /*고객번호*/
+		     , C.CUST_NM                                                  /*고객명*/
+		     , R.ORD_NO                                                   /*주문번호*/
+		     , R.ORD_DTL_NO                                               /*주문상세번호*/
+		     , R.REVIEW_TITLE                                             /*상품평제목*/
+		     , R.REVIEW_CONTENT                                           /*상품평내용*/
+		     , R.SCORE                                                    /*구매평점*/
+		     , R.HEIGHT                                                   /*키*/
+		     , R.WEIGHT                                                   /*몸무게*/
+		     , R.SCORE_SIZE                                               /*사이즈점수*/
+		     , R.SCORE_COLOR                                              /*컬러점수*/
+		     , R.SCORE_FIT                                                /*핏점수*/
+		     , R.SCORE_THICK                                              /*두께감점수*/
+		     , R.SCORE_WEIGHT                                             /*무게감점수*/
+		     , R.SCORE_BALL                                               /*볼넓이점수*/
+		     , R.GIVE_DUE_PNT                                             /*지급예정포인트*/
+		     , R.PNT_GIVE_STAT                                            /*포인트지급상태*/
+		     , R.DISP_YN                                                  /*표시여부*/
+		     , R.DEL_YN                                                   /*삭제여부*/
+		     , R.CONFIRM_YN                                               /*확인여부*/
+		     , FN_GET_USER_NM(R.CONFIRM_UNO)            AS CONFIRM_UNM    /*확인자명*/
+		     , DATE_FORMAT(R.CONFIRM_DT,'%Y%m%d%H%i%S') AS CONFIRM_DT     /*확인일시*/ 
+		     , R.ADM_RPL                                                  /*관리자댓글*/
+		     , FN_GET_USER_NM(R.ADM_RPL_REG_NO)         AS ADM_RPL_GRE_NM /*관리자댓글작성자명*/
+		     , DATE_FORMAT(R.ADM_RPL_DT,'%Y%m%d%H%i%S') AS ADM_RPL_DT     /*관리자댓글작성일시*/
+		FROM   TB_REVIEW R
+		     , TB_CUSTOMER C
+		     , TB_GOODS G
+		WHERE  R.CUST_NO = C.CUST_NO
+		AND    R.GOODS_CD = G.GOODS_CD
+		<if test="goodsCds != null and goodsCds != ''">
+		AND    (
+		        <foreach collection="goodsCds" item="item" index="index" separator="or">
+		        UPPER(R.GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
+		        </foreach>
+		       )
+		</if>
+		<if test="startDt != null and startDt != ''">
+		AND    R.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{startDt},'%Y-%m-%d')
+		</if>
+		<if test="endDt != null and endDt != ''">
+		AND    R.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'),INTERVAL 1 DAY)
+		</if>
+		<if test="reviewGb != null and reviewGb != ''">
+		AND    R.REVIEW_GB = #{reviewGb}
+		</if>
+		<if test="pntGiveStat != null and pntGiveStat != ''">
+		AND    R.PNT_GIVE_STAT = #{pntGiveStat}
+		</if>
+		<if test="dispYn != null and dispYn != ''">
+		AND    R.DISP_YN = #{dispYn}
+		</if>
+		<if test="searchGb == 'memNm'">
+		AND    UPPER(C.CUST_NM) LIKE CONCAT('%',UPPER(#{searchTxt}),'%')
+		</if>
+		<if test="searchGb == 'email'">
+		AND    UPPER(C.EMAIL) LIKE CONCAT('%',UPPER(#{searchTxt}),'%')
+		</if>
+		ORDER  BY R.REG_DT DESC
+	</select>
+	
+</mapper>

src/main/webapp/WEB-INF/views/business/BrandForm.html

@@ -141,11 +141,12 @@
 							<input type="text" class="w100" name="supplyCompNm" readonly="readonly"/>
 							<input type="hidden" class="w100" name="supplyCompCd" />
 						</td>
-					-->	
+					
 						<th>판매수수료율<i class="required" title="필수"></i></th>
 						<td>
 							<input type="text" class="w100 aR" name="sellFeeRate" value="0" maxlength="3" required="required" data-valid-name="판매수수료율" data-valid-type="real"/>%
 						</td>
+					-->		
 						<th>유통구분<i class="required" title="필수"></i></th>
 						<td>
 							<select name="distributionGb" required="required" data-valid-name="유통구분">
@@ -153,6 +154,12 @@
 								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
+						<th>사용여부<i class="required" title="필수"></i></th>
+						<td>
+							<label class="rdoBtn"><input type="radio" name="useYn" value="Y" checked="checked">Yes</label>
+							<label class="rdoBtn"><input type="radio" name="useYn" value="N">No</label>
+							<span class="marL10 cRed"><i class="fa fa-info-circle" aria-hidden="true"></i> No에 체크하면 "프론트"에 노출되지 않습니다.</span>
+						</td>
 					</tr>
 					<!--  <tr>	
 						<th>출고처<i class="required" title="필수"></i></th>
@@ -194,14 +201,6 @@
 						<td class="infoTxt">
 							<input type="text" class="w100 aR" name="dispOrd" maxlength="5" required="required" data-valid-name="노출순서" data-valid-type="numeric"/>
 						</td>
-						<th>사용여부<i class="required" title="필수"></i></th>
-						<td>
-							<label class="rdoBtn"><input type="radio" name="useYn" value="Y" checked="checked">Yes</label>
-							<label class="rdoBtn"><input type="radio" name="useYn" value="N">No</label>
-							<span class="marL10 cRed"><i class="fa fa-info-circle" aria-hidden="true"></i> No에 체크하면 "프론트"에 노출되지 않습니다.</span>
-						</td>
-					</tr>
-					<tr>
 						<th>RGB코드</th>
 						<td  colspan="3">
 							<input type="text" class="w100 aR" name="rgbCd" maxlength="6" data-valid-name="REG코드" />
@@ -307,8 +306,8 @@
 				{headerName: "기본배송비", field: "delvFee", width: 120, cellClass: 'text-center', valueFormatter: function(params) { return Number(params.value).addComma(); }},
 				{headerName: "최소주문금액", field: "minOrdAmt", width: 120, cellClass: 'text-center', valueFormatter: function(params) { return Number(params.value).addComma(); }}
 			]
-		},*/
-		{headerName: "판매수수료율(%)", field: "sellFeeRate", width: 150, cellClass: 'text-center'},
+		},
+		{headerName: "판매수수료율(%)", field: "sellFeeRate", width: 150, cellClass: 'text-center'}, */
 		{
 			headerName: "포인트적립율(%)",
 			children : [
@@ -373,7 +372,7 @@
 		
 		//$("#detailForm input[name=delvFee]").val(Number(event.data.delvFee).addComma());
 		//$("#detailForm input[name=minOrdAmt]").val(Number(event.data.minOrdAmt).addComma());
-		$("#detailForm input[name=sellFeeRate]").val(event.data.sellFeeRate);
+		//$("#detailForm input[name=sellFeeRate]").val(event.data.sellFeeRate);
 		$("#detailForm input[name=pntPrate10]").val(event.data.pntPrate10);
 		$("#detailForm input[name=pntMrate10]").val(event.data.pntMrate10);
 		$("#detailForm input[name=pntPrate20]").val(event.data.pntPrate20);
@@ -742,6 +741,12 @@
 		// 로고이미지 영역은 수정 시 노출
 		$("#brandImgArea").removeClass("on").addClass("off");
 		
+		// 그리드 삭제
+		var allData = gagaAgGrid.getAllRowData(gridOptions2);
+		allData.forEach(function(item, index) {
+			gridOptions2.api.updateRowData({remove: [item]});
+		});
+		
 	});
 	
 	//이미지 클릭시 미리보기

src/main/webapp/WEB-INF/views/customer/CellphoneChangePopupForm.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : CellphoneChangePopupForm.html
+ * @desc    : 휴대폰번호변경팝업 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.01.25   jsshin     최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="800">
+	<div class="panelStyle">
+		<!-- TITLE -->
+		<div class="panelTitle">
+			<strong >휴대전화번호변경팝업</strong>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCellphoneForm')"><em class="fa fa-times"></em></button>
+		</div>
+		<!-- //TITLE -->
+		<!-- CONTENT -->
+		<div class="panelContent">
+			<div class="panelStyle">
+				<form id="cellPhoneForm" name="cellPhoneForm">
+					<input type="hidden" id="custNo" name="custNo">
+					<table class="frmStyle">
+						<colgroup>
+							<col style="width:1%"/>
+							<col style="width:40%"/>
+						</colgroup>
+						<tbody>
+						<tr>
+							<span class="infoTxt cBlue"><i class="fa fa-info-circle"></i>인증번호 확인 후 번호변경가능 </span>
+							<span class="infoTxt cBlue"><i class="fa fa-info-circle"></i>변경 할 휴대폰번호 입력 후 전송</span> <br/>
+							<span class="infoTxt cBlue"><i class="fa fa-info-circle"></i>인증번호는 6자리 입니다.</span><br/>
+							<th>기존휴대전화번호<em class="star"></em></th>
+							<td>
+								<input type="text" class="w150" name="orgCellPhone" maxlength="13" readonly="readonly"/>
+							</td>
+							<th>변경할휴대전화번호<em class="star"></em></th>
+							<td>
+								<input type="text" class="w150" name="cellPhnno" required="required" maxlength="13" data-valid-name="휴대전화번호" />
+							</td>
+						</tr>
+						<tr id="trCertNo" style="display: none">
+							<th>인증번호</th>
+							<td>
+								<input type="text" class="w200" name="certNo" placeholder="인증번호 입력" style="display:none;">
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</form>
+			</div>
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" id="btnSendCustCrtfdNo" class="btn btn-success btn-lg" >인증번호발송</button>
+					<button type="button" id="btnCustCertNo" class="btn btn-success btn-lg" style="display: none">인증번호확인</button>
+				</li>
+			</ul>
+		</div>
+		<!-- //CONTENT -->
+	</div>
+</div>
+<script th:inline="javascript">
+	/*<![CDATA[*/
+	const elementCellPhnno = [[${elementCellPhnno}]];
+	const elementCustNo = [[${elementCustNo}]];
+
+
+	// 인증번호 전송
+	$('#btnSendCustCrtfdNo').on('click', function () {
+		//휴대폰번호
+		if (!gagajf.validation('#cellPhoneForm'))
+			return false;
+
+		mcxDialog.confirm("인증번호를 전송 하시겠습니까?", {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function () {
+				let jsonData = JSON.stringify($('#cellPhoneForm').serializeObject());
+				gagajf.ajaxJsonSubmit('/customer/certno/send', jsonData, function () {
+					$('#cellPhoneForm input[name=certNo]').val('');
+					$('#cellPhoneForm input[name=certNo]').show();
+					$('#trCertNo').show();
+					$('#btnCustCertNo').show();
+				});
+			}
+		});
+	});
+
+	// 인증확인버튼
+	$('#btnCustCertNo').on('click', function () {
+		let jsonData = JSON.stringify($('#cellPhoneForm').serializeObject());
+		gagajf.ajaxJsonSubmit('/customer/certno/confirm', jsonData, fnCertificationResult);
+	});
+
+	// 인증확인 콜백
+	var fnCertificationResult = function (data) {
+		if (data.crtfdNoYn === 'Y') {
+			mcxDialog.confirm("휴대전화 번호가 정상적으로 변경 되었습니다.", {
+				cancelBtnText: "취소",
+				sureBtnText: "확인",
+				sureBtnClick: function () {
+					uifnPopupClose('popupCellphoneForm');
+					fnSearchCustInfo();
+				}
+			});
+		} else {
+			mcxDialog.alert("인증번호가 일치하지 않습니다.\n확인 후 다시 입력해 주세요.");
+		}
+	};
+
+	// 데이터 셋팅
+	var fnInitDataSet = function () {
+		$('#cellPhoneForm input[name=orgCellPhone]').val($(elementCellPhnno).val());
+		$('#cellPhoneForm input[name=custNo]').val($(elementCustNo).val());
+	}
+
+	// 휴대폰 자동 하이픈
+	$('#cellPhoneForm input[name=cellPhnno]').on('input keyup keydown paste change', function () {
+		cfnCellPhonnHypen(this);
+	});
+
+	$(document).ready(function() {
+		fnInitDataSet();
+	});
+
+	/*]]>*/
+</script>
+</html>

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -242,6 +242,7 @@
 						<!-- TAB3 PANELSTYLE -->
 						<div class="panelStyle">
 							<form id="custAddrForm" name="custAddrForm" action="#" method="post">
+								<input type="hidden" name="custDelvAddrSq"/>
 								<input type="hidden" name="custNo" th:value="${custNo}"/>
 								<h4>배송지정보</h4>
 								<div id="custAddrList" class="ag-theme-balham" style="width: 100%; height: 300px;" ></div>
@@ -334,9 +335,6 @@
 							<h4>쿠폰 내역</h4>
 							<div id="custCouponList" class="ag-theme-balham" style="width: 100%; height: 510px;" ></div>
 							<ul class="panelBar">
-								<li class="left">
-									<button type="button" id="btnCustCouponDelete" class="btn btn-danger btn-lg">쿠폰삭제</button>
-								</li>
 								<li class="right">
 									<button type="button" id="btnCustCouponCreate" class="btn btn-info btn-lg" >쿠폰발급</button>
 								</li>
@@ -350,20 +348,23 @@
 					<li id="tab5" class="tab">
 						<!-- TAB5 PANELSTYLE -->
 						<div class="panelStyle">
+							<form id="custPointForm" name="custPointForm" action="#" method="post">
 							<h4>포인트 내역</h4>
 							<table class="tableStyle">
 								<colgroup>
+									<col style="width:15%;"/>
+									<col style="width:15%;"/>
+									<col style="width:15%;"/>
 									<col style="width:20%;"/>
 									<col style="width:20%;"/>
-									<col style="width:20%;"/>
-									<col style="width:20%;"/>
-									<col style="width:20%;"/>
+									<col style="width:25%;"/>
 								</colgroup>
 								<tbody>
 								<tr>
 									<th>가용포인트</th>
-									<th>누적 포인트</th>
+									<th>누적포인트</th>
 									<th>사용포인트</th>
+									<th>소멸포인트</th>
 									<th>적립예정포인트</th>
 									<th>소멸예정포인트(30일)</th>
 								</tr>
@@ -371,6 +372,7 @@
 									<td name="availPntAmt">0 P</td>
 									<td name="accumPntAmt">0 P</td>
 									<td name="usePntAmt">0 P</td>
+									<td name="expirePntAmt">0 P</td>
 									<td name="expectedPntAmt">0 P</td>
 									<td name="expectedExpirePntAmt">0 P</td>
 								</tr>
@@ -383,6 +385,7 @@
 									<button type="button" id="btnCustPointCreate" class="btn btn-info btn-lg">포인트부여</button>
 								</li>
 							</ul>
+							</form>
 						</div>
 						<!-- //TAB5 PANELSTYLE -->
 					</li>
@@ -905,6 +908,18 @@
 		cfnOpenLmsPopup(param);
 	});
 
+	// 기본정보 -  번호변경
+	$('#btnCustCrtfd').on('click', function () {
+		if (!fnCheckValidationPhnno('#custInfoForm')) {
+			return false;
+		}
+		let elementCellPhnno = '#custInfoForm input[name=cellPhnno]';
+		let elementCustNo = '#custInfoForm input[name=custNo]';
+
+		const actionUrl = '/customer/cellphone/change/popup/form?elementCellPhnno=' + encodeURIComponent(elementCellPhnno)
+						+ '&elementCustNo=' + encodeURIComponent(elementCustNo)
+		cfnOpenModalPopup(actionUrl, 'popupCellphoneForm');
+	});
 
 	// 기본정보 - 이메일발송 버튼
 	$('#btnCustSendEmail').on('click', function () {
@@ -970,6 +985,7 @@
 		$('#custAddrForm input[name=custDelvAddrSq]').val('');
 		$('#custAddrForm input[name=recipPhnno]').val('');
 		$('#custAddrForm input[name=recipTelno]').val('');
+		fnDisplayDeliveryCheckBox('N', 'N');
 	});
 
 	// 배송지정보 - 저장버튼
@@ -1039,7 +1055,6 @@
 	});
 
 
-
 	// 회원접촉이력 저장
 	$('#btnSaveContact').on('click', function () {
 		if (!gagajf.validation('#custContactHstForm')) {
@@ -1119,12 +1134,7 @@
 			$('#custAddrForm input[name=recipBaseAddr]').val(event.data.recipBaseAddr);
 			$('#custAddrForm input[name=recipDtlAddr]').val(event.data.recipDtlAddr);
 
-			let defaultYn = event.data.defaultYn === 'Y' ? true : false;
-			let delYn = event.data.delYn === 'Y' ? true : false;
-
-			$('#custAddrForm input:checkbox[name=defaultYn]').prop('checked', defaultYn);
-			$('#custAddrForm input:checkbox[name=delYn]').prop('checked', delYn);
-
+			fnDisplayDeliveryCheckBox(event.data.defaultYn, event.data.delYn);
 		}
 	};
 
@@ -1176,16 +1186,11 @@
 		gagaAgGrid.fetch(actionUrl, gridOrderOptions);
 	};
 
-	//	1:1문의 내역 조회
-	var fnSearchCounsel = function () {
-		const actionUrl = "/customer/counsel/list/" + custNo;
-		gagaAgGrid.fetch(actionUrl, gridCounselOptions);
-	};
-
-	//	상품문의 내역 조회
-	var fnSearchGoodsQna = function () {
-		const actionUrl = "/customer/goodsQna/list/" + custNo;
-		gagaAgGrid.fetch(actionUrl, gridGoodsQnaOptions);
+	// 배송지 조회
+	var fnSearchDelivery = function () {
+		const actionUrl = "/customer/delivery/list/" + custNo;
+		gagaAgGrid.fetch(actionUrl, gridAddrOptions);
+		$('#btnCustAddrNew').trigger('click');
 	};
 
 	//	쿠폰내역 조회
@@ -1199,11 +1204,12 @@
 		$.get('/customer/point/' + custNo
 			, function (data) {
 				if (!gagajf.isNull(data)) {
-					$('#custPoint td[name=availPntAmt]').text(data.availPntAmt.addComma() + ' P');
-					$('#custPoint td[name=accumPntAmt]').text(data.accumPntAmt.addComma() + ' P');
-					$('#custPoint td[name=usePntAmt]').text(data.usePntAmt.addComma() + ' P');
-					$('#custPoint td[name=expectedPntAmt]').text(data.expectedPntAmt.addComma() + ' P');
-					$('#custPoint td[name=expectedExpirePntAmt]').text(data.expirePntAmt.addComma() + ' P');
+					$('#custPointForm td[name=availPntAmt]').text(data.rmPntAmt.addComma() + ' P');
+					$('#custPointForm td[name=accumPntAmt]').text(data.gvPntAmt.addComma() + ' P');
+					$('#custPointForm td[name=usePntAmt]').text(data.usPntAmt.addComma() + ' P');
+					$('#custPointForm td[name=expirePntAmt]').text(data.expirePntAmt.addComma() + ' P');
+					$('#custPointForm td[name=expectedPntAmt]').text(data.expectedPntAmt.addComma() + ' P');
+					$('#custPointForm td[name=expectedExpirePntAmt]').text(data.expectedExpirePntAmt.addComma() + ' P');
 				}
 			});
 		const actionUrl = "/customer/point/list/" + custNo;
@@ -1222,29 +1228,31 @@
 		gagaAgGrid.fetch(actionUrl, gridReviewOptions);
 	};
 
-	// 회원등급변경이력 조회
-	var fnSearchChangeGrade = function () {
-		const actionUrl = "/customer/change/grade/list/" + custNo;
-		gagaAgGrid.fetch(actionUrl, gridGradeOptions);
+	//	1:1문의 내역 조회
+	var fnSearchCounsel = function () {
+		const actionUrl = "/customer/counsel/list/" + custNo;
+		gagaAgGrid.fetch(actionUrl, gridCounselOptions);
 	};
 
-	// 주소정보 조회
-	var fnSearchDelivery = function () {
-		const actionUrl = "/customer/delivery/list/" + custNo;
-		gagaAgGrid.fetch(actionUrl, gridAddrOptions);
-		$('#btnCustAddrNew').trigger('click');
+	//	상품문의 내역 조회
+	var fnSearchGoodsQna = function () {
+		const actionUrl = "/customer/goodsQna/list/" + custNo;
+		gagaAgGrid.fetch(actionUrl, gridGoodsQnaOptions);
 	};
 
 	// 회원접촉이력 조회
 	var fnSearchContact = function () {
-		$('#custContactHstForm select[name=contactType]').val('');
-		$('#custContactHstForm select[name=contactMethod]').val('');
-		$('#custContactHstForm textarea[name=contactContents]').val('');
-
+		$('#custContactHstForm')[0].reset();
 		const actionUrl = "/customer/contact/list/" + custNo;
 		gagaAgGrid.fetch(actionUrl, gridContactOptions);
 	};
 
+	// 회원등급변경이력 조회
+	var fnSearchChangeGrade = function () {
+		const actionUrl = "/customer/change/grade/list/" + custNo;
+		gagaAgGrid.fetch(actionUrl, gridGradeOptions);
+	};
+
 
 	/**
 	 * DAUM을 이용한 우편번호 팝업 레이어
@@ -1434,8 +1442,36 @@
 			yearRange: (currentYear - 100) + ' : ' + (currentYear - 14),
 			defaultDate: $birthYmd.val()
 		});
+	};
+
+	// 배송지 기본,삭제 체크박스 설정
+	var fnDisplayDeliveryCheckBox = function (defaultYn, delYn) {
+		let $defaultYn = $('#custAddrForm input:checkbox[name=defaultYn]');
+		let $delYn = $('#custAddrForm input:checkbox[name=delYn]');
+		let defaultBoolean;
+		let delBoolean;
+
+		if (defaultYn === 'Y') {
+			defaultBoolean = true;
+			$defaultYn.parent().addClass('checked');
+		} else {
+			defaultBoolean = false;
+			$defaultYn.parent().removeClass('checked');
+		}
+
+		if (delYn === 'Y') {
+			delBoolean = true;
+			$delYn.parent().addClass('checked');
+		} else {
+			delBoolean = false;
+			$delYn.parent().removeClass('checked');
+		}
+
+		$defaultYn.prop('checked', defaultBoolean);
+		$delYn.prop('checked', delBoolean);
 	}
 
+
 	$('#btnLogin').on('click', function () {
 		let custId = $('span[name=custId]').text();
 		const actionUrl = _frontUrl + '/customer/front/login?custId=' + custId;

src/main/webapp/WEB-INF/views/customer/EmailPopupForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.21   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" id="popupEmailForm" data-width="800">
+<div class="modalPopup" data-width="800">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -24,51 +24,43 @@
 		<!-- //TITLE -->
 		<!-- CONTENT -->
 		<div class="panelContent">
-			<div class="tabs">
-				<!-- TABS CONTENT -->
-				<ul class="tabsCont">
-					<li class="tab on" id="tab1">
-						<div class="panelStyle">
-							<form id="emailForm" name="emailForm">
-								<input type="hidden" name="sendEmail" th:value="${sendEmail}"/>
-								<input type="hidden" name="email"/>
-								<table class="frmStyle">
-									<colgroup>
-										<col style="width:1%"/>
-										<col style="width:40%"/>
-									</colgroup>
-									<tbody>
-									<tr >
-										<th>보내는사람</th>
-										<td>
-											<span name="sendEmail" th:text="${sendEmail}"></span>
-										</td>
-									</tr>
-									<tr>
-										<th>받는사람</th>
-										<td>
-											<span name="email"></span>
-										</td>
-									</tr>
-									<tr>
-										<th>제목<em class="star"></em></th>
-										<td>
-											<input type="text" class="w150" name="title" value="" required="required" data-valid-name="제목"/>
-										</td>
-									</tr>
-									<tr>
-										<th>내용<em class="star"></em></th>
-										<td>
-											<textarea class="textareaR4" style="resize: none;" name ="content" ></textarea>
-										</td>
-									</tr>
-									</tbody>
-								</table>
-							</form>
-						</div>
-					</li>
-				</ul>
-				<!-- //TABS CONTENT -->
+			<div class="panelStyle">
+				<form id="emailForm" name="emailForm">
+					<input type="hidden" name="sendEmail" th:value="${sendEmail}"/>
+					<input type="hidden" name="email"/>
+					<table class="frmStyle">
+						<colgroup>
+							<col style="width:1%"/>
+							<col style="width:40%"/>
+						</colgroup>
+						<tbody>
+						<tr >
+							<th>보내는사람</th>
+							<td>
+								<span name="sendEmail" th:text="${sendEmail}"></span>
+							</td>
+						</tr>
+						<tr>
+							<th>받는사람</th>
+							<td>
+								<span name="email"></span>
+							</td>
+						</tr>
+						<tr>
+							<th>제목<em class="star"></em></th>
+							<td>
+								<input type="text" class="w150" name="title" value="" required="required" data-valid-name="제목"/>
+							</td>
+						</tr>
+						<tr>
+							<th>내용<em class="star"></em></th>
+							<td>
+								<textarea class="textareaR4" style="resize: none;" name ="content" ></textarea>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</form>
 			</div>
 			<ul class="panelBar">
 				<li class="right">

src/main/webapp/WEB-INF/views/customer/LmsPopupForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.21   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modelessPopup draggable" data-width="634">
+<div class="modalPopup" data-width="800">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -24,52 +24,36 @@
 		<!-- //TITLE -->
 		<!-- CONTENT -->
 		<div class="panelContent">
-			<div class="tabs">
-				<div class="tabsNav">
-					<ul >
-						<li class="on"><a href="#tab1">LMS 발송</a></li>
-					</ul>
-				</div>
-				<!-- //TABS NAVI -->
-				<!-- TABS CONTENT -->
-				<ul class="tabsCont">
-					<!-- LMS 발송 -->
-					<li class="tab on" id="tab1">
-						<div class="panelStyle">
-							<form id="lmsForm" name="lmsForm">
-								<table class="frmStyle">
-									<colgroup>
-										<col style="width:1%"/>
-										<col style="width:40%"/>
-									</colgroup>
-									<tbody>
-									<tr >
-										<th>수신자번호 <em class="star"></em></th>
-										<td>
-											<input type="text" class="w150" name="cellPhnno" data-valid-name="수신번호"  required="required"  maxlength="13"/>
-										</td>
-									</tr>
-									<tr>
-										<th>발신자번호<em class="star"></em></th>
-										<td>
-											<input type="text" class="w150" name="callBack" th:value="${callBack}" maxlength="11" readonly="readonly"/>
-										</td>
-									<tr>
-										<th>메시지<em class="star"></em></th>
-										<td>
-											<textarea class="textareaR4"  style="resize: none;" name ="content" ></textarea>
-											<span name="count">0</span> / 2000 byte
-										</td>
-									</tr>
-									</tr>
-									</tbody>
-								</table>
-							</form>
-						</div>
-					</li>
-					<!-- //LMS발송 -->
-				</ul>
-				<!-- //TAB CONTENT -->
+			<div class="panelStyle">
+				<form id="lmsForm" name="lmsForm">
+					<table class="frmStyle">
+						<colgroup>
+							<col style="width:1%"/>
+							<col style="width:40%"/>
+						</colgroup>
+						<tbody>
+						<tr >
+							<th>수신자번호 <em class="star"></em></th>
+							<td>
+								<input type="text" class="w150" name="cellPhnno" data-valid-name="수신번호"  required="required"  maxlength="13"/>
+							</td>
+						</tr>
+						<tr>
+							<th>발신자번호<em class="star"></em></th>
+							<td>
+								<input type="text" class="w150" name="callBack" th:value="${callBack}" maxlength="11" readonly="readonly"/>
+							</td>
+						</tr>
+						<tr>
+							<th>메시지<em class="star"></em></th>
+							<td>
+								<textarea class="textareaR4"  style="resize: none;" name ="content" ></textarea>
+								<span name="count">0</span> / 2000 byte
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</form>
 			</div>
 			<ul class="panelBar">
 				<li class="right">

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

@@ -51,15 +51,19 @@
 						<col width="10%"/>
 						<col/>
 						<col width="10%"/>
-						<col width="20%"/>
-						<col width="10%"/>
 						<col width="24%"/>
+						<col width="10%"/>
+						<col width="20%"/>
 					</colgroup>
 					<tr>
 						<th>상품명<em class="required" title="필수"></em></th>
 						<td><input type="text" id="goodsNm" name="goodsNm" maxlength="60"/></td>
-						<th>판매가<em class="required" title="필수"></em></th>
-						<td><input type="text" class="w100" id="currPrice" name="currPrice" maxlength="8" data-valid-type="numeric"/></td>
+						<th>성별<em class="required" title="필수"></em></th>
+						<td><select  name="sexGb" id="sexGb">
+								<option value="">[전체]</option>
+								<option th:if="${sexGbList}" th:each="oneData, status : ${sexGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
 						<th>제조년월일<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w100" id="makeYmd" name="makeYmd" maxlength="8" data-valid-type="date"/></td>
 					</tr>
@@ -74,12 +78,6 @@
 								<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-						<th>성별<em class="required" title="필수"></em></th>
-						<td><select  name="sexGb" id="sexGb">
-								<option value="">[전체]</option>
-								<option th:if="${sexGbList}" th:each="oneData, status : ${sexGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
 						<th>원산지<em class="required" title="필수"></em></th>
 						<td ><select name="makeOriginCd" id="makeOriginCd">
 								<option value="">[전체]</option>
@@ -87,6 +85,7 @@
 							</select>
 							<input type="hidden" id="makeNm" name="makeNm" />
 						</td>
+						<td colspan="2"></td>
 					</tr>
 				</table>
 			</div>	
@@ -336,16 +335,6 @@
 			return false;
 		}
 		
-		if(gagajf.isNull($("#goodsDealForm input[name=currPrice]").val())){
-			mcxDialog.alertC('판매가를 입력해 주세요.', {
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					$("#goodsDealForm input[name=currPrice]").focus();
-				}
-			});	
-			return false;
-		}
-		
 		if(Number($("#goodsDealForm input[name=currPrice]").val()) <= 0){
 			mcxDialog.alertC('판매가를 바르게 입력해 주세요.', {
 				sureBtnText: "확인",

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

@@ -1080,14 +1080,12 @@
 		var idx = 0;
 		$('#goodsDetailForm').find('#notiArea').html('');
 		notiHtml += '<table class="frmStyle">';
-		notiHtml += '<colgroup><col style="width:20%"/><col/><col style="width:5%"/><col style="width:5%"/></colgroup>';
+		notiHtml += '<colgroup><col style="width:20%"/><col/></colgroup>';
 		notiHtml += '<tbody id="infoContents">\n';
-		notiHtml += '<tr><th>고시항목</th><th>고시내용</th><th>필수여부</th><th>전시여부</th></tr>';
+		notiHtml += '<tr><th>고시항목</th><th>고시내용</th></tr>';
 		result.forEach(function(info){
 			notiHtml += '<tr><th>'+ gagajf.convNull(info.niItemNm, '') +'<input type="hidden" name="niItemCd" value="'+ gagajf.convNull(info.niItemCd, '') +'" />\n<input type="hidden" name="dispOrd" value="'+ gagajf.convNull(info.dispOrd, '') +'" /></th>';
 			notiHtml += '<td><input type="text" name="niContent" value="'+ gagajf.convNull(info.niContent, '') +'"/></td>\n';
-			notiHtml += '<td class="aC">'+gagajf.convNull(info.reqYn, '')+'<input type="hidden" name="reqYn" value="'+ gagajf.convNull(info.reqYn, '') +'"/></td>\n';
-			notiHtml += '<td class="aC">'+gagajf.convNull(info.dispYn, '')+'<input type="hidden" name="dispYn" value="'+ gagajf.convNull(info.dispYn, '') +'"/></td>\n';
 			notiHtml += '</tr>\n';
 		});
 		notiHtml += '</tbody></table>';
@@ -1320,13 +1318,12 @@
 				idx = 0;
 
 				$("#goodsDetailForm #notiArea").find("#infoContents tr").each(function() {
-					if ("Y" == $(this).find("input[name=reqYn]").val() ||  "Y" == $(this).find("input[name=dispYn]").val()){
-						if (gagajf.isNull($(this).find("input[name=niContent]").val())){
-							optCheck = true;
-							mcxDialog.alertC("고시정보를 입력해주세요.");
-							return false;
-						}
+					if (gagajf.isNull($(this).find("input[name=niContent]").val())){
+						optCheck = true;
+						mcxDialog.alertC("고시정보를 입력해주세요.");
+						return false;
 					}
+
 					idx++;
 				});
 			}

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

@@ -67,7 +67,7 @@
 			<col width="7%"/>
 		</colgroup>
 		<tr th:if="${goods.selfGoodsYn == 'Y' and goods.goodsType == 'G056_N'}">
-			<th colspan="2">WMS재고연동여부<i class="star"></i></th>
+			<th colspan="2">WMS재고연동여부<em class="required" title="필수"></em></th>
 			<td colspan="2">
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnY" value="Y" th:checked="${goods.erpStockLinkYn == 'Y'}"/>Y</label>
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnN" value="N" th:checked="${goods.erpStockLinkYn == 'N'}"/>N</label>

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

@@ -32,24 +32,6 @@
 			</ul>
 			<ul class="panelBar">
 				<li class="center">
-					<!-- <th:block th:if="${sessionInfo.roleCd == 'G001_0000' 
-									or sessionInfo.roleCd == 'G001_A000' 
-									or sessionInfo.roleCd == 'G001_A001' 
-									or sessionInfo.roleCd == 'G001_A100' 
-									or sessionInfo.roleCd == 'G001_A101'
-									}">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF001');">자사상품 등록양식 다운로드</button>
-						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsSelfCreate" >자사상품 등록</button>
-					</th:block>
-					<th:block th:if="${sessionInfo.roleCd == 'G001_0000' 
-									or sessionInfo.roleCd == 'G001_A000' 
-									or sessionInfo.roleCd == 'G001_A001' 
-									or sessionInfo.roleCd == 'G001_A100' 
-									or sessionInfo.roleCd == 'G001_A101'
-									}">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF005');">입점상품 등록양식 다운로드</button>
-						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsCreate" >입점상품 등록</button> -->
-					</th:block>
 					<label class="off"><a href="javascript:void(0);" id="excelList" style="display: none;">엑셀다운로드</a></label>
 					<!--  추후 대량 수정 권한-->
 					<span th:if="${sessionInfo.roleCd == 'G001_0000' 
@@ -59,7 +41,7 @@
 									or sessionInfo.roleCd == 'G001_A101'
 								}" 
 							th:style="'padding-left:80px;'">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
+						<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
 						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >상품 수정</button>
 					</span>
 				</li>
@@ -68,7 +50,7 @@
 		<div class="panelStyle" >
 			<!-- 검색조건 영역 -->
 			<div class="panelTitle">
-				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
+				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 상품코드나 등록일을 꼭 입력해 주세요.</h3>
 			</div>
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -79,7 +61,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>상품코드<i class="star"></i></th>
+						<th>상품코드<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w130" name="condition" id="condition" maxlength="50"/></td>
 						<th>등록여부</th>
 						<td>
@@ -90,7 +72,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>
@@ -113,22 +95,22 @@
 						<i class="fa fa-info" aria-hidden="true"></i>
 						<span class="left aL" style="width:580px;">
 						<!-- class="left" 또는 class="right" -->
-							<em>상품미등록</em><br/>
-							- 상품코드 오류 : 빈값, 온라인상품코드 미존재<br/>
-							- 업체 오류 : 빈값, 'S0001'나 'S0002' 가 아닌경우<br/>
-							- 상품명 오류 : 빈값<br/>
-							- 스타일 연도 오류 : 온라인에서 관리되지 않는 스타일 연도<br/>
-							- 성별 오류 : 온라인에서 관리되지 않는 성별<br/>
-							- 컬러 오류 : 온라인에서 관리되지 않는 컬러<br/>
-							- 품목 오류 : 온라인에서 관리되지 않는 품목<br/>
+							<em>* 상품미등록 *</em><br/>
+							- 품번 오류(자사) : 빈값, 길이 10이 아닐경우, FRJ는 '-'제외한 길이<br/>
+							- 제조년월일 오류 : 빈값, 날짜형식이 맞는지<br/>
+							- WMS 미존재 품번코드(자사) : 온라인 입고테이블에 품번이 없는 경우<br/>
+							- 상품코드 중복등록요청 : 등록된 상품코드 등록요청<br/>
+							- 항목별 오류 : 온라인에서 관리되지 않는 공통코드<br/>
 							- 품목의 고시정보 없음 : 품목의 고시분류 매핑이 안되어 있는 경우<br/>
+							- 고시분류 오류 : 등록요청 고시분류 와 온라인에서 품목과 매핑된 고시분류가 다른 경우<br/>
+							<br/>
+							<em>* 상품등록 *</em><br/>
+							- WMS 상품 사이즈 정보 없음 : WMS에 상품코드의 사이즈가 없을 경우<br/>
+							- 고시항목 필수 항목 오류 : 필수 고시항목의 값이 없을 경우<br/>
 						</span>
 					</div>
 					<!-- //아이콘 툴팁 -->
 				</li>
-				<li class="right">
-					<button type="button" class="btn btn-default btn-lg" id="btnGoodsRegExcelDownLoad">엑셀다운로드</button>
-				</li>
 			</ul>
 			<!-- //상단버튼 영역  -->
 			<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham"></div>
@@ -144,42 +126,33 @@
 	var columnDefs = [
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "작업일시", field: "regDt", width: 150, cellClass: 'text-center'},
+		{headerName: "작업자", field: "regNm", width: 120, cellClass: 'text-center'},
 		{headerName: "상품등록여부", field: "regSuccYn", width: 100, cellClass: 'text-center'},
 		{headerName: "등록결과메세지", field: "regFailRsn", width: 200, cellClass: 'text-left'},
-		{headerName: "등록브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
-		{headerName: "업체코드", field: "supplyCompCd", width: 130, cellClass: 'text-center'},
+		{headerName: "품번", field: "goodsNum", width: 100, cellClass: 'text-center'},
+		{headerName: "브랜드코드", field: "brandCd", width: 100, cellClass: 'text-center'},
+		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 130, cellClass: 'text-center'},
+		{headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-left'},
 		{headerName: "상품타이틀", field: "goodsTnm", width: 150, cellClass: 'text-left'},
 		{headerName: "검색어", field: "goodsSnm1", width: 150, cellClass: 'text-left'},
-		{headerName: "제조국", field: "makeNm", width: 100, cellClass: 'text-center'},
+		{headerName: "원산지", field: "originCd", width: 100, cellClass: 'text-center'},
 		{headerName: "제조일", field: "makeYmd", width: 100, cellClass: 'text-center'},
-		{headerName: "이지미타입", field: "imgType", width: 100, cellClass: 'text-center'},
-		{headerName: "이미지경로1", field: "imgPath1", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로2", field: "imgPath2", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로3", field: "imgPath3", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로4", field: "imgPath4", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로5", field: "imgPath5", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로6", field: "imgPath6", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로7", field: "imgPath7", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로8", field: "imgPath8", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로9", field: "imgPath9", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로10", field: "imgPath10", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로11", field: "imgPath11", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로12", field: "imgPath12", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로13", field: "imgPath13", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로14", field: "imgPath14", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로15", field: "imgPath15", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로16", field: "imgPath16", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로17", field: "imgPath17", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로18", field: "imgPath18", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로19", field: "imgPath19", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로20", field: "imgPath20", width: 200, cellClass: 'text-left'},
-		{headerName: "고시분류코드", field: "niClsfCd", width: 200, cellClass: 'text-center',
-			cellEditorParams: { values: gagaAgGrid.extractValues(niClsfCdList) },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(niClsfCdList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(niClsfCdList, params.newValue); }
-		},
+		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
+		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
+		{headerName: "시즌", field: "seasonCd", width: 100, cellClass: 'text-center'},
+		{headerName: "성별", field: "sexGb", width: 100, cellClass: 'text-center'},
+		{headerName: "정상가", field: "listPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "원가", field: "costPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "정상이월", field: "formalGb", width: 100, cellClass: 'text-center'},
+		{headerName: "상품구분", field: "goodsGb", width: 100, cellClass: 'text-center'},
+		{headerName: "과세구분", field: "taxGb", width: 100, cellClass: 'text-center'},
+		{headerName: "성인용품여부", field: "adultYn", width: 100, cellClass: 'text-center'},
+		{headerName: "옵션정보", field: "optStr", width: 150, cellClass: 'text-center'},
+		{headerName: "상품상세 html", field: "goodsContent", width: 150, cellClass: 'text-center'},
+		{headerName: "고시분류코드", field: "niClsfCd", width: 100, cellClass: 'text-center'},
 		{headerName: "고시내용1", field: "niContent1", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용2", field: "niContent2", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용3", field: "niContent3", width: 200, cellClass: 'text-left'},
@@ -207,21 +180,7 @@
 		{headerName: "고시내용25", field: "niContent25", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용26", field: "niContent26", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용27", field: "niContent27", width: 200, cellClass: 'text-left'},
-		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'},
-		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
-		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
-		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
-		{headerName: "시즌", field: "seasonCd", width: 80, cellClass: 'text-center'},
-		{headerName: "성별", field: "sexGb", width: 80, cellClass: 'text-center'},
-		{headerName: "품번", field: "goodsNum", width: 100, cellClass: 'text-center'},
-		{headerName: "정상가", field: "listPrice", width: 100, cellClass: 'text-center'},
-		{headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-center'},
-		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 130, cellClass: 'text-center'},
-		{headerName: "정상이월", field: "formalGb", width: 100, cellClass: 'text-center'},
-		/* {headerName: "옵션문자열", field: "optStr", width: 200, cellClass: 'text-center'},
-		{headerName: "안전재고문자열", field: "baseStockStr", width: 200, cellClass: 'text-center'},
-		{headerName: "현재고문자열", field: "currStockStr", width: 200, cellClass: 'text-center'}, */
-		{headerName: "매입유형", field: "buyingType", width: 80, cellClass: 'text-center'}
+		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'}
 	];
 
 	// Get GridOptions
@@ -297,31 +256,6 @@
 		fnGoodsListSearch();
 	}
 	
-	$('#btnGoodsRegExcelDownLoad').on('click', function() {
-		
-		var date = new Date().format("YYYYMMDDHHmmss");
-		var params = {
-			
-			fileName : "상품대량등록결과_"+ date,
-			sheetName: "DATA"
-		}
-		gridOptions.excelStyles = [
-			{
-				id: 'text-center',
-				dataType: 'string',
-				font: {size : 10, bold: false}
-			},
-			{
-				id: 'text-left',
-				dataType: 'string',
-				font: {size : 10, bold: false}
-			}
-		]
-		
-		gridOptions.api.exportDataAsExcel(params);
-		
-	});
-	
 	// 초기화 클릭시
 	$('#btnInit').on('click', function() {
 		$('#massForm')[0].reset();

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

@@ -38,7 +38,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>업체/브랜드<i class="star"></i></th>
+						<th>업체/브랜드<em class="required" title="필수"></em></th>
 						<td>
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option value="" th:if="${sessionInfo.roleCd} != 'B000'">[전체]</option>
@@ -48,13 +48,13 @@
 								<option value="">[전체]</option>
 							</select>
 						</td>
-						<th>모델번호<i class="star"></i></th>
+						<th>모델번호<em class="required" title="필수"></em></th>
 						<td>
 							<input id="modelNo" name=modelNo type="text" class="w150"  maxlength="20"/>
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>

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

@@ -29,9 +29,6 @@
 			<input type="hidden" name="exceptGoodsList"/>			<!-- 제외상품 리스트 -->
 			<input type="hidden" name="burdenList"/>				<!-- 업체 분담율 리스트 -->
 			<input type="hidden" name="sectionGbList"/>				<!-- 다다익선 구간/혜택 리스트 -->
-			<input type="hidden" name="supplyCompArr"/>
-			<input type="hidden" name="brandArr"/>
-			<input type="hidden" name="goodsArr"/>
 
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -51,7 +48,7 @@
 						<td>
 							<!-- 프로모션 ID 입력 : before -->
 							<label th:if="${mode == 'N'}">
-								<input class="w50p" type="text" id="disTmtbSq1" name="disTmtbSq" maxlength="30" th:value="${params.tmtbSq}" disabled=""/>
+								<input class="w50p" type="text" id="disTmtbSq1" name="disTmtbSq" maxlength="30" th:value="${params.tmtbSq}" disabled=""/>자동생성
 							</label>
 							<label th:if="${mode == 'U'}">
 								<input class="w50p" type="text" id="disTmtbSq2" name="disTmtbSq" maxlength="30" th:value="${tmtbSeq}" disabled=""/>
@@ -60,12 +57,12 @@
 						</td>
 					</tr>
 					<tr>
-						<th>행사 기간<em class="required" title="필수"></em></th>
+						<!--<th>행사 기간<em class="required" title="필수"></em></th>
 						<td>
 							<input type="text" class="schDate w100" name="tmtbStdt" maxlength="10" required="required" data-valid-name="시작일자"/>
 							~
 							<input type="text" class="schDate w100" name="tmtbEddt" maxlength="10" required="required" data-valid-name="종료일자"/>
-						</td>
+						</td>-->
 						<th>상태<em class="required" title="필수"></em></th>
 						<td>
 							<!-- 상태 입력 : before
@@ -74,6 +71,38 @@
 							<input type="hidden" id="tmtbStat" name="tmtbStat"/>
 						</td>
 					</tr>
+					<tr>
+						<th>시작일<em class="required" title="필수"></em></th>
+						<td>
+							<input type="hidden" name="tmtbStdt" id="tmtbStdt" required="required" data-valid-name="다다익선시작일시">
+							<input type="text" class="schDate w100" name="eventStdt" id="eventStdt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
+							<select name="eventStHH" data-valid-name="다다익선시작(시)" style="width: 65px;" th:readonly="${mode == 'U'}">
+								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventStHH == #numbers.formatInteger(num,2)}">시간</option>
+								</th:block>
+							</select>
+							<select name="eventStMM" data-valid-name="다다익선시작(분)" style="width: 65px;" th:readonly="${mode == 'U'}">
+								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventStMM == #numbers.formatInteger(num,2)}">분</option>
+								</th:block>
+							</select>
+						</td>
+						<th>종료일<em class="required" title="필수"></em></th>
+						<td>
+							<input type="hidden" name="tmtbEddt" id="tmtbEddt" required="required" data-valid-name="다다익선종료일시">
+							<input type="text" class="schDate w100" name="eventEddt" id="eventEddt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
+							<select name="eventEdHH" data-valid-name="다다익선종료(시)" style="width: 65px;" th:readonly="${mode == 'U'}">
+								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventEdHH == #numbers.formatInteger(num,2)}">시간</option>
+								</th:block>
+							</select>
+							<select name="eventEdMM" data-valid-name="다다익선종료(분)" style="width: 65px;" th:readonly="${mode == 'U'}">
+								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventEdMM == #numbers.formatInteger(num,2)}">분</option>
+								</th:block>
+							</select>
+						</td>
+					</tr>
 					<tr>
 						<th>할인 구간<em class="required" title="필수"></em></th>
 						<td>
@@ -98,7 +127,37 @@
 
 				</table>
 			</div>
-
+			<div class="panelStyle" style="margin:unset;">
+				<!-- TITLE -->
+				<div class="panelTitle">
+					<h2>할인 구간</h2>
+					<span class="panelControl">
+						<i class="fa inner-fa-chevron-up"></i>    <!-- 열림/닫힘 화살표 -->
+					</span>
+				</div>
+				<!-- //TITLE -->
+				<div class="inner-panelContent">
+					<div class="panelContent">
+						<table class="frmStyle">
+							<colgroup>
+								<col width="10%"/>
+								<col width="90%"/>
+							</colgroup>
+							<tr>
+								<th>할인 구간</th>
+								<td>
+									<div class="padding10">
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddSectionRow">행추가</button>
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelSectionRow">행삭제</button>
+										<br/>
+										<div id="gridSectionGbList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+									</div>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
 			<div class="panelStyle" style="margin:unset;">
 				<!-- TITLE -->
 				<div class="panelTitle">
@@ -155,10 +214,10 @@
 									</div>
 								</td>
 							</tr>
-							<tr > <!--class="off"-->
+							<tr class="off"> <!---->
 								<th>업체&브랜드상품</th>
 								<td>
-									<div class="padding10" > <!--style="display: none;"-->
+									<div class="padding10" style="display: none;"> <!---->
 										<div id="gridDuplicateGoodsList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
 									</div>
 								</td>
@@ -200,37 +259,7 @@
 				</div>
 			</div>
 
-			<div class="panelStyle" style="margin:unset;">
-				<!-- TITLE -->
-				<div class="panelTitle">
-					<h2>할인 구간</h2>
-					<span class="panelControl">
-						<i class="fa inner-fa-chevron-up"></i>    <!-- 열림/닫힘 화살표 -->
-					</span>
-				</div>
-				<!-- //TITLE -->
-				<div class="inner-panelContent">
-					<div class="panelContent">
-						<table class="frmStyle">
-							<colgroup>
-								<col width="10%"/>
-								<col width="90%"/>
-							</colgroup>
-							<tr>
-								<th>할인 구간</th>
-								<td>
-									<div class="padding10">
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddSectionRow">행추가</button>
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelSectionRow">행삭제</button>
-										<br/>
-										<div id="gridSectionGbList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</div>
-			</div>
+
 
 			<div class="panelStyle" style="margin:unset;">
 				<!-- TITLE -->
@@ -269,8 +298,9 @@
 			<li  class="right">
 				<!-- <th:block th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}"> -->
 				<!--<button type="button" class="btn btnRight btn-success btn-lg" id="btnSearchList">목록</button>-->
-				<button type="button" th:if="${mode == 'N'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterSave">저장</button>
-				<button type="button" th:if="${mode == 'U'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterUpdate">수정</button>
+				<button type="button" class="btn btnRight btn-success btn-lg" id="btnMorebetterSave">저장</button>
+				<!--<button type="button" th:if="${mode == 'N'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterSave">저장</button>
+				<button type="button" th:if="${mode == 'U'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterUpdate">수정</button>-->
 				<!--<button type="button" class="btn btnRight btn-success btn-lg" id="btnChangeStatIng">진행</button>
                     <button type="button" class="btn btnRight btn-success btn-lg" id="btnPromotionDelete">삭제</button>
                     <button type="button" class="btn btnRight btn-success btn-lg" id="btnPromotionStop">중지</button>-->
@@ -478,213 +508,128 @@
 		if(mode=="N"){
 			$("input:radio[name='disTmtbStat']:radio[value='G232_10']").prop('checked', true); // 선택하기
 		}
-		cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
+		//cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
+		cfnCreateCalendar('#tmtbTerms', 'eventStdt', 'eventEddt', true, '행사기간', 'X');
 	});
 
-	// 수정 버튼 클릭시
-	$('#btnMorebetterUpdate').on('click', function() {
-		// validation
-		if (!gagajf.validation('#moreBetterForm'))
-			return false;
-
-		// 행사기간 확인
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
-
-		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
-			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-
-		if (fromDate > toDate) {
-			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-
-		// disabled 값 넘겨주기
-		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
-		$('#moreBetterForm input[name=tmtbStat]').val($('input:radio[name="disTmtbStat"]:checked').val());
-
-		mcxDialog.confirm('수정하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);	//selectedRowData
-				var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
-				var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
-				var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
-				var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
-				var sectionGbAllData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
-
-				var jsonSupplyCompData = JSON.stringify(compAllData);
-				$('#moreBetterForm input[name=supplyCompList]').val(jsonSupplyCompData);
-				var jsonBrandData = JSON.stringify(brandAllData);
-				$('#moreBetterForm input[name=brandList]').val(jsonBrandData);
-				var jsonApplyData = JSON.stringify(applyAllData);
-				$('#moreBetterForm input[name=applyGoodsList]').val(jsonApplyData);
-				var jsonExceptData = JSON.stringify(exceptAllData);
-				$('#moreBetterForm input[name=exceptGoodsList]').val(jsonExceptData);
-				var jsonSectionGbData = JSON.stringify(sectionGbAllData);
-				$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
-				var jsonBurdenData = JSON.stringify(burdenAllData);
-				$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
-
-				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
-				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
-					fnMorebetterFormClose();
-					$('#btnInit').trigger('click');
-					$('#btnSearch').trigger('click');
-				});
+	var fnGoodsGbCheck = function (){
+		let applyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+		var checkCnt = 0;
+		$.each(applyGoodsData, function(idx, item) {
+			if(item.goodsGb == 'G800_10'){
+				checkCnt++;
 			}
 		});
-	});
-
-	$('#btnMorebetterSave').on('click', function() {
-		var allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
-		var allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
-		var allApplyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
-
-		// 공급업체+브랜드 상품조회
-		var multiSupplyCompCd = [];
-		$.each(allSupplyCompData, function(idx, item) {
-			multiSupplyCompCd.push(item.supplyCompCd);
-		});
-
-		var multiBrand = [];
-		$.each(allBrandData, function(idx, item) {
-			multiBrand.push(item.brandCd);
-		});
-
-		var multiGoods = [];
-		$.each(allApplyGoodsData, function(idx, item) {
-			multiGoods.push(item.goodsCd);
-		});
-
-		$('#moreBetterForm input[name=supplyCompArr]').val(multiSupplyCompCd.join(','));
-		$('#moreBetterForm input[name=brandArr]').val(multiBrand.join(','));
-		$('#moreBetterForm input[name=goodsArr]').val(multiGoods.join(','));
-
-		var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
-		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
-	});
-
-	var fnMorebetterSaveCollback = function(result){
-		console.log('duplicateYn::::'+result.duplicateYn);
-		if(result.duplicateYn == "Y"){
-			console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
-			for(let i=0; i<result.duplicateGoodsList.length; i++){
-				gagaAgGrid.addRowData(gridOptionsDuplicateGoodsList, {"goodsCd" : result.duplicateGoodsList[i].goodsCd, "goodsNm" : result.duplicateGoodsList[i].goodsNm});
-			}
-			gagaAgGrid.exportToExcel('다다익선 중복상품 목록', gridOptionsDuplicateGoodsList);
+		console.log('checkCnt>>'+checkCnt);
+		if(checkCnt < 1){
+			mcxDialog.alert("기본상품을 1개 이상 지정해주세요.");
+			return false;
 		}else{
-			mcxDialog.alert(result.msg);
-			fnMorebetterFormClose();
-			$('#btnInit').trigger('click');
-			$('#btnSearch').trigger('click');
+			console.log('통과');
 		}
-	}
+	};
 
-	// 저장 버튼 클릭시
-	$('#btnMorebetterSave2').on('click', function() {
+	// 저장
+	$('#btnMorebetterSave').on('click', function() {
 		// validation
 		if (!gagajf.validation('#moreBetterForm'))
 			return false;
 
 		// 행사기간 확인
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
-
-		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
+		if (gagajf.isNull($('#moreBetterForm input[name=eventStdt]').val()) || gagajf.isNull($('#moreBetterForm input[name=eventEddt]').val())) {
 			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
 		}
 
+		var eventStDt = $('#moreBetterForm input[name=eventStdt]').val()+$('#moreBetterForm select[name=eventStHH]').val()+$('#moreBetterForm select[name=eventStMM]').val()+'00';
+		var eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+$('#moreBetterForm select[name=eventEdHH]').val()+$('#moreBetterForm select[name=eventEdMM]').val()+'59';
+
+		eventStDt = eventStDt.replace(/[^0-9]/g, '');
+		eventEdDt = eventEdDt.replace(/[^0-9]/g, '');
+		console.log('2.eventStDt>>'+eventStDt);
+		console.log('3.eventEdDt>>'+eventEdDt);
+
+		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
+		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
+
 		if (fromDate > toDate) {
 			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
 		}
-		// 공급업체&&브랜드 체크
-		let allSupplyCompCnt = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList).length;
-		let allBrandCnt = gagaAgGrid.getAllRowData(gridOptionsFGBrandList).length;
-		console.log('allSupplyCompCnt>>>>'+allSupplyCompCnt);
-		console.log('allBrandCnt>>>>'+allBrandCnt);
-		if(allSupplyCompCnt>0){
-			if(allBrandCnt<1){
+
+		// 각 ag-grid list 수량
+		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
+		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+		let allApplyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+		let allExceptGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+		let allApplyBurdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+		let allSectionGbData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+		if(allSupplyCompData.length > 0){
+			if(allBrandData.length < 1){
 				mcxDialog.alert('브랜드를 추가해주세요.');
 				return;
 			}
 		}
-		if(allBrandCnt>0){
-			if(allSupplyCompCnt<1){
+		if(allBrandData.length > 0){
+			if(allSupplyCompData.length < 1){
 				mcxDialog.alert('공급업체를 추가해주세요.');
 				return;
 			}
 		}
 
-		// 각 ag-grid list 수량
-		let supplyCompCnt = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList).length;
-		let brandCnt = gagaAgGrid.getAllRowData(gridOptionsFGBrandList).length;
-		let applyGoodsCnt = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList).length;
-		let exceptGoodsCnt = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList).length;
-		let applyBurdenCnt = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList).length;
-		let sectionGbCnt = gagaAgGrid.getAllRowData(gridOptionsSectionGbList).length;
-
-		if(applyGoodsCnt < 1){
-			mcxDialog.alert("적용상품이 없습니다.");
-			return false;
-		}
-		if(sectionGbCnt < 1){
+		if(allSectionGbData.length < 1){
 			mcxDialog.alert("할인구간을 설정해주세요.");
 			return false;
 		}
 
-		// disabled 값 넘겨주기
-		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
-		$('#moreBetterForm input[name=tmtbStat]').val($('input:radio[name="disTmtbStat"]:checked').val());
-
-		mcxDialog.confirm('선택된 데이터를 저장하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
-				var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
-				var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
-				var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
-				var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
-				var sectionGbAllData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
-
-				var jsonSupplyCompData = JSON.stringify(compAllData);
-				$('#moreBetterForm input[name=supplyCompList]').val(jsonSupplyCompData);
-				var jsonBrandData = JSON.stringify(brandAllData);
-				$('#moreBetterForm input[name=brandList]').val(jsonBrandData);
-				var jsonApplyData = JSON.stringify(applyAllData);
-				$('#moreBetterForm input[name=applyGoodsList]').val(jsonApplyData);
-				var jsonExceptData = JSON.stringify(exceptAllData);
-				$('#moreBetterForm input[name=exceptGoodsList]').val(jsonExceptData);
-				var jsonBurdenData = JSON.stringify(burdenAllData);
-				$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
-
-				var jsonSectionGbData = JSON.stringify(sectionGbAllData);
-				$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
-
-				$('#moreBetterForm input[name=applyGb]').val($('input:radio[name="sectionGb"]:checked').val());
-
+		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
+		fnGoodsGbCheck();
+
+		var data = {
+			mode : $('#moreBetterForm input[name=mode]').val()
+			, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
+			, tmtbNm : $('#moreBetterForm input[name=tmtbNm]').val()
+			, tmtbStat : $('input:radio[name="disTmtbStat"]:checked').val()
+			, tmtbStdt : $('#moreBetterForm input[name=tmtbStdt]').val()
+			, tmtbEddt : $('#moreBetterForm input[name=tmtbEddt]').val()
+			, sectionGb : $('input:radio[name="sectionGb"]:checked').val()
+			, applyGb : $('input:radio[name="sectionGb"]:checked').val()
+			, dcWay : $('input:radio[name="dcWay"]:checked').val()
+			, multiYn : $('#moreBetterForm input[name=multiYn]').val()
+			, supplyCompList : allSupplyCompData
+			, brandList : allBrandData
+			, applyGoodsList : allApplyGoodsData
+			, exceptGoodsList : allExceptGoodsData
+			, burdenList : allApplyBurdenData
+			, sectionGbList : allSectionGbData
+		};
+
+		var jsonData = JSON.stringify(data);
 
-				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
-				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
-					fnMorebetterFormClose();
-					$('#btnInit').trigger('click');
-					$('#btnSearch').trigger('click');
-				});
+		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
+	});
 
+	var fnMorebetterSaveCollback = function(result){
+		console.log('duplicateYn::::'+result.duplicateYn);
+		if(result.duplicateYn == "Y"){
+			console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
+			for(let i=0; i<result.duplicateGoodsList.length; i++){
+				gagaAgGrid.addRowData(gridOptionsDuplicateGoodsList, {"goodsCd" : result.duplicateGoodsList[i].goodsCd, "goodsNm" : result.duplicateGoodsList[i].goodsNm});
 			}
-		});
+			mcxDialog.alert("다른 다다익선에서 사용중인 상품이 존재합니다.");
+			gagaAgGrid.exportToExcel('다다익선 중복상품 목록', gridOptionsDuplicateGoodsList);
 
-	});
+			return;
+		}else{
+			//mcxDialog.alert(result.message);
+			fnMorebetterFormClose();
+			$('#btnInit').trigger('click');
+			$('#btnSearch').trigger('click');
+		}
+	}
 
 	// 공급업체 설정 / 업체 추가 콜백함수
 	var fnSetPopupComapnyInfo = function(result) {
@@ -778,20 +723,31 @@
 			goodsGbVal = "G800_30";
 		}
 
+		let addCnt = 0;
+		let failCnt = 0;
+		let dupliCnt = 0;
+
 		for(let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(OriginGridListOption);		// 받아온 모든 데이터
 
 			// 받아온 data for
 			for(let j = 0 ; j < gridListValue.length ; j++) {
-				if(gridListValue[j].goodsCd == result[i].goodsCd) {	addChk = false;	}				// 중복체크
+				if(gridListValue[j].goodsCd == result[i].goodsCd) { // 중복체크
+					addChk = false;
+					dupliCnt++;
+				}
 			}
 
 			// 중복되지 않은 데이터 리스트에 추가
 			if(addChk) {
 				//gagaAgGrid.addRowData(OriginGridListOption, result[i], "goodsCd");
 				gagaAgGrid.addRowData(OriginGridListOption, {"goodsGb": goodsGbVal, "goodsCd" : result[i].goodsCd, "goodsNm" : result[i].goodsNm, "targetGb" : "G260_10"});
+				addCnt++;
 			}
 		}
+		uifnPopupClose('popupGoods');
+		failCnt = result.length - addCnt - dupliCnt;
+		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, " + failCnt + "건 실패");
 	}
 
 	// 공급업체 설정 업체 추가 버튼 클릭시
@@ -1074,6 +1030,67 @@
 		}
 	});
 
+
+	// 수정 버튼 클릭시
+	$('#btnMorebetterUpdate').on('click', function() {
+		// validation
+		if (!gagajf.validation('#moreBetterForm'))
+			return false;
+
+		// 행사기간 확인
+		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
+		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
+
+		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
+			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
+			$('#moreBetterForm input[name=tmtbStdt]').focus();
+			return false;
+		}
+
+		if (fromDate > toDate) {
+			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
+			$('#moreBetterForm input[name=tmtbStdt]').focus();
+			return false;
+		}
+
+		// disabled 값 넘겨주기
+		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
+		$('#moreBetterForm input[name=tmtbStat]').val($('input:radio[name="disTmtbStat"]:checked').val());
+
+		mcxDialog.confirm('수정하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);	//selectedRowData
+				var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+				var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+				var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+				var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+				var sectionGbAllData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+				var jsonSupplyCompData = JSON.stringify(compAllData);
+				$('#moreBetterForm input[name=supplyCompList]').val(jsonSupplyCompData);
+				var jsonBrandData = JSON.stringify(brandAllData);
+				$('#moreBetterForm input[name=brandList]').val(jsonBrandData);
+				var jsonApplyData = JSON.stringify(applyAllData);
+				$('#moreBetterForm input[name=applyGoodsList]').val(jsonApplyData);
+				var jsonExceptData = JSON.stringify(exceptAllData);
+				$('#moreBetterForm input[name=exceptGoodsList]').val(jsonExceptData);
+				var jsonSectionGbData = JSON.stringify(sectionGbAllData);
+				$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
+				var jsonBurdenData = JSON.stringify(burdenAllData);
+				$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
+
+				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
+				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
+					fnMorebetterFormClose();
+					$('#btnInit').trigger('click');
+					$('#btnSearch').trigger('click');
+				});
+			}
+		});
+	});
+
 	$(document).ready(function() {
 
 	});

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

@@ -0,0 +1,298 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : ReviewForm.html
+ * @desc    : 상품평관리 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.01.25   gagamel     최초 작성
+ *******************************************************************************
+ -->
+	<div id="main">
+		<!-- 메인타이틀 영역 -->
+		<div class="main-title">
+		</div>
+		<!-- //메인타이틀 영역 -->
+		
+		<!-- 메뉴 설명 -->
+		<div class="infoBox menu-desc">
+		</div>
+		<!-- //메뉴 설명 -->
+		
+		<!-- 검색조건 영역 -->
+		<div class="panelStyle">
+			<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/review/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+				<input type="hidden" name="pageNo" value ="1"/>
+				<input type="hidden" name="pageSize" value="50"/>
+				
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:10%;"/>
+						<col style="width:8%;"/>
+						<col style="width:10%;"/>
+						<col style="width:13%;"/>
+						<col style="width:10%;"/>
+						<col style="width:10%;"/>
+						<col style="width:10%;"/>
+						<col style="width:8%;"/>
+						<col style="width:10%;"/>
+						<col/>
+					</colgroup>
+					<tr>
+						<th>등록일자</th>
+						<td colspan="7" id="terms">
+						</td>
+						<th rowspan="2">상품코드</th>
+						<td rowspan="2">
+							<textarea class="textareaR2 w150" name="goodsCd" id="goodsCd"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<th>상품평유형</th>
+						<td>
+							<select name="reviewGb">
+								<option value="">[전체]</option>
+								<option value="R">일반</option>
+								<option value="P">포토/영상</option>
+							</select>
+						</td>
+						<th>회원검색</th>
+						<td>
+							<select name="searchGb">
+								<option value="memNm">회원명</option>
+								<option value="email">이메일</option>
+							</select>
+							<input type="text" name="seachTxt" class="w100" maxlength="50"/>
+						</td>
+						<th>포인트지급상태</th>
+						<td>
+							<select name="pntGiveStat">
+								<option value="">[전체]</option>
+								<option th:if="${pntGiveStatList}" th:each="oneData, status : ${pntGiveStatList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+							</select>
+						</td>
+						<th>노출여부</th>
+						<td>
+							<select name="dispYn">
+								<option value="">[전체]</option>
+								<option value="Y" selected="selected">[Y] Yes</option>
+								<option value="N">[N] No</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+				
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
+						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- //검색조건 영역 -->
+		
+		<!-- 리스트 영역 -->
+		<div class="panelStyle">
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li>
+					<button type="button" class="btn btn-info btn-lg" id="btnSaveBestReview">베스트상품평 선정</button>
+				</li>
+				<li class="right">
+					검색결과 : <strong><span id="totCnt">0</span> 건</strong>&nbsp;
+					쪽번호 <span id="pageNo">0</span>/ <strong id="totPage" class="marR10">0</strong>
+					<select 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>
+				</li>
+			</ul>
+			<!-- //버튼 배치 영역 -->
+			
+			<div id="gridList" style="width: 100%; height: 670px" class="ag-theme-balham lh60"></div>
+			
+			<ul class="panelBar">
+				<li class="center">
+					<div class="tablePaging" id="pagination"></div>
+				</li>
+			</ul>
+		</div>
+		<!-- //리스트 영역 -->
+	</div>
+
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+/*<![CDATA[*/
+	let scoreSizeList = gagajf.convertToArray([[${scoreSizeList}]]);
+	let scoreColorList = gagajf.convertToArray([[${scoreColorList}]]);
+	let scoreFitList = gagajf.convertToArray([[${scoreFitList}]]);
+	let scoreThickList = gagajf.convertToArray([[${scoreThickList}]]);
+	let scoreWeightList = gagajf.convertToArray([[${scoreWeightList}]]);
+	let scoreBallList = gagajf.convertToArray([[${scoreBallList}]]);
+	let pntGiveStatList = gagajf.convertToArray([[${pntGiveStatList}]]);
+	
+	// specify the columns
+	let columnDefs = [
+		{
+			width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false,
+			checkboxSelection: function (params) { return params.data.bestYn == 'N' ? true : false; }
+		},
+		{
+			headerName: "상품평번호", field: "reviewSq", width: 90, cellClass: 'text-center',
+			cellRenderer: function(params) {
+				return '<a href="javascript:void(0);">' + (params.value == 'R' ? '일반' : '포토/영상') + '</a>';
+			}
+		},
+		{headerName: "상품평유형", field: "reviewGb", width: 90, cellClass: 'text-center'},
+		{
+			headerName: "주문상품", cellClass: 'text-center',
+			children: [
+				{headerName: '주문번호', field: 'ordNo', width: 90, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }},
+				{headerName: '주문상세번호', field: 'ordDtlNo', width: 120, cellClass: 'text-center', hide: true},
+				{headerName: "브랜드명", field: "brandKnm", width: 130, cellClass: 'text-center'},
+				{
+					headerName: "이미지", field: "goodsImg", width: 100, height: 60, cellClass: 'text-center',
+					cellRenderer: function(params) {
+						return '<img width="60" src="' + _goodsUrl + '/' + params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \'' + _goodsUrl + '/' + params.value + '\')" onerror="this.src=\'/image/no.gif\';"/>';
+					}
+				},
+				{headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }},
+				{headerName: "상품명", field: "goodsNm", width: 240, cellClass: 'text-center'},
+				{headerName: '회원번호', field: 'custNo', width: 100, cellClass: 'text-center', hide: true},
+				{headerName: '주문자명', field: 'orderNm', width: 100, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }}
+			]
+		},
+		{headerName: "상품평 제목", field: "reviewTitle", width: 200, cellClass: 'text-center', hide: true},
+		{headerName: "상품평 내용", field: "reviewContent", width: 500, cellClass: 'text-center', hide: true},
+		{
+			headerName: "베스트", cellClass: 'text-center',
+			children: [
+				{headerName: '베스트여부', field: 'bestYn', width: 90, cellClass: 'text-center'},
+				{headerName: '포인트지급여부', field: 'bpntGiveYn', width: 120, cellClass: 'text-center', cellRenderer: function(params) { return params.value == 'N' ? '미지급' : '지급'; }},
+				{headerName: '지급포인트', field: 'giveDueBpnt', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }}
+			]
+		},
+		{
+			headerName: "만족도 점수", cellClass: 'text-center',
+			children: [
+				{headerName: '총점', field: 'score', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+				{headerName: '사이즈점수', field: 'scoreSize', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreSizeList, params.value); }},
+				{headerName: '컬러점수', field: 'scoreColor', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreColorList, params.value); }},
+				{headerName: '핏점수', field: 'scoreFit', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreFitList, params.value); }},
+				{headerName: '두께감점수', field: 'scoreThick', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreThickList, params.value); }},
+				{headerName: '무게감점수', field: 'scoreWeight', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreWeightList, params.value); }},
+				{headerName: '볼넓이점수', field: 'scoreBall', width: 100, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.lookupValue(scoreBallList, params.value); }}
+			]
+		},
+		{
+			headerName: "노출여부", field: "dispYn", width: 90, cellClass: 'text-center',
+			cellRenderer: function(params) { return params.value == 'N' ? '미노출' : '노출'; }
+		},
+		{headerName: "삭제여부", field: "delYn", width: 90, cellClass: 'text-center', hide: true},
+		{
+			headerName: "지급예정포인트", field: "giveDuePnt", width: 120, cellClass: 'text-center'},
+		{
+			headerName: "포인트지급상태", field: "pntGiveStat", width: 120, cellClass: 'text-center',
+			cellEditorParams: { values: gagaAgGrid.extractValues(pntGiveStatList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(pntGiveStatList, params.value); }
+		},
+		{
+			headerName: "확인", cellClass: 'text-center',
+			children: [
+				{headerName: '확인여부', field: 'confirmYn', width: 90, cellClass: 'text-center', cellRenderer: function(params) { return params.value == 'N' ? '미확인' : '확인'; }},
+				{headerName: '확인자', field: 'confirmUnm', width: 90, cellClass: 'text-center'},
+				{headerName: '확인일시', field: 'confirmDt', width: 150, cellClass: 'text-center', cellRenderer: function(params) { gagaAgGrid.toDateTimeFormat(params.value); }}
+			]
+		},
+		{
+			headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { gagaAgGrid.toDateTimeFormat(params.value); }
+		}
+	];
+	
+	// Get GridOptions
+	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+	
+	gridOptions.rowSelection = 'multiple';
+	gridOptions.rowHeight = 60; // 이미지가 있을경우 높이 지정해야함.
+	
+	// 조회
+	$('#btnSearch').on('click', function() {
+		gagaPaging.init('searchForm', fnSearchCallBack, 'pagination', $('#searchForm input[name=pageSize]').val());
+		gagaPaging.load($("#searchForm input[name=pageNo]").val());
+	});
+	
+	// 조회 콜백함수
+	var fnSearchCallBack = function(result) {
+		gridOptions.api.setRowData(result.dataList);
+		gagaPaging.createPagination(result.paging.pageable);
+		$('#totCnt').html(result.paging.pageable.totalCount.addComma());
+		$('#pageNo').val(result.paging.pageable.pageNo.addComma());
+		$('#totPage').val(result.paging.pageable.totalPage.addComma());
+	}
+
+	// 페이징크기 변경 시
+	$('select[name=pageSize]').on('change', function() {
+		$('#searchForm input[name=pageSize]').val($(this).val());
+		$('#searchForm input[name=pageNo]').val(1);
+		$('#btnSearch').trigger('click');
+	});
+	
+	// 베스트상품평 선정
+	$('#btnSaveBestReview').on('click', function() {
+		let chooseData = gagaAgGrid.selectedRowData(gridOptions);
+		
+		if (chooseData.length == 0) {
+			mcxDialog.alert('선택된 행이 없습니다.');
+			return;
+		}
+		
+		mcxDialog.confirm("베스트상품평으로 선정하시겠습니까?", {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function() {
+				var updatedData = [];
+				
+				$.each(chooseData, function(idx, item) {
+					if (item.bestYn == 'N') {
+						item.bestYn = 'Y';
+						updatedData.push(item);
+					}
+				});
+				
+				var jsonData = JSON.stringify(updatedData);
+				gagajf.ajaxJsonSubmit('/marketing/review/best/save'
+						, jsonData
+						, function() {
+							$('#btnSearch').trigger('click');
+						});
+			}
+		});
+	});
+	
+	// 상품평 상세 팝업
+	var fnOpenReviewPopup = function(reviewSq) {
+		var actionUrl = "/marketing/review/detail/" + reviewSq;
+		cfnOpenModalPopup(actionUrl, "popupReviewDetail");
+	}
+	
+	$(document).ready(function() {
+		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '등록');
+		$('.btnToday').trigger('click');
+		
+		// Create a agGrid
+		gagaAgGrid.createGrid('gridList', gridOptions);
+	});
+/*]]>*/
+</script>
+
+</html>

src/main/webapp/WEB-INF/views/order/CancelRequestForm.html → src/main/webapp/WEB-INF/views/order/CancelRequestFormBack02.html

@@ -888,7 +888,7 @@ var fnChangeChgReason = function(reasonCd){
 }
 
 // 취소신청/완료
-var fnCnclComplete = function (reqGbn) {
+var fnCnclReq = function (reqGbn) {
 	
 	var temp 		= false;
 	var ordDtlStat	= cancelRequestTargetList[0].ordDtlStat; 
@@ -962,7 +962,7 @@ var fnCnclComplete = function (reqGbn) {
 		,"isCustomer" 		: isCustomer
 		,"chgerNm"			: chgerNm
 		,"chgerEmail"		: chgerEmail
-		,"chgerZipNo"		: ""
+		,"chgerZipcode"		: ""
 		,"chgerBaseAddr"	: ""
 		,"chgerDtlAddr"		: ""
 		,"chgerPhnno"		: chgerPhnno

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -0,0 +1,1054 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : CancelRequestForm.html
+ * @desc    : 취소요청 화면
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2019 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.12.12   jsh77b       최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="1400" data-height="600">
+	<div class="panelStyle">
+		<div class="panelTitle">
+			<h2>취소요청</h2>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCancelRequestForm');"><i class="fa fa-times"></i></button>
+		</div>
+			
+		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
+			<form id="cancelRequestFrm" name="cancelRequestFrm" action="/orderChange/cancel" method="post" target="hdFrameForOrderCancel">
+				<input type="hidden" name="ordNo" th:value="${ordNo}"/>
+				<input type="hidden" name="chgReason" value=""/>
+				<input type="hidden" name="chgReasonDesc" value=""/>
+				
+				<h4>주문정보</h4>
+				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
+
+				<h4>취소정보</h4>
+				<div id="gridOrderCancelRequestToBeList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
+				
+				<h4>배송비정보</h4>
+				<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+				
+				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
+					<button type="button" class="btn btn-success" onclick="fnCnclReq('req');">취소신청</button>
+					<button type="button" class="btn btn-success" onclick="fnCnclReq('complete');">취소완료</button>
+				</div>
+				
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:160px;" />
+						<col style="width:320px;" />
+						<col style="width:160px;" />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>취소사유 <i class="star"></i></th>
+							<td>
+								<select name="selectChgReason" onchange="fnChangeChgReason($(this).val());">
+									<option value="">[선택하세요]</option>
+									<option th:if="${chgReasonList}" th:each="oneData, status : ${chgReasonList}" th:value="|${oneData.cd}:${oneData.cdNm}|" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+								</select>
+							</td>
+							<th>귀책사유</th>
+							<td><span id="imputeReason"></span></td>
+						</tr>
+						<tr>
+							<th>요청메모</th>
+							<td colspan="3">
+								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<h4>환불예정금액</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:20%;"/>
+						<col style="width:30%;"/>
+						<col style="width:20%;"/>
+						<col style="width:30%;"/>
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>총 결제 금액</th>
+							<td colspan="3"><span id="spanPayAmt"></span>원 (상품 실결제 금액 : <span id="spanSumRealOrdAmt"></span>원, 배송금액 : <span id="spanSumDeliveryFee"></span>원) </td>
+						</tr>
+						<tr>
+							<th>주문 상품 금액</th>
+							<td><span id="spanOrdAmt"></span>원</td>
+							<th>취소 상품 금액</th>
+							<td><span id="spanCnclRtnAmt"></span>원</td>
+						</tr>
+						<tr>
+							<th>취소 사용 포인트</th>
+							<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
+						</tr>
+						<tr>
+							<th>취소 사용 쿠폰금액</th>
+							<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원)</td>
+						</tr>
+						<tr>
+							<th>취소 다다익선 금액</th>
+							<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
+						</tr>
+						
+						<tr>
+							<th>취소 고객 상품권 금액</th>
+							<td colspan="3"><span id="spanGfcdUseAmt"></span>원</td>
+						</tr>
+						
+						<tr>
+							<th>취소 상품 실결제 금액</th>
+							<td><span id="spanRealCnclRtnAmt"></span>원</td>
+							<th>추가 배송 금액</th>
+							<td><span id="spanTotDeliveryFee"></span>원 </td>
+						</tr>
+						
+						<tr>
+							<th>환불 금액 합계</th>
+							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<div id="wrapRefundAccount" style="width:50%;">
+					<h4>환불계좌정보</h4>
+					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
+					<div id="gridRefundAccountInfo" style="height: 150px;" class="ag-theme-balham"></div>
+				</div>
+				
+			</form>
+		</div>
+	</div>
+</div>
+
+<!-- data -->
+<script th:inline="javascript">
+/*<![CDATA[*/
+var cancelRequestTargetList = [[${cancelRequestTargetList}]];				// 취소대상목록
+var ordNo 					= [[${ordNo}]];									// 주문번호
+var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
+var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
+
+var temp1 = true;
+var temp2 = false;
+
+// 1. 주문정보(반품대상)
+var columnCancelReqList = [
+	{
+		headerName	: "주문상세정보",
+		children	: [
+			{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
+			{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "주문상세상태"		, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center', hide: temp2}
+		]
+	},
+	{
+		headerName	: "주문상세단품정보",
+		children	: [
+			{headerName: "단품번호"		, field: "ordDtlItemSq"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "단품명"			, field: "itemNm"			, width: 200	, cellClass: 'text-center', hide: temp2},
+			{headerName: "옵션1"			, field: "optCd1"			, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "단품수량"		
+				, field			: "itemQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "단품금액"		
+				, field			: "itemPrice"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "단품옵션금액"		
+				, field			: "optAddPrice"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문상세수량",
+		children	: [
+			{
+				headerName		: "주문"		
+				, field			: "ordQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "취소/요청"		
+				, field			: "cnclRtnQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
+					return cnclRtnReqQty;
+				}
+			},
+			{
+				headerName		: "취소/반품"		
+				, field			: "ordCanChgQty"			
+				, width			: 100		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					var ordQty 			= parseInt(params.data.ordQty);
+					var cnclRtnQty 		= parseInt(params.data.cnclRtnQty);
+					var ordReqChgQty 	= parseInt(params.data.ordReqChgQty);
+					var ordCanChgQty 	= ordQty - (cnclRtnQty +  ordReqChgQty);
+					
+					var strVal 			= "";
+					strVal += "<select class='ordCanChgQty' name='ordCanChgQty' ordDtlNo='"+params.data.ordDtlNo+"' onChange='fnCalculateRefundAmt(this);'>";
+					
+					for (i=0 ; i<=ordCanChgQty ; i++) {
+						if (i == params.data.ordCanChgQty) {
+							strVal += "	<option value='"+i+"' selected>"+i+"</option>";
+						} else {
+							strVal += "	<option value='"+i+"'>"+i+"</option>";
+						}
+					}
+				
+					strVal += "</select>";
+					return strVal;
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문단품금액",
+		children	: [
+			{
+				headerName		: "주문"
+				, field			: "ordAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "취소"		
+				, field			: "cnclRtnAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "즉시할인"		
+				, field			: "cpn1DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "다다익선1"		
+				, field			: "tmtb1DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "다다익선2"		
+				, field			: "tmtb2DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "상품쿠폰"		
+				, field			: "goodsCpnDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "장바구니쿠폰"		
+				, field			: "cartCpnDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "포인트"		
+				, field			: "pntDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "선포인트"		
+				, field			: "prePntDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "상품권"		
+				, field			: "gfcdUseAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "실결제금액"		
+				, field			: "realOrdAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문배송비정보",
+		children	: [
+			{
+				headerName		: "배송비"		
+				, field			: "delvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "무료배송비"		
+				, field			: "minOrdAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "기본배송비"		
+				, field			: "orgDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "반품배송비"		
+				, field			: "rtnDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "교환배송비"		
+				, field			: "excDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "전체취소가능"		, field: "allCanYn"			, width: 100	, cellClass: 'text-center', hide: temp2},
+		]
+	}
+];
+var gridOptionsCancelReqList = gagaAgGrid.getGridOptions(columnCancelReqList);
+
+// Add on options
+gridOptionsCancelReqList.suppressRowClickSelection = true;
+gridOptionsCancelReqList.rowSelection = 'multiple';
+
+// 2. 취소정보(환불정보)
+var columnCancelReqToBeList = [
+	{
+		headerName	: "주문상세정보",
+		children	: [
+			{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
+			{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "주문상세상태"		, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center', hide: temp2}
+		]
+	},
+	{
+		headerName	: "주문상세단품정보",
+		children	: [
+			{headerName: "단품번호"		, field: "ordDtlItemSq"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "단품명"			, field: "itemNm"			, width: 200	, cellClass: 'text-center', hide: temp2},
+			{headerName: "칼라코드"		, field: "optCd1"			, width: 80		, cellClass: 'text-center', hide: temp1},
+			{headerName: "사이즈코드"		, field: "optCd2"			, width: 80		, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "단품수량"		
+				, field			: "itemQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "단품금액"		
+				, field			: "itemPrice"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "단품옵션금액"		
+				, field			: "optAddPrice"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문상세수량",
+		children	: [
+			{
+				headerName		: "주문"		
+				, field			: "ordQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "취소/요청"		
+				, field			: "cnclRtnQty"			
+				, width			: 80		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
+					return cnclRtnReqQty;
+				}
+			},
+			{
+				headerName		: "취소/반품"		
+				, field			: "ordCanChgQty"			
+				, width			: 100		
+				, cellClass		: 'text-center'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문단품금액",
+		children	: [
+			{
+				headerName		: "주문"
+				, field			: "ordAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "취소"		
+				, field			: "cnclRtnAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "즉시할인"		
+				, field			: "cpn1DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "다다익선1"		
+				, field			: "tmtb1DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "다다익선2"		
+				, field			: "tmtb2DcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "상품쿠폰"		
+				, field			: "goodsCpnDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "장바구니쿠폰"		
+				, field			: "cartCpnDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "포인트"		
+				, field			: "pntDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "선포인트"		
+				, field			: "prePntDcAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "상품권"		
+				, field			: "gfcdUseAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "환불금액"		
+				, field			: "realOrdAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문배송비정보",
+		children	: [
+			{
+				headerName		: "배송비"		
+				, field			: "delvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "무료배송비"		
+				, field			: "minOrdAmt"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "기본배송비"		
+				, field			: "orgDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "반품배송비"		
+				, field			: "rtnDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "교환배송비"		
+				, field			: "excDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "전체취소가능"		, field: "allCanYn"			, width: 100	, cellClass: 'text-center', hide: temp2},
+		]
+	}
+];
+var gridOptionsCancelReqToBeList = gagaAgGrid.getGridOptions(columnCancelReqToBeList);
+
+// 3. 배송비정보(환불정보)
+var columnDelvCdList = [
+	{
+		headerName	: "배송코드기준금액",
+		children	: [
+			{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "주문"
+				, field			: "ordAmt"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "취소"		
+				, field			: "cnclRtnAmt"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "환불"		
+				, field			: "realOrdAmt"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			}
+		]
+	},
+	{
+		headerName	: "배송비정보",
+		children	: [
+			{
+				headerName		: "배송비"		
+				, field			: "delvFee"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "무료배송비"		
+				, field			: "minOrdAmt"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "기본배송비"		
+				, field			: "orgDelvFee"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "반품배송비"		
+				, field			: "rtnDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{
+				headerName		: "교환배송비"		
+				, field			: "excDelvFee"			
+				, width			: 80		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "추가배송비여부"		, field: "addDelvFeeYn"		, width: 140	, cellClass: 'text-center', hide: temp2},
+			{
+				headerName		: "추가배송비"		
+				, field			: "addDelvFee"			
+				, width			: 100		
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+				, hide			: temp2
+			},
+			{headerName: "전체취소가능"		, field: "allCanYn"			, width: 100	, cellClass: 'text-center', hide: temp2},
+		]
+	}
+];
+var gridOptionsDelvCdList = gagaAgGrid.getGridOptions(columnDelvCdList);
+
+// 4. 무통장 계좌정보
+var columnDefsRefundAccountInfo = [
+	{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: false, checkboxSelection: true, filter: false},
+	{headerName: "은행명"		, field: "bankNm"		, width: 140	, cellClass: 'text-center'},
+	{headerName: "은행코드"	, field: "bankCd"		, width: 120	, cellClass: 'text-center', hidden:true},
+	{headerName: "계좌번호"	, field: "accountNo"	, width: 150	, cellClass: 'text-center'},
+	{headerName: "예금주"		, field: "accountNm"	, width: 120	, cellClass: 'text-center'},
+	{headerName: "기본"		, field: "defaultYn"	, width: 100	, cellClass: 'text-center'}
+];
+
+var gridOptionsRefundAccountInfo = gagaAgGrid.getGridOptions(columnDefsRefundAccountInfo);
+</script>
+
+<script>
+// 현재 사유는 고객 입니다.
+var isCustomer = true;
+
+// 취소정보계산
+var fnCalculateRefundAmt = function (obj) {
+	// 취소정보담은목록
+	var cancelRequestTargetToBeList = [];
+
+	if (obj != null) {
+		for (i=0 ; i<cancelRequestTargetList.length ; i++) {
+			var orDtlNo 		= $(obj).attr("ordDtlNo");
+			var ordCanChgQty 	= $(obj).val();
+			
+			if (cancelRequestTargetList[i].ordDtlNo == orDtlNo) {
+				cancelRequestTargetList[i].ordCanChgQty = ordCanChgQty;
+			}
+		}
+		// 주문정보 다시 셋팅 (체크해봐야할문제)
+		gridOptionsCancelReqList.api.setRowData(cancelRequestTargetList);
+	}
+	
+	if (cancelRequestTargetList.length == 0) {
+		alert("요청 대상정보가 존재 하지 않습니다.");
+		uifnPopupClose('popupCancelRequestForm');
+		return false;
+	}
+	
+	// 환불금액계산호출
+	var jsonData = JSON.stringify(cancelRequestTargetList);
+	gagajf.ajaxJsonSubmit(
+		'/orderChange/cancel/refundAmt'
+		, jsonData
+		, function(result) {
+			gridOptionsCancelReqToBeList.api.setRowData(result.cancelOrderRefundList);
+			gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
+			
+			$("#spanPayAmt").text(result.spanPayAmt.addComma());					//총 결제 금액
+			$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
+			$("#spanSumDeliveryFee").text(result.spanSumDeliveryFee.addComma());	//배송금액
+			
+			$("#spanOrdAmt").text(result.spanOrdAmt.addComma());					//주문 상품 금액
+			$("#spanCnclRtnAmt").text(result.spanCnclRtnAmt.addComma());			//취소 상품 금액
+			
+			$("#spanTotPntDcAmt").text(result.spanTotPntDcAmt.addComma());			//취소 사용 포인트
+			$("#spanPntDcAmt").text(result.spanPntDcAmt.addComma());				//고객 포인트
+			$("#spanPrePntDcAmt").text(result.spanPrePntDcAmt.addComma());			//상품 선포인트
+			
+			$("#spanCpnDcAmt").text(result.spanCpnDcAmt.addComma());				//취소 사용 쿠폰금액
+			$("#spanCpn1DcAmt").text(result.spanCpn1DcAmt.addComma());				//즉시할인쿠폰
+			$("#spanGoodsCpnDcAmt").text(result.spanGoodsCpnDcAmt.addComma());		//상품쿠폰
+			$("#spanCartCpnDcAmt").text(result.spanCartCpnDcAmt.addComma());		//장바구니쿠폰
+			
+			$("#spanTmtbDcAmt").text(result.spanTmtbDcAmt.addComma());				//취소 다다익선 금액
+			$("#spanTmtb1DcAmt").text(result.spanTmtb1DcAmt.addComma());			//수량할인
+			$("#spanTmtb2DcAmt").text(result.spanTmtb2DcAmt.addComma());			//금액할인
+			
+			$("#spanGfcdUseAmt").text(result.spanGfcdUseAmt.addComma());			//취소 고객 상품권 금액
+			
+			$("#spanRealCnclRtnAmt").text(result.spanRealCnclRtnAmt.addComma());	//취소 상품 실결제 금액
+			$("#spanTotDeliveryFee").text(result.spanTotDeliveryFee.addComma());	//취소 환불 배송 금액
+			
+			$("#spanTotRtnDelvFee").text(result.spanTotRtnDelvFee.addComma());		//반품 환불 배송 금액
+			$("#spanTotExcDelvFee").text(result.spanTotExcDelvFee.addComma());		//교환 환불 배송 금액
+			
+			if (result.spanRealCnclRtnAmt > 0) {
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if (isCustomer) {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee;
+				} 
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
+				}
+			}
+			
+			$("#spanRefundAmt").text(result.spanRefundAmt.addComma());				//환불 금액 합계
+		}
+	);
+}
+
+//  사유
+var fnChangeChgReason = function(reasonCd){
+	var arrReasonCd = reasonCd.split(":");
+	var customerReasonArr = ['G686_10'];
+
+	isCustomer = false;
+	
+	// 취소, 반품, 교환 사유 판단
+	for (i=0 ; i<customerReasonArr.length ; i++) {
+		if (customerReasonArr[i] == arrReasonCd[0]) {
+			isCustomer = true;
+		}
+	}
+	
+	// 귀책사유설정 회사, 고객
+	if (isCustomer) {
+		$("#imputeReason").text("고객");
+	} else {
+		$("#imputeReason").text("회사");
+	}
+
+	$('#cancelRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
+	$('#cancelRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
+
+	fnCalculateRefundAmt();			//환불예정금액 계산.
+}
+
+// 취소신청/완료
+var fnCnclReq = function (reqGbn) {
+	
+	var temp 		= false;
+	var ordDtlStat	= cancelRequestTargetList[0].ordDtlStat; 
+	var allCanYn 	= "N";
+	
+	// 1. 취소수량 체크
+	for (i=0 ; i<cancelRequestTargetList.length ; i++) {		
+		if (cancelRequestTargetList[i].ordCanChgQty > 0) {
+			temp = true;
+		}
+	}
+	
+	if (temp == false) {
+		mcxDialog.alert('취소신청수량을 입력하세요.');
+		return;
+	}
+	
+	// 2. 입금대기건 & 전체취소 체크
+	if (ordDtlStat == "G013_10" && $("#spanPayAmt").text() != $("#spanRefundAmt").text()) {
+		alert("입금대기건은 전체 취소만 가능합니다.");
+		return;
+	}
+	
+	// 2.1 전체취소 여부 적용
+	if (ordDtlStat == "G013_10" && $("#spanPayAmt").text() == $("#spanRefundAmt").text()) {
+		allCanYn = "Y";	
+	}
+	
+	// 3. 취소사유 체크
+	var chgReason = $("#cancelRequestFrm select[name=selectChgReason]").val();
+	
+	if (gagajf.isNull(chgReason)) {
+		mcxDialog.alert("취소사유를 입력하세요."); 
+		return ;
+	}
+	
+	// 4. 환불계좌 체크
+	var accountNo 	= "";
+	var accountNm 	= "";
+	var bankCd 		= "";
+	
+	// 결제타입 무통장입금시 환불계좌 등록
+	if (payMeans == 'G014_20') {
+		var refundAccount = gridOptionsRefundAccountInfo.api.getSelectedRows();
+		
+		if (refundAccount.length == 0) {
+			mcxDialog.alert('선택된 행이 없습니다.');
+			return;
+		}
+		
+		accountNo 	= refundAccount[0].accountNo;
+		accountNm 	= refundAccount[0].accountNm;
+		bankCd 		= refundAccount[0].bankCd;
+	}
+	
+	// 5. 추가정보설정
+	var chgerNm 	= orderInfoList[0].ordNm;
+	var chgerEmail 	= orderInfoList[0].ordEmail;
+	var chgerPhnno 	= orderInfoList[0].ordPhnno;
+	var chgerTelno 	= orderInfoList[0].ordTelno;
+	
+	var jsonObj = {
+		"ordNo"				: $('#cancelRequestFrm input[name=ordNo]').val()
+		,"chgReason" 		: $('#cancelRequestFrm input[name=chgReason]').val()
+		,"chgMemo"			: $('#chgMemo').val()
+		,"cancelReqList" 	: cancelRequestTargetList
+		,"accountNo" 		: accountNo
+		,"accountNm" 		: accountNm
+		,"bankCd" 			: bankCd
+		,"allCanYn" 		: allCanYn
+		,"isCustomer" 		: isCustomer
+		,"chgerNm"			: chgerNm
+		,"chgerEmail"		: chgerEmail
+		,"chgerZipcode"		: ""
+		,"chgerBaseAddr"	: ""
+		,"chgerDtlAddr"		: ""
+		,"chgerPhnno"		: chgerPhnno
+		,"chgerTelno"		: chgerTelno
+	}
+	
+	// 6. 취소신청, 취소완료 여부 체크
+	// 취소완료
+	if (reqGbn == "complete") {
+		cnclUrl = '/orderChange/cnclComplete/';
+	}
+	// 취소신청
+	else if (reqGbn == "req") {
+		cnclUrl = '/orderChange/cnclReq/';
+	}
+	// 취소신청 완료
+	else if (reqGbn == "reqComplete"){
+		cnclUrl = '/orderChange/cnclReqComplete/';
+	}
+
+	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌
+	var jsonData = JSON.stringify(jsonObj);
+	
+	mcxDialog.confirm('취소요청하시겠습니까?', {
+		cancelBtnText		: "취소",
+		sureBtnClick		: function(){
+			// 취소 실행
+			gagajf.ajaxJsonSubmit(
+				cnclUrl
+				, jsonData
+				, function() {
+					uifnPopupClose('popupOrderDetail');
+					fnReOpenOrderDetailPopup();
+					uifnPopupClose('popupCancelRequestForm');
+				}
+			);
+		}
+	});
+}
+
+// 환불계좌 등록
+var fnCreateOrderRfAccount = function () {	
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
+};
+
+// 환불계좌 정보
+var fnBindOrderRfAccountInfo = function () {
+	gagaAgGrid.fetch(
+		"/orderChange/refund/account/info/list?ordNo=" + ordNo
+		, gridOptionsRefundAccountInfo
+		, null
+		, function (result) {
+		}
+	)
+};
+
+$(document).ready(function() {
+	// 1. 그리드생성
+	gagaAgGrid.createGrid('gridOrderCancelRequestList'		, gridOptionsCancelReqList);			// 주문정보
+	gagaAgGrid.createGrid('gridOrderCancelRequestToBeList'	, gridOptionsCancelReqToBeList);		// 취소정보
+	gagaAgGrid.createGrid('gridDelvCdList'					, gridOptionsDelvCdList);				// 배송비정보
+	gagaAgGrid.createGrid('gridRefundAccountInfo'			, gridOptionsRefundAccountInfo);		// 환불계좌정보
+	
+	// 2. 그리드 데이타 싱크작업
+	gridOptionsCancelReqList.api.setRowData(cancelRequestTargetList);								// 주문정보
+	
+	// 2.1 TOTAL ROWS 없애기
+	gagaAgGrid.hideStatusBar('gridOrderCancelRequestList');
+	gagaAgGrid.hideStatusBar('gridOrderCancelRequestToBeList');
+	gagaAgGrid.hideStatusBar('gridDelvCdList');
+	gagaAgGrid.hideStatusBar('gridRefundAccountInfo');
+	
+	// 3. 환불정보계산
+	fnCalculateRefundAmt(null);
+	
+	// 4. 무통장입금아일때 환불계좌 그리드 숨김처리
+	if (payMeans !== 'G014_20') {
+		$('#wrapRefundAccount').addClass("off");
+		fnBindOrderRfAccountInfo();
+	}
+});
+</script>
+</html>
+
+
+
+
+

src/main/webapp/WEB-INF/views/order/CnclReqViewForm.html

@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : CancelRequestForm.html
+ * @desc    : 취소요청 화면
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2019 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.12.12   jsh77b       최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="1400" data-height="400">
+	<div class="panelStyle">
+		<div class="panelTitle">
+			<h2>취소요청정보</h2>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCancelRequestForm');"><i class="fa fa-times"></i></button>
+		</div>
+			
+		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
+			<form id="cancelRequestFrm" name="cancelRequestFrm" action="/orderChange/cancel" method="post" target="hdFrameForOrderCancel">
+				<input type="hidden" name="ordNo" th:value="${ordNo}"/>
+				<input type="hidden" name="ordChgSq" th:value="${ordChgSq}"/>
+				<input type="hidden" name="chgReason" value=""/>
+				<input type="hidden" name="chgReasonDesc" value=""/>
+
+				<h4>(취소/반품/교환) 요청 정보</h4>
+				<div id="gridOrderChangeList" style="width:100%; height: 180px; min-height:99px;" class="ag-theme-balham"></div>
+				
+				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
+					<button type="button" class="btn btn-success" onclick="fnCnclReq('cancel');">취소철회</button>
+					<button type="button" class="btn btn-success" onclick="fnCnclReq('confirm');">취소승인</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+
+<!-- data -->
+<script th:inline="javascript">
+/*<![CDATA[*/
+var ordNo 					= [[${ordNo}]];									// 주문번호
+var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
+var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
+var orderChangeList 		= [[${orderChangeList}]];						// 취소/반품/교환요청 정보
+var chgReason				= orderChangeList[0].chgReason;					// 변경사유코드
+var chgMemo					= orderChangeList[0].chgMemo;					// 변경사유메모
+
+var temp1 = true;
+var temp2 = false;
+
+// 6. 반품/교환 정보
+var columnDefsOrderChangeList = [
+	{
+		headerName		: "요청번호"		
+		, field			: "ordChgSq"		
+		, width			: 100	
+		, cellClass		: 'text-center'
+		, cellRenderer	: function(params) {
+			var rtnStr = "";
+			
+			// 취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
+			if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_40') {
+				rtnStr = '<a href="javascript:void(0);" onclick="fnChgReqInfo(\'' + params.value + '\');">' + params.value + '</a>';
+			} else {
+				rtnStr = params.value;
+			}
+			
+			return  rtnStr;
+		}
+	},
+	{headerName: "요청구분"		, field: "chgGbNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
+	{
+		headerName		: "요청일자"		
+		, field			: "regDt"		
+		, width			: 150		
+		, cellClass		: 'text-center'
+		, cellRenderer	: function(params) {
+			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
+		}
+	},
+	{headerName: "변경사유"		, field: "chgReasonNm"	, width: 100	, cellClass: 'text-center'},
+	{headerName: "요청메모"		, field: "chgMemo"		, width: 150	, cellClass: 'text-center'},
+	{headerName: "변경자명"		, field: "chgerNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "변경자핸드폰"		, field: "chgerPhnno"	, width: 120	, cellClass: 'text-center'},
+	{
+		headerName		: "우편번호"		
+		, field			: "chgerZipcode"
+		, width			: 220
+		, cellClass		: 'text-center'
+	},
+	{headerName: "주소(기본)"		, field: "chgerBaseAddr"	, width: 220, cellClass: 'text-left'},
+	{headerName: "주소(상세)"		, field: "chgerDtlAddr"	, width: 150	, cellClass: 'text-center'},
+	{
+		headerName		: "택배사전송"
+		, field			: "wdInvoiceSendYn"
+		, width			: 120
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			return (params.value == 'N') ? '미전송' : '전송';
+		}
+	},
+	{
+		headerName		: "회수지시전송"
+		, field			: "wdInvoiceSendYn"
+		, width			: 120
+		, cellClass		: 'text-center'
+	},
+	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
+];
+var gridOptionsOrderChangeList = gagaAgGrid.getGridOptions(columnDefsOrderChangeList);
+</script>
+
+<script>
+$(document).ready(function() {
+	// 1. 그리드생성
+	gagaAgGrid.createGrid('gridOrderChangeList'				, gridOptionsOrderChangeList);			// 취소/반품/교환 요청 정보
+	
+	// 2. 그리드 데이타 싱크작업
+	gridOptionsOrderChangeList.api.setRowData(orderChangeList);										// 취소/반품/교환요청 정보
+	
+	// 2.1 TOTAL ROWS 없애기
+	gagaAgGrid.hideStatusBar('gridOrderChangeList');
+});
+</script>
+</html>
+
+
+
+
+

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -288,7 +288,7 @@ var columnExchangeReqList = [
 			{headerName: "재고수량"	, field: "currStockQty"			, width: 100			, cellClass: 'text-center', hide: temp2},
 			{
 				headerName		: "교환신청수량"
-				, field			: "ordCanChgQty"
+				, field			: "chgQty"
 				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
@@ -298,7 +298,7 @@ var columnExchangeReqList = [
 					var ordCanChgQty 	= ordQty - (cnclRtnQty +  ordReqChgQty);
 					
 					var strVal 			= "";
-					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="ordCanChgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
+					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="chgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
 					
 					for (i=0 ; i<=ordCanChgQty ; i++) {
 						if (i == params.data.ordCanChgQty) {

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -507,7 +507,7 @@ var columnDefsDeliveryInfo = [
 	{headerName: "전화번호"		, field: "recipTelno"		, width: 120, cellClass: 'text-left', editable: true},
 	{
 		headerName		: "우편번호"		
-		, field			: "recipZipNo"
+		, field			: "recipZipcode"
 		, width			: 220
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
@@ -615,8 +615,7 @@ var columnDefsOrderChangeInfo = [
 			
 			// 취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
 			if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_40') {
-				rtnStr = "<a href='javascript:void(0);' onclick='fnChgReqInfo(" + params.value + ");>" + params.value + "</a>";
-				//rtnStr = '<a href="javascript:void(0);" onclick="fnChgReqInfo(\'' + params.value + '\');">' + params.value + '</a>';
+				rtnStr = '<a href="javascript:void(0);" onclick="fnChgReqInfo(\'' + params.value + '\');">' + params.value + '</a>';
 			} else {
 				rtnStr = params.value;
 			}
@@ -645,7 +644,7 @@ var columnDefsOrderChangeInfo = [
 	{headerName: "변경자핸드폰"		, field: "chgerPhnno"	, width: 120	, cellClass: 'text-center', editable: true},
 	{
 		headerName		: "우편번호"		
-		, field			: "chgerZipNo"
+		, field			: "chgerZipcode"
 		, width			: 220
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
@@ -996,13 +995,13 @@ var fnUpdateOrderAddr = function (rowIdx) {
 
 // 취소요청
 var fnCancelRequest = function () {
-	var actionUrl = "/orderChange/cancel/request/form?ordNo=" + ordNo;
+	var actionUrl = "/orderChange/cncl/req/form?ordNo=" + ordNo;
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 };
 
 // 반품요청
 var fnReturnRequest = function () {
-	var actionUrl = "/orderChange/return/request/form?ordNo=" + ordNo;
+	var actionUrl = "/orderChange/rtn/req/form?ordNo=" + ordNo;
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 };
 
@@ -1012,9 +1011,10 @@ var fnExchangeRequest = function () {
 	cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 };
 
+// 2021.01.25 추가
 // 취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
-var fnChgReqInfo = function () {
-	var actionUrl = "/orderChange/cancel/request/form?ordNo=" + ordNo;
+var fnChgReqInfo = function (ordChgSq) {
+	var actionUrl = "/orderChange/cncl/req/view/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq;
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 };
 
@@ -1393,14 +1393,14 @@ var fnOpenDaumAddr = function(idx, addrGb) {
 			// 배송지주소 수정
 			if ("ADDR" == addrGb) {
 				gridOptionsDeliveryInfo.api.gre
-				gridOptionsDeliveryInfo.api.getRowNode(idx).data.recipZipNo 		= data.zonecode;
+				gridOptionsDeliveryInfo.api.getRowNode(idx).data.recipZipcode 		= data.zonecode;
 				gridOptionsDeliveryInfo.api.getRowNode(idx).data.recipBaseAddr 		= cfnGetDaumRoadAddr(data);
 				gridOptionsDeliveryInfo.api.getRowNode(idx).data.recipDtlAddr 		= "";
 				gridOptionsDeliveryInfo.api.refreshCells();
 			}
 			// 회수지주소 수정
 			else {
-				gridOptionsOrderChangeInfo.api.getRowNode(idx).data.chgerZipNo 		= data.zonecode;
+				gridOptionsOrderChangeInfo.api.getRowNode(idx).data.chgerZipcode	= data.zonecode;
 				gridOptionsOrderChangeInfo.api.getRowNode(idx).data.chgerBaseAddr 	= cfnGetDaumRoadAddr(data);
 				gridOptionsOrderChangeInfo.api.getRowNode(idx).data.chgerDtlAddr 	= "";
 				gridOptionsOrderChangeInfo.api.refreshCells();

src/main/webapp/WEB-INF/views/order/OrderDetailFormBack20210122.html

@@ -976,13 +976,13 @@ var fnUpdateOrderAddr = function (rowIdx) {
 
 // 취소요청
 var fnCancelRequest = function () {
-	var actionUrl = "/orderChange/cancel/request/form?ordNo=" + ordNo;
+	var actionUrl = "/orderChange/cncl/req/form?ordNo=" + ordNo;
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 };
 
 // 반품요청
 var fnReturnRequest = function () {
-	var actionUrl = "/orderChange/return/request/form?ordNo=" + ordNo;
+	var actionUrl = "/orderChange/rtn/req/form?ordNo=" + ordNo;
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 };
 

src/main/webapp/WEB-INF/views/order/ReturnRequestForm.html

@@ -141,7 +141,7 @@
 						<tr>
 							<th>회수지주소 <i class="star"></i></th>
 							<td colspan="3">
-								<input type="text" name ="chgerZipNo" class="w100" readonly="readonly"/>
+								<input type="text" name ="chgerZipcode" class="w100" readonly="readonly"/>
 								<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 								<input type="text" name ="chgerBaseAddr" class="w300"/>
 								<input type="text" name ="chgerDtlAddr" class="w300"/>
@@ -998,7 +998,7 @@ var fnCancelRequestPartOk = function () {
 	
 	// 5. 회수지정보설정
 	var chgerNm			= $("#cancelRequestFrm input[name=chgerNm]").val();
-	var chgerZipNo		= $("#cancelRequestFrm input[name=chgerZipNo]").val();
+	var chgerZipcode	= $("#cancelRequestFrm input[name=chgerZipcode]").val();
 	var chgerBaseAddr	= $("#cancelRequestFrm input[name=chgerBaseAddr]").val();
 	var chgerDtlAddr	= $("#cancelRequestFrm input[name=chgerDtlAddr]").val();
 	
@@ -1010,7 +1010,7 @@ var fnCancelRequestPartOk = function () {
 	var chgerTelno2		= $("#cancelRequestFrm input[name=chgerTelno2]").val();
 	var chgerTelno3		= $("#cancelRequestFrm input[name=chgerTelno3]").val();
 
-	if (gagajf.isNull(chgerZipNo)) {
+	if (gagajf.isNull(chgerZipcode)) {
 		mcxDialog.alert("회수지주소를 입력하세요."); return;
 	}
 	if (gagajf.isNull(chgerBaseAddr)) {
@@ -1046,7 +1046,7 @@ var fnCancelRequestPartOk = function () {
 		,"isCustomer"		: isCustomer
 		,"chgerNm"			: chgerNm
 		,"chgerEmail"		: chgerEmail
-		,"chgerZipNo"		: chgerZipNo
+		,"chgerZipcode"		: chgerZipcode
 		,"chgerBaseAddr"	: chgerBaseAddr
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
@@ -1095,7 +1095,7 @@ var fnOpenDaumAddr = function() {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {			
 			// 우편번호와 주소 정보를 해당 필드에 넣는다.
-			$('#cancelRequestFrm input[name=chgerZipNo]').val(data.zonecode);
+			$('#cancelRequestFrm input[name=chgerZipcode]').val(data.zonecode);
 			$('#cancelRequestFrm input[name=chgerBaseAddr]').val(cfnGetDaumRoadAddr(data));
 			$('#cancelRequestFrm input[name=chgerDtlAddr]').focus();
 			
@@ -1114,7 +1114,7 @@ var fnSetChger = function(){
 	var spRecipTelno = (data.recipTelno != null) ? data.recipTelno.split('-') : null;
 	
 	$("#cancelRequestFrm input[name=chgerNm]").val(data.recipNm);
-	$("#cancelRequestFrm input[name=chgerZipNo]").val(data.recipZipNo);
+	$("#cancelRequestFrm input[name=chgerZipcode]").val(data.recipZipcode);
 	$("#cancelRequestFrm input[name=chgerBaseAddr]").val(data.recipBaseAddr);
 	$("#cancelRequestFrm input[name=chgerDtlAddr]").val(data.recipDtlAddr);
 	

src/main/webapp/WEB-INF/views/system/UserDetailForm.html

@@ -176,20 +176,24 @@
 								<option th:if="${roleList}" th:each="oneData, status : ${roleList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${roleCd == oneData.cd}"></option>
 							</select>
 						</td>
-						<th><span id="detailRoleRefVal">업체</span></th>
+						<th>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_B000'}">업체</span>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_C000'}">외부몰벤더</span>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_D000'}">제휴채널</span>
+						</th>
 						<td>
 							<input type="hidden" name="roleRefVal" th:value="${userInfo.roleRefVal}"/>
-							<select name="supplyCompCd">
+							<select name="supplyCompCd" th:style="${userInfo.roleCd == 'G001_B000' ? '' : 'display: none'}">
 								<option th:if="${sessionInfo.supplyCompCd == null}" value="">[선택]</option>
 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
-							<select name="vendorId" style="display: none">
+							<select name="vendorId" th:style="${userInfo.roleCd == 'G001_C000' ? '' : 'display: none'}">
 								<option th:if="${sessionInfo.vendorId == null}" value="">[선택]</option>
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
-							<select name="afLinkCd" style="display: none">
+							<select name="afLinkCd" th:style="${userInfo.roleCd == 'G001_D000' ? '' : 'display: none'}">
 								<option th:if="${sessionInfo.afLinkCd == null}" value="">[선택]</option>
-								<option th:if="${afLinkList}" th:each="oneData, status : ${afLinkList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${afLinkList}" th:each="oneData, status : ${afLinkList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
 						</td>
 					</tr>