Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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/TsaMorebetterDao.java

@@ -1,10 +1,9 @@
 package com.style24.admin.biz.dao;
 
+import com.gagaframework.excel.xssf.GagaExcelResultHandler;
 import com.style24.core.support.annotation.ShopDs;
-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.*;
+import org.apache.ibatis.session.ResultHandler;
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
@@ -222,5 +221,6 @@ public interface TsaMorebetterDao {
      * @since 2021. 1. 12
      */
     Collection<MoreBetterGoods> getMorebetterDuplicateList(MoreBetterGoods moreBetterGoods);
+
     /* // CSB 진행 */
 }

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

@@ -22,6 +22,7 @@ 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.DelvFeePolicy;
 import com.style24.persistence.domain.FreeGoods;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsCategory;
@@ -46,6 +47,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;
@@ -873,7 +875,7 @@ public class TsaGoodsService {
 			}
 			goodsDao.updateGoodsSnm(goods);
 
-			//상품 등록후에는 고시정보는 품목과 상관없이 변경처리 가능하게 
+			//상품 등록후에는 고시정보는 품목과 상관없이 변경처리 가능하게
 //			Collection<GoodsNotiInfo> goodsNotiInfoList = goodsDao.getNewNotiInfo(goods);
 //			goodsDao.deleteGoodsNotiInfo(goods);
 //
@@ -1353,6 +1355,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 +1466,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 +1475,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());
 

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

@@ -2421,7 +2421,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"));
 		}
 

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

@@ -4,15 +4,10 @@ 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.style24.persistence.TscPageRequest;
-import com.style24.persistence.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 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;
@@ -21,16 +16,26 @@ 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;
 
@@ -56,24 +61,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 진행 */
 	/**
 	 * 사은품 프로모션 관리 화면
@@ -154,7 +234,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"));
 		}
@@ -174,7 +254,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"));
 		}
@@ -182,7 +262,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-
 	/* // xodud1202 진행 */
 
 	/* JSM 진행 */
@@ -243,7 +322,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";
@@ -291,17 +370,17 @@ public class TsaMarketingController extends TsaBaseController {
 		// 입점업체 조회
 		mav.addObject("ibSupplyCompList", rendererService.getSupplyCompanyList("", "N"));
 		// 정상/이월 조회
-		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"));
 		// 사용가능 고객등급 조회
@@ -318,29 +397,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;
@@ -380,7 +459,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-
 	/**
 	 * 쿠폰발행팝업
 	 * @param
@@ -433,14 +511,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;
@@ -455,7 +533,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"));
@@ -534,10 +612,10 @@ public class TsaMarketingController extends TsaBaseController {
 
 		//tmtb sq 자동생성
 		Integer tmtbSq;
-		if ("N".equals(mode)) {
+		/*if ("N".equals(mode)) {
 			tmtbSq = commonService.getNextSequence("SEQ_TMTB");
 			moreBetter.setTmtbSq(tmtbSq);
-		}
+		}*/
 
 		if ("U".equals(mode)) {
 			// 다다익선 정보
@@ -574,36 +652,17 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author bin2107
 	 * @since 2021. 1. 5
 	 */
-
 	@PostMapping("/morebetter/save")
 	@ResponseBody
 	public GagaResponse saveMorebetterDetail(@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);
+		try {
+			morebetterService.saveMoreBetterDetail(moreBetter);
+		} catch(Exception e) {
+			e.printStackTrace();
+			return super.error(message.getMessage("FAIL_0001"));
+		}
 		return super.ok(message.getMessage("SUCC_0001"));
+
 	}
 
 	/**
@@ -744,4 +803,4 @@ public class TsaMarketingController extends TsaBaseController {
 	public Collection<Coupon> getCouponRetrieveList(@RequestBody Coupon coupon) {
 		return couponService.getCouponRetrieveList(coupon);
 	}
-}
+}

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/Delivery.java

@@ -42,7 +42,7 @@ public class Delivery extends TscBaseDomain {
 	private String recipNm;
 	private String recipTelno;
 	private String recipPhnno;
-	private String recipZipNo;
+	private String recipZipcode;
 	private String recipBaseAddr;
 	private String recipDtlAddr;
 	private String delvMemo;

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,12 @@ 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;
-
-	private String supplyCompArr;
-	private String brandArr;
-	private String goodsArr;
-
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] arrCompBrandGoods;
+	List<MoreBetterGoods> supplyCompList;
+	List<MoreBetterGoods> brandList;
+	List<MoreBetterGoods> applyGoodsList;
+	List<MoreBetterGoods> exceptGoodsList;
+	List<MoreBetterBurden> burdenList;
+	List<MoreBetterSection> sectionGbList;
 
 	// 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

@@ -20,7 +20,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -132,7 +132,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -196,8 +196,8 @@
 		                    END,
 		     SMS_AGREE_YN = #{smsAgreeYn},
 		    </if>
-		    <if test="homeZipNo != null and homeZipNo != ''">
-		     HOME_POST_NO = #{homeZipNo},
+		    <if test="homeZipcode != null and homeZipcode != ''">
+		     HOME_ZIPCODE = #{homeZipcode},
 		    </if>
 		    <if test="homeBaseAddr != null and homeBaseAddr != ''">
 		     HOME_BASE_ADDR = #{homeBaseAddr},
@@ -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 */
@@ -288,7 +295,7 @@
 		     , CDA.RECIP_NM
 		     , CDA.RECIP_PHNNO
 		     , CDA.RECIP_TELNO
-		     , CDA.RECIP_ZIP_NO
+		     , CDA.RECIP_ZIPCODE
 		     , CDA.RECIP_BASE_ADDR
 		     , CDA.RECIP_DTL_ADDR
 		     , CDA.DEL_YN
@@ -317,13 +324,14 @@
 	<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
 		     , RECIP_PHNNO
 		     , RECIP_TELNO
-		     , RECIP_ZIP_NO
+		     , RECIP_ZIPCODE
 		     , RECIP_BASE_ADDR
 		     , RECIP_DTL_ADDR
 		     , DELV_MEMO
@@ -334,13 +342,14 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       #{custNo}
+		       #{custDelvAddrSq}
+		     , #{custNo}
 		     , #{delvAddrNm}
 		     , IFNULL(#{defaultYn}, 'N')
 		     , #{recipNm}
 		     , #{recipPhnno}
 		     , #{recipTelno}
-		     , #{recipZipNo}
+		     , #{recipZipcode}
 		     , #{recipBaseAddr}
 		     , #{recipDtlAddr}
 		     , #{delvMemo}
@@ -356,7 +365,7 @@
 		     , RECIP_NM = #{recipNm}
 		     , RECIP_PHNNO = #{recipPhnno}
 		     , RECIP_TELNO = #{recipTelno}
-		     , RECIP_ZIP_NO = #{recipZipNo}
+		     , RECIP_ZIPCODE = #{recipZipcode}
 		     , RECIP_BASE_ADDR = #{recipBaseAddr}
 		     , RECIP_DTL_ADDR  = #{recipDtlAddr}
 		     , DEL_YN = IFNULL(#{delYn}, 'N')
@@ -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
@@ -666,7 +729,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -750,7 +813,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD

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}),'%') 

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

@@ -185,7 +185,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 +199,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}
+			,#{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()
 	</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 +272,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 +303,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 +334,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 +367,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">
@@ -495,9 +493,12 @@
 		INSERT INTO TB_TMTB_USING_GOODS_TEMP
 			SELECT 	#{regNo} AS REG_NO
 			        ,B.GOODS_CD
+					,G.GOODS_NM
 			  FROM 	TB_TMTB A
 		INNER JOIN  TB_TMTB_APPLY_GOODS B
 				ON  A.TMTB_SQ = B.TMTB_SQ
+		INNER JOIN  TB_GOODS G
+				ON  B.GOODS_CD = G.GOODS_CD
 			WHERE 1=1
 			  AND NOW() BETWEEN DATE_FORMAT(A.TMTB_ST_DT, '%Y-%m-%d %H:%i:%S') AND DATE_FORMAT(A.TMTB_ED_DT, '%Y-%m-%d %H:%i:%S')
 			  AND A.TMTB_STAT = 'G232_11'
@@ -515,6 +516,7 @@
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMarketing.getMorebetterDuplicateList */
 		SELECT TMP.GOODS_CD
+			  ,TMP.GOODS_NM
 		  FROM TB_TMTB_USING_GOODS_TEMP TMP
 		 WHERE 1=1
 		   AND TMP.REG_NO = #{regNo}
@@ -535,7 +537,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/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

@@ -148,7 +148,7 @@
 									<tr>
 										<th class="dashR">자택주소</th>
 										<td class="dashR" colspan="3">
-											<input type="text" id="homeZipNo" name="homeZipNo" class="w100" readonly="readonly"/>
+											<input type="text" id="homeZipcode" name="homeZipcode" class="w100" readonly="readonly"/>
 											<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr('custInfoForm');">우편번호찾기</button>
 											<br/>
 											<input type="text" id="homeBaseAddr" name="homeBaseAddr" class="w300" readonly="readonly"/>
@@ -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>
@@ -306,7 +307,7 @@
 									<tr>
 										<th>주소<i class="star"></i></th>
 										<td colspan="5">
-											<input type="text" id="recipZipNo" name="recipZipNo" class="w100" maxlength="10" required="required" data-valid-name="주소"/>
+											<input type="text" id="recipZipcode" name="recipZipcode" class="w100" maxlength="10" required="required" data-valid-name="주소"/>
 											<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr('custAddrForm');">우편번호찾기</button>
 											<br/>
 											<input type="text" id="recipBaseAddr" name="recipBaseAddr" class="w300" maxlength="50" required="required" data-valid-name="주소"/>
@@ -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>
@@ -436,6 +439,8 @@
 					<li id="tab10" class="tab">
 						<!-- TAB10 PANELSTYLE -->
 						<div class="panelStyle">
+							<form id="custContactHstForm" name="custContactHstForm" action="#" method="post">
+							<input type="hidden" name="custNo" th:value="${custNo}"/>
 							<h4>회원접촉이력</h4>
 							<table class="frmStyle">
 								<colgroup>
@@ -475,6 +480,7 @@
 							</table>
 							<br/>
 							<div id="custContactList" class="ag-theme-balham" style="width: 100%; height: 420px;"></div>
+							</form>
 						</div>
 						<!-- //TAB10 PANELSTYLE -->
 					</li>
@@ -523,7 +529,6 @@
 	const contactTypeList = gagajf.convertToArray([[${contactTypeList}]]);			//회원접촉유형
 	const contactMethodList = gagajf.convertToArray([[${contactMethodList}]]);		//회원접촉방법
 	const genderGbList = gagajf.convertToArray([[${genderGbList}]]);				// 성별
-	let orgData;
 
 	//구매내역 그리드
 	const columnOrderDefs = [
@@ -602,7 +607,7 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "확인ID", field: "ansId", width: 100, cellClass: 'text-center'},
+		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
 		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
 	];
 
@@ -627,7 +632,7 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "확인ID", field: "ansId", width: 100, cellClass: 'text-center'},
+		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
 		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
 	];
 
@@ -663,7 +668,7 @@
 			}
 		},
 		{headerName: "쿠폰발행 상세사유", field: "pubReasonDtl", width: 300, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -704,7 +709,7 @@
 			}
 		},
 		{headerName: "포인트상세사유", field: "occurDtlDesc", width: 300, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regId", width: 100, cellClass: 'text-center'}
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'}
 	];
 
 	//상품권내역 그리드
@@ -814,7 +819,7 @@
 		{headerName: "수령자", field: "recipNm", width: 100, cellClass: 'text-center'},
 		{headerName: "전화번호", field: "recipTelno", width: 130, cellClass: 'text-center'},
 		{headerName: "휴대전화번호", field: "recipPhnno", width: 130, cellClass: 'text-center'},
-		{headerName: "우편번호", field: "recipZipNo", width: 100, cellClass: 'text-center'},
+		{headerName: "우편번호", field: "recipZipcode", width: 100, cellClass: 'text-center'},
 		{headerName: "기본주소", field: "recipBaseAddr", width: 300, cellClass: 'text-left'},
 		{headerName: "상세주소", field: "recipDtlAddr", width: 150, cellClass: 'text-left'},
 		{
@@ -824,7 +829,7 @@
 			}
 		},
 		{headerName: "삭제", field: "delYn", width: 50, cellClass: 'text-center'},
-		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'},
+		{headerName: "수정자", field: "updNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "수정일시", field: "updDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -849,7 +854,7 @@
 			}
 		},
 		{headerName: "내용", field: "contactContents", width: 1000, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regId", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -862,8 +867,8 @@
 	let gridCounselOptions = gagaAgGrid.getGridOptions(columnCounselDefs);	//1:1문의내역 그리드
 	let gridGoodsQnaOptions = gagaAgGrid.getGridOptions(columnGoodsQnaDefs);//상품문의내역 그리드
 	let gridCouponOptions = gagaAgGrid.getGridOptions(columnCouponDefs);	//쿠폰내역 그리드
-	let gridGiftCardOptions = gagaAgGrid.getGridOptions(columnGiftCardDefs);//상품권내역 그리드
 	let gridPointOptions = gagaAgGrid.getGridOptions(columnPointDefs);		//포인트내역 그리드
+	let gridGiftCardOptions = gagaAgGrid.getGridOptions(columnGiftCardDefs);//상품권내역 그리드
 	let gridReviewOptions = gagaAgGrid.getGridOptions(columnReviewDefs);	//상품평 그리드
 	let gridGradeOptions = gagaAgGrid.getGridOptions(columnGradeDefs);		//등급변경 그리드
 	let gridAddrOptions = gagaAgGrid.getGridOptions(columnAddrDefs);		//주소정보 그리드
@@ -903,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 () {
@@ -968,6 +985,7 @@
 		$('#custAddrForm input[name=custDelvAddrSq]').val('');
 		$('#custAddrForm input[name=recipPhnno]').val('');
 		$('#custAddrForm input[name=recipTelno]').val('');
+		fnDisplayDeliveryCheckBox('N', 'N');
 	});
 
 	// 배송지정보 - 저장버튼
@@ -1037,17 +1055,16 @@
 	});
 
 
-
 	// 회원접촉이력 저장
 	$('#btnSaveContact').on('click', function () {
-		if (!gagajf.validation('#custContact')) {
+		if (!gagajf.validation('#custContactHstForm')) {
 			return;
 		}
 		mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function () {
-				var jsonData = JSON.stringify($('#custContact').serializeObject());
+				var jsonData = JSON.stringify($('#custContactHstForm').serializeObject());
 				gagajf.ajaxJsonSubmit('/customer/contact/create', jsonData, fnSearchContact);
 			}
 		});
@@ -1113,16 +1130,11 @@
 				$('#custAddrForm input[name=telLastNo]').val(telNoSplit[2]);
 			}
 
-			$('#custAddrForm input[name=recipZipNo]').val(event.data.recipZipNo);
+			$('#custAddrForm input[name=recipZipcode]').val(event.data.recipZipcode);
 			$('#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);
 		}
 	};
 
@@ -1153,7 +1165,7 @@
 					let snsType = fnGetSnsType(data.nvJoinId, data.kkJoinId, data.ysJoinId);
 					$('#snsType').text(snsType);
 
-					$('#homeZipNo').val(data.homeZipNo);
+					$('#homeZipcode').val(data.homeZipcode);
 					$('#homeBaseAddr').val(data.homeBaseAddr);
 					$('#homeDtlAddr').val(data.homeDtlAddr);
 					$('#sexGb').text(gagaAgGrid.lookupValue(genderGbList, data.sexGb));
@@ -1162,10 +1174,7 @@
 					fnDisplaySmsAgree(data.smsAgreeYn);				// SMS 수신여부
 					fnDisplayEmail(data.maskingEmail);				// EMAIL
 					fnDisplayCellPhnno(data.maskingCellPhnno);		// 핸드폰
-					fnDisplayManaged(data.managedRsn);			// 관리대상
-
-					//기존데이트 저장
-					orgData = data;
+					fnDisplayManaged(data.managedRsn);				// 관리대상
 
 				}
 			});
@@ -1177,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');
 	};
 
 	//	쿠폰내역 조회
@@ -1200,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;
@@ -1223,25 +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')[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을 이용한 우편번호 팝업 레이어
@@ -1251,13 +1262,13 @@
 			oncomplete: function(data) {
 				// 우편번호와 주소 정보를 해당 필드에 넣는다.
 				if (id === 'custInfoForm') {
-					$('#homeZipNo').val(data.zonecode);
+					$('#homeZipcode').val(data.zonecode);
 					$('#homeBaseAddr').val(cfnGetDaumRoadAddr(data));
 					$('#homeDtlAddr').focus();
 				}
 
 				if (id === 'custAddrForm') {
-					$('#recipZipNo').val(data.zonecode);
+					$('#recipZipcode').val(data.zonecode);
 					$('#recipBaseAddr').val(cfnGetDaumRoadAddr(data));
 					$('#recipDtlAddr').focus();
 				}
@@ -1431,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/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">
@@ -155,6 +152,14 @@
 									</div>
 								</td>
 							</tr>
+							<tr > <!--class="off"-->
+								<th>업체&브랜드상품</th>
+								<td>
+									<div class="padding10" > <!--style="display: none;"-->
+										<div id="gridDuplicateGoodsList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+									</div>
+								</td>
+							</tr>
 						</table>
 					</div>
 				</div>
@@ -261,8 +266,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>-->
@@ -399,6 +405,12 @@
 		{headerName: "구간시퀀스", field: "tmtbSectionSq", width: 150, cellClass: 'text-center', hide: true},
 		{headerName: "할인값시퀀스", field: "tmtbValSq", width: 150, cellClass: 'text-center', hide: true}
 	];
+	// 다른 다다익선 사용중인 중복상품 엑셀 리스트 설정
+	var columnDuplicateGoodsList = [
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center'},
+		{headerName: "상품명", field: "goodsNm", width: 120, cellClass: 'text-center'}
+	];
 
 	// 공급업체 리스트 설정
 	var gridOptionsFGCompanyList = gagaAgGrid.getGridOptions(columnFGCompanyList);
@@ -427,6 +439,10 @@
 	gridOptionsSectionGbList.rowSelection = "multiple";
 	gridOptionsSectionGbList.stopEditingWhenGridLosesFocus = true;
 
+	// 다른 다다익선 사용중인 중복상품 엑셀 리스트 설정
+	var gridOptionsDuplicateGoodsList = gagaAgGrid.getGridOptions(columnDuplicateGoodsList);
+	gridOptionsDuplicateGoodsList.rowSelection = "multiple";
+
 	$(document).ready(function() {
 		// 1.그리드 그리기
 		gagaAgGrid.createGrid("gridFGPromotionCompanyList", gridOptionsFGCompanyList);
@@ -435,6 +451,7 @@
 		gagaAgGrid.createGrid("gridFGExceptGoodsList", gridOptionsFGExceptGoodsList);
 		gagaAgGrid.createGrid("gridApplyBurdenList", gridOptionsApplyBurdenList);
 		gagaAgGrid.createGrid("gridSectionGbList", gridOptionsSectionGbList);
+		gagaAgGrid.createGrid("gridDuplicateGoodsList", gridOptionsDuplicateGoodsList);
 
 		// 2. 그리드 데이터 바인딩
 		if(mode == "U"){
@@ -522,41 +539,25 @@
 		});
 	});
 
-	$('#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, 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++;
+			}
 		});
-	});
+		console.log('checkCnt>>'+checkCnt);
+		if(checkCnt < 1){
+			mcxDialog.alert("기본상품을 1개 이상 지정해주세요.");
+			return false;
+		}else{
+			console.log('통과');
+		}
+	};
 
-	// 저장 버튼 클릭시
-	$('#btnMorebetterSave2').on('click', function() {
+	// 저장
+	$('#btnMorebetterSave').on('click', function() {
 		// validation
 		if (!gagajf.validation('#moreBetterForm'))
 			return false;
@@ -576,84 +577,78 @@
 			$('#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());
-
-
-				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
-				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
-					fnMorebetterFormClose();
-					$('#btnInit').trigger('click');
-					$('#btnSearch').trigger('click');
-				});
+		// 적용상품 그리드에 기본상품 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);
+
+		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.msg);
+			fnMorebetterFormClose();
+			$('#btnInit').trigger('click');
+			$('#btnSearch').trigger('click');
+		}
+	}
 
 	// 공급업체 설정 / 업체 추가 콜백함수
 	var fnSetPopupComapnyInfo = function(result) {

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/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>