쇼핑몰 사이트맵 xml 자동 생성

This reverts commit 7b24a5395f.

src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java

@@ -3,6 +3,7 @@ package com.wb.domainserver.domain.admin.store.sopmal.mapper;
 import java.util.List;
 
 import com.wb.domainserver.domain.admin.store.sopmal.vo.Shop;
+import com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO;
 import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -202,4 +203,7 @@ public interface BOMaSopmalMapper {
 
 	/*전체 쇼핑몰 목록*/
 	List<DataMap> selectSopmalList();
+
+	// XML 수정 임시
+	public List<DataMap> selectSitemapXml(String sopmalCd);
 }

src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java

@@ -19,6 +19,7 @@ import com.wb.domainserver.domain.admin.sys.menu.vo.BOMaMenuVO;
 import com.wb.domainserver.domain.gcone.goods.goodsinfo.mapper.BOGoodsinfoMapper;
 import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
 import lombok.Data;
+import org.apache.commons.text.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -984,4 +985,43 @@ public class BOMaSopmalService {
 		return mapper.selectSopmalList();
 	}
 
+	/**
+	 * 사이트맵 XML
+	 * @param sopmalCd
+	 * @return
+	 */
+	@Transactional
+	public String selectSitemapXml(String sopmalCd) {
+		List<DataMap> resultList = new ArrayList<>();
+		StringBuilder xml = new StringBuilder();
+
+		try {
+			xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+			xml.append("<?xml-stylesheet type=\"text/css\" href=\"https://www.xml-sitemaps.com/css/sitemap.css\"?>");
+			xml.append("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n");
+
+			resultList = mapper.selectSitemapXml(sopmalCd);
+			for (DataMap data : resultList) {
+				xml.append("  <url>");
+				xml.append("       <loc>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("targetUrl"))))
+						.append("</loc>");
+				xml.append("       <lastmod>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("lastModified"))))
+						.append("</lastmod>");
+				xml.append("       <priority>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("priority"))))
+						.append("</priority>");
+				xml.append("  </url>");
+			}
+
+			xml.append("</urlset>");
+		} catch (WnbtRestException wre){
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+
+		return xml.toString();
+	}
 }

src/main/java/com/wb/domainserver/domain/gcone/bbs/bbs/service/BOBbsService.java

@@ -393,6 +393,7 @@ public class BOBbsService {
 				if (vo.getBbscttRedngAuthorDvCd() != null && "01".equals(vo.getBbscttRedngAuthorDvCd())) {
 					vo.setBbscttRedngAuthorDvCd("[all]");
 				} else if (vo.getBbscttRedngAuthorDvCd() != null && "02".equals(vo.getBbscttRedngAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getBbscttRedngAuthorDvCd_c(), "게시판 읽기");
 
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getBbscttRedngAuthorDvCd_c()) {
@@ -431,6 +432,8 @@ public class BOBbsService {
 				if (vo.getBbscttRegistAuthorDvCd() != null && "01".equals(vo.getBbscttRegistAuthorDvCd())) {
 					vo.setBbscttRegistAuthorDvCd("[all]");
 				} else if (vo.getBbscttRegistAuthorDvCd() != null && "02".equals(vo.getBbscttRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getBbscttRegistAuthorDvCd_c(), "게시판 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getBbscttRegistAuthorDvCd_c()) {
 
@@ -465,6 +468,8 @@ public class BOBbsService {
 				if (vo.getAnswRegistAuthorDvCd() != null && "01".equals(vo.getAnswRegistAuthorDvCd())) {
 					vo.setAnswRegistAuthorDvCd("[all]");
 				} else if (vo.getAnswRegistAuthorDvCd() != null && "02".equals(vo.getAnswRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getAnswRegistAuthorDvCd_c(), "답글 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getAnswRegistAuthorDvCd_c()) {
 
@@ -499,6 +504,8 @@ public class BOBbsService {
 				if (vo.getCmRegistAuthorDvCd() != null && "01".equals(vo.getCmRegistAuthorDvCd())) {
 					vo.setCmRegistAuthorDvCd("[all]");
 				} else if (vo.getCmRegistAuthorDvCd() != null && "02".equals(vo.getCmRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getCmRegistAuthorDvCd_c(), "댓글 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getCmRegistAuthorDvCd_c()) {
 
@@ -685,15 +692,21 @@ public class BOBbsService {
 			msgMap.put("bbsid", bbsId);
 
 		} catch (WnbtRestException wre){
-			throw new WnbtRestException(wre.getMessage());
+			throw wre;
 		}  catch (Exception e) {
-
 			log.error(e.getMessage(), e);
+			throw new WnbtRestException("게시판 등록 중 오류가 발생했습니다.", e);
 		}
 
 		return msgMap;
 	}
 
+	private void validateMemberGradeSelection(String[] memberGradeArr, String authorizationName) {
+		if (memberGradeArr == null || memberGradeArr.length == 0) {
+			throw new WnbtRestException(authorizationName + " 권한의 회원등급을 선택해 주세요.");
+		}
+	}
+
 
 	/**
 	 * 게시판 삭제

src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java

@@ -232,6 +232,9 @@ public class BOGnrlbbscttService {
         BOGnrlbbscttVO resultCnt = new BOGnrlbbscttVO();
         switch (bbsTyCd) {
             case "01": //일반게시글 조회
+                log.debug("일반게시글 getServerDv : {}",bbsctt.getServerDv());
+                log.debug("일반게시글 getMbrDvCd : {}",bbsctt.getMbrDvCd());
+                log.debug("일반게시글 getSopmalCd : {}",bbsctt.getSopmalCd());
                 resultCnt = mapper.selectBOGnrlBbscttListCnt(bbsctt);
                 totCnt = resultCnt.getTotCnt();
                 if (StringUtil.isEmpty(bbsctt.getNtcAt())) {/*공지 제외 검색 조건*/
@@ -567,19 +570,11 @@ public class BOGnrlbbscttService {
         Map<String, Object> map = new HashMap<String, Object>();
         // 게시글 연관상품 조회
         List<DataMap> goodsList = new ArrayList<>();
-        DataMap result = new DataMap();
-
         goodsList = mapper.selectBOBbscttDtlGoods(bbsctt);
 
-        /*게시판 설정 > 추천 상품 노출 선택 시 사용자 게시글 상세 상품 노출 */
-        if (!goodsList.isEmpty()) {
-            if ("sopmal".equals(bbsctt.getServerDv())) {
-                result = goodsService.selectBoGoodsRelateList(goodsList);
-            }
-        }
         /*사용자 , 관리자 페이지 구분*/
         if ("sopmal".equals(bbsctt.getServerDv())) {
-            map.put("goodsList", result);
+            map.put("goodsList", goodsList);
         } else {
             map.put("goodsList", goodsList);
         }
@@ -917,6 +912,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 등록 중 오류가 발생했습니다.", e);
         }
 
         return message;
@@ -1103,7 +1099,7 @@ public class BOGnrlbbscttService {
                     }
                 }
                 /*1:1 문의 게시판이 아닌경우만 처리 */
-                if("12".equals(bbsctt.getBbsTyCd())){
+                if(!"12".equals(bbsctt.getBbsTyCd())){
                     //게시글 연관 상품 삭제
                     mapper.deleteBOBbscttGoods(bbsctt);
                     //게시글 연관 상품 등록(fm_boarddata_goods)
@@ -1134,6 +1130,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 수정 중 오류가 발생했습니다.", e);
         }
 
         return message;

src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/vo/BOGnrlbbscttVO.java

@@ -75,6 +75,8 @@ public class BOGnrlbbscttVO extends AbstractVO {
 	@Length(max = 16777215, message = "내용")
 	/** 내용 */
 	private String cn;
+	/** 내용 */
+	private String relateGoodsWords;
 	/** 조회건수 */
 	private Integer inqireCnt;
 	/** 댓글건수 */

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/mapper/BOGoodsBadgeMapper.java

@@ -0,0 +1,17 @@
+package com.wb.domainserver.domain.gcone.goods.badge.mapper;
+
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface BOGoodsBadgeMapper {
+	List<DataMap> selectBOGoodsBadgeList(BOGoodsBadgeVO vo);
+	int selectBOGoodsBadgeCount(BOGoodsBadgeVO vo);
+	int insertBOGoodsBadge(BOGoodsBadgeVO vo);
+	int updateBOGoodsBadge(BOGoodsBadgeVO vo);
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/service/BOGoodsBadgeService.java

@@ -0,0 +1,113 @@
+package com.wb.domainserver.domain.gcone.goods.badge.service;
+
+import com.wb.domainserver.domain.gcone.goods.badge.mapper.BOGoodsBadgeMapper;
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+@Service
+public class BOGoodsBadgeService {
+	private static final Pattern COLOR_PATTERN = Pattern.compile("^#[0-9A-Fa-f]{6}$");
+	private static final Pattern BADGE_CODE_PATTERN = Pattern.compile("^[A-Za-z0-9_-]+$");
+
+	@Autowired
+	private BOGoodsBadgeMapper mapper;
+
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsBadgeVO vo) {
+		return mapper.selectBOGoodsBadgeList(vo);
+	}
+
+	@Transactional
+	public DataMap updateBOGoodsBadgeSetup(BOGoodsBadgeVO request) {
+		DataMap message = new DataMap();
+		String[] badgeCdArr = request.getBadgeCdArr();
+		if (badgeCdArr == null || badgeCdArr.length == 0) {
+			message.put("result", "success");
+			return message;
+		}
+
+		validateArrayLengths(request, badgeCdArr.length);
+		Set<String> newBadgeCodes = new HashSet<>();
+		for (int i = 0; i < badgeCdArr.length; i++) {
+			BOGoodsBadgeVO badge = createBadge(request, i);
+			validateBadge(badge);
+			if ("Y".equals(badge.getNewAt())) {
+				if (!newBadgeCodes.add(badge.getBadgeCd()) || mapper.selectBOGoodsBadgeCount(badge) > 0) {
+					throw new WnbtRestException("이미 등록된 배지코드입니다.");
+				}
+				mapper.insertBOGoodsBadge(badge);
+			} else {
+				if (!badge.getBadgeCd().equals(trim(request.getOriginalBadgeCdArr()[i]))) {
+					throw new WnbtRestException("기존 배지코드는 변경할 수 없습니다.");
+				}
+				if (mapper.selectBOGoodsBadgeCount(badge) == 0) {
+					throw new WnbtRestException("존재하지 않는 배지코드입니다.");
+				}
+				mapper.updateBOGoodsBadge(badge);
+			}
+		}
+
+		message.put("result", "success");
+		return message;
+	}
+
+	private void validateArrayLengths(BOGoodsBadgeVO vo, int size) {
+		if (vo.getOriginalBadgeCdArr() == null || vo.getBadgeNmArr() == null || vo.getFontColorArr() == null || vo.getBgColorArr() == null
+				|| vo.getBorderColorArr() == null || vo.getSortOrdrArr() == null || vo.getUseAtArr() == null
+				|| vo.getNewAtArr() == null || vo.getOriginalBadgeCdArr().length != size || vo.getBadgeNmArr().length != size || vo.getFontColorArr().length != size
+				|| vo.getBgColorArr().length != size || vo.getBorderColorArr().length != size
+				|| vo.getSortOrdrArr().length != size || vo.getUseAtArr().length != size || vo.getNewAtArr().length != size) {
+			throw new WnbtRestException("배지 저장 요청 값이 올바르지 않습니다.");
+		}
+	}
+
+	private BOGoodsBadgeVO createBadge(BOGoodsBadgeVO request, int index) {
+		BOGoodsBadgeVO badge = new BOGoodsBadgeVO();
+		badge.setSopmalCd(request.getSopmalCd());
+		badge.setRegusr(request.getRegusr());
+		badge.setUpdusr(request.getUpdusr());
+		badge.setBadgeCd(trim(request.getBadgeCdArr()[index]));
+		badge.setBadgeNm(trim(request.getBadgeNmArr()[index]));
+		badge.setFontColor(trim(request.getFontColorArr()[index]));
+		badge.setBgColor(trim(request.getBgColorArr()[index]));
+		badge.setBorderColor(trim(request.getBorderColorArr()[index]));
+		badge.setSortOrdr(trim(request.getSortOrdrArr()[index]));
+		badge.setUseAt(trim(request.getUseAtArr()[index]));
+		badge.setNewAt(trim(request.getNewAtArr()[index]));
+		return badge;
+	}
+
+	private void validateBadge(BOGoodsBadgeVO badge) {
+		if (!StringUtils.hasText(badge.getBadgeCd()) || ("Y".equals(badge.getNewAt()) && !BADGE_CODE_PATTERN.matcher(badge.getBadgeCd()).matches())) {
+			throw new WnbtRestException("배지코드는 영문, 숫자, 밑줄, 하이픈만 입력할 수 있습니다.");
+		}
+		if (!StringUtils.hasText(badge.getBadgeNm()) || !COLOR_PATTERN.matcher(badge.getFontColor()).matches()
+				|| !COLOR_PATTERN.matcher(badge.getBgColor()).matches() || !COLOR_PATTERN.matcher(badge.getBorderColor()).matches()) {
+			throw new WnbtRestException("배지명과 색상값을 확인해 주세요.");
+		}
+		try {
+			if (Integer.parseInt(badge.getSortOrdr()) < 0) {
+				throw new NumberFormatException();
+			}
+		} catch (NumberFormatException e) {
+			throw new WnbtRestException("노출순서는 0 이상의 정수만 입력할 수 있습니다.");
+		}
+		if (!("Y".equals(badge.getUseAt()) || "N".equals(badge.getUseAt()))
+				|| !("Y".equals(badge.getNewAt()) || "N".equals(badge.getNewAt()))) {
+			throw new WnbtRestException("배지 저장 요청 값이 올바르지 않습니다.");
+		}
+	}
+
+	private String trim(String value) {
+		return value == null ? "" : value.trim();
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/vo/BOGoodsBadgeVO.java

@@ -0,0 +1,28 @@
+package com.wb.domainserver.domain.gcone.goods.badge.vo;
+
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BOGoodsBadgeVO extends AbstractVO {
+
+	private String sopmalCd;
+	private String badgeCd;
+	private String badgeNm;
+	private String fontColor;
+	private String bgColor;
+	private String borderColor;
+	private String sortOrdr;
+	private String newAt;
+	private String[] badgeCdArr;
+	private String[] originalBadgeCdArr;
+	private String[] badgeNmArr;
+	private String[] fontColorArr;
+	private String[] bgColorArr;
+	private String[] borderColorArr;
+	private String[] sortOrdrArr;
+	private String[] useAtArr;
+	private String[] newAtArr;
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/goods/mapper/BOGoodsMapper.java

@@ -34,6 +34,8 @@ public interface BOGoodsMapper {
 	public Integer selectBOGoodsCount(BOGoodsVO vo);
 	// 일반 상품 목록 리스트
 	public List<DataMap> selectBOGoodsList(BOGoodsVO vo);
+	// 관리자 상품 배지 목록
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsVO vo);
 	// 카테고리별 상품 목록 수정
 	public void updateBOCtgryGoodsList(BOGoodsVO vo);
 	// 관리자 > 일반 상품 상세

src/main/java/com/wb/domainserver/domain/gcone/goods/goods/service/BOGoodsService.java

@@ -76,6 +76,15 @@ public class BOGoodsService {
 		return resultList;
 	}
 
+	/**
+	 * 관리자 상품 배지 목록 조회
+	 * @param vo
+	 * @return
+	 */
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsVO vo) {
+		return mapper.selectBOGoodsBadgeList(vo);
+	}
+
 	/**
 	 * 사용자 > 상품 목록 조회
 	 * @param vo

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java

@@ -101,6 +101,11 @@ public class BOMbrService {
 
         List<DataMap> resultList = null;
         Map<String, Object> resultMap = new HashMap<>();
+
+        BOMaComncdVO comncdVO = new BOMaComncdVO();
+        comncdVO.setGroupCd("SRCH_DV");
+        bOMbrSrchVO.setSrchDv((String) selectCommCode(comncdVO).get(0).get("cd"));
+
         // 건수 조회
         Integer totCnt = mapper.selectBOMbrListTotCnt(bOMbrSrchVO);
         // 건수 갯수 페이징vo에 set

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java

@@ -48,6 +48,9 @@ public class BOMbrSrchVO extends AbstractVO {
 	/*회원고유번호*/
 	private String srchMbrInnb;
 
+	/**검색조건 비교 방식*/
+	private String srchDv;
+
 	/**정렬 방식*/
 	private String sortDv;
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java

@@ -238,13 +238,6 @@ public interface BOOrdrMapper {
      * @return List<LinkedHashMap>
      */
     public List<LinkedHashMap> selectExcelListByOrder(BOOrdrSrchVO ordrSrchVO);
-
-    /**
-     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 엑셀다운로드 발주서
-     * @param ordrSrchVO
-     * @return List<LinkedHashMap>
-     */
-    public List<DataMap> selectExcelListPurchOrder(BOOrdrSrchVO ordrSrchVO);
     /* ####################################
        관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 종료
        #################################### */
@@ -504,6 +497,40 @@ public interface BOOrdrMapper {
        관리자 > 주문 > 주문관리 > 다운로드항목설정 종료
        #################################### */
 
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 시작
+	   #################################### */
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 건수
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public Integer selectExcelListPurchOrderTotCnt(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 목록 조회
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelListPurchOrder(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 엑셀다운로드
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelPoListDwld(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 엑셀 다운로드 일시 업데이트
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public Integer updateExcelDownDt(BOOrdrSrchVO ordrSrchVO);
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 종료
+	   #################################### */
+
     /* ####################################
        사용자 > 마이페이지 > MY쇼핑 > 개인결제 시작
        #################################### */

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java

@@ -682,15 +682,6 @@ public class BOOrdrService{
         return mapper.selectExcelListByOrder(ordrSrchVO);
     }
 
-    /**
-     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 엑셀다운로드 발주서
-     * @param ordrSrchVO
-     * @return List<LinkedHashMap>
-     */
-    public List<DataMap> selectExcelListPurchOrder(BOOrdrSrchVO ordrSrchVO) {
-        return mapper.selectExcelListPurchOrder(ordrSrchVO);
-    }
-
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 주문내역서 정보 조회
      * @param ordrVO
@@ -1307,6 +1298,49 @@ public class BOOrdrService{
        관리자 > 주문 > 주문관리 > 다운로드항목설정 종료
        #################################### */
 
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 시작
+	   #################################### */
+	/**
+	 * 관리자 > 주문 > 주문관리 > 발주서 다운로드 > 발주서 목록 조회
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelPoList(BOOrdrSrchVO ordrSrchVO) {
+		List<DataMap> excelListPO = null;
+
+		// 건수 조회
+		Integer totCnt = mapper.selectExcelListPurchOrderTotCnt(ordrSrchVO);
+		ordrSrchVO.getPaginationInfo().setTotalRecordCount(totCnt);
+
+		if(totCnt > 0) {
+			excelListPO = mapper.selectExcelListPurchOrder(ordrSrchVO);
+		}
+
+		return excelListPO;
+	}
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 발주서 다운로드 > 발주서 다운로드
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelPoListDwld(BOOrdrSrchVO ordrSrchVO) {
+		return mapper.selectExcelPoListDwld(ordrSrchVO);
+	}
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 발주서 다운로드 > 엑셀 다운로드 일시 업데이트
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public Integer updateExcelDownDt(BOOrdrSrchVO ordrSrchVO) {
+		return mapper.updateExcelDownDt(ordrSrchVO);
+	}
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 종료
+	   #################################### */
+
     /* ####################################
        관리자 > 주문 > 개인결제관리 시작
        #################################### */
@@ -3769,7 +3803,7 @@ public class BOOrdrService{
         setleAmt = setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt).compareTo(BigDecimal.ZERO) > 0 ? setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt) : BigDecimal.ZERO;
         // 환율계산
         setleAmtKr = setleAmt.multiply(buyRate);
-        setleAmtKr = setleAmtKr.setScale(0,RoundingMode.HALF_UP);
+        setleAmtKr = setleAmtKr.setScale(-1, RoundingMode.DOWN);
         lmttUseMlg = goodsAmt.subtract(dscntAmt.add(cartCouponDscntAmt));
         log.debug(" 결제 예정 금액 : {}", setleAmt);
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java

@@ -40,6 +40,9 @@ public class BOOrdrShippingVO extends AbstractVO {
     /** 받는자휴대폰번호 */
     private String recpntMbtlnb;
 
+    /** 개인통관부호 */
+    private String cstmclerCd;
+
     /** 배송지역코드 */
     private String dlvylcAreaCd;
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java

@@ -4,6 +4,10 @@ import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.List;
+import java.util.Map;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BOOrdrSrchVO extends AbstractVO{
@@ -82,7 +86,15 @@ public class BOOrdrSrchVO extends AbstractVO{
 
     private String[] srchOrdrInnbs; // 주문번호 배열
 
+    private String[] srchOrdrDlvyInnbs; // 배송번호 배열
+
+    private List<Map<String, String>> srchInnbPairs; // 발주서 주키 배열
+
     private String srchDatePeriod; // 날짜구간코드
+
+    private String[] dlvylcAreaCds; // 배송지역코드
+
+    private String excelInclude; // 엑셀 다운여부
     /*
     ####################################
         전체 주문 조회 검색 추가 조건 종료

src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java

@@ -1569,6 +1569,7 @@ public class BOPayService{
 		//요청코드
 		String authKey			= resultMap.get("kcpSecretKey").toString();
 		String cpId				= resultMap.get("kcpMid").toString();
+//		개발서버 네이버페이 CPID 관련 적용 취소
 		if ("naverpay".equals(payVO.getModGubun())) {
 			authKey			    = resultMap.get("bpaySecretKey").toString();
 			cpId				= resultMap.get("bpayMid").toString();

src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java

@@ -1119,6 +1119,7 @@ public class BORtngudrefndService {
 										payVO.setMemorSetleAt("Y");
 									}
 
+//									개발서버 네이버페이 CPID 구분 적용 취소
 									payVO.setModGubun(setle.getPgCmpnyNm());  //결제키 구분용
 									if ("kiwoom".equals(setle.getPgCmpnyNm())) {
 										payVO.setPayMethod("CARD");

src/main/java/com/wb/domainserver/domain/mngr/goods/badge/controller/GoodsBadgeController.java

@@ -0,0 +1,54 @@
+package com.wb.domainserver.domain.mngr.goods.badge.controller;
+
+import com.wb.domainserver.domain.gcone.goods.badge.service.BOGoodsBadgeService;
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+import com.wb.domainserver.response.WnbtResponse;
+import com.wb.domainserver.response.WnbtResponseBody;
+import com.wb.domainserver.security.authentication.AnonymousUser;
+import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
+import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
+import com.wb.domainserver.security.authorization.annotation.Policy;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/mngr/goods/badge")
+public class GoodsBadgeController {
+
+	@Autowired
+	private BOGoodsBadgeService service;
+
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping("/selectGoodsBadgeSetup")
+	public String selectGoodsBadgeSetup(BOGoodsBadgeVO vo, ModelMap model,
+			@CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		DataMap content = new DataMap();
+		content.put("badgeList", service.selectBOGoodsBadgeList(vo));
+		model.addAttribute("resultMap", content);
+		return "mngr/goods/badge/GoodsBadgeSetupU";
+	}
+
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateGoodsBadgeSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateGoodsBadgeSetup(BOGoodsBadgeVO vo,
+			@CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setSopmalCd(authSopmalCd);
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+		vo.setRegusr(user.getUserInnb());
+		vo.setUpdusr(user.getUserInnb());
+
+		DataMap message = service.updateBOGoodsBadgeSetup(vo);
+		return ResponseEntity.ok(WnbtResponse.builder().resBody(new WnbtResponseBody(message)).build());
+	}
+}

src/main/java/com/wb/domainserver/domain/mngr/goods/goodsmngr/controller/GoodsmngrController.java

@@ -479,10 +479,8 @@ public class GoodsmngrController {
 		List<?> cgo134List = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List);
 
-		// 상품아이콘
+		// 상품 배지
-		maComncdVO = new BOMaComncdVO();
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
-		maComncdVO.setGroupCd("GOODS_ICON");
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
 		content.put("iconList", iconList);
 
 		// 실시간수량배너구분코드
@@ -664,10 +662,7 @@ public class GoodsmngrController {
 
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List); // 재고에 따른 판매
 
-		maComncdVO = new BOMaComncdVO();
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
-		maComncdVO.setGroupCd("GOODS_ICON");
-
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
 
 		//브랜드 목록조회
 
@@ -1466,10 +1461,7 @@ public class GoodsmngrController {
 
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List); // 재고에 따른 판매
 
-		maComncdVO = new BOMaComncdVO();
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
-		maComncdVO.setGroupCd("GOODS_ICON");
-
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
 
 		//브랜드 목록조회
 

src/main/java/com/wb/domainserver/domain/mngr/login/MngrLoginController.java

@@ -197,11 +197,12 @@ public class MngrLoginController {
 			log.debug("리프레쉬 토큰이 없는 경우 realm  :: {}", realm);
 
             //엑세스토큰 삭제
-            CookieUtils.deleteCookie("ACT","/"+realm, request, response);
+            CookieUtils.deleteCookie("ACT","/", request, response);
-            CookieUtils.deleteCookie("token_expire","/"+realm, request, response);
+            CookieUtils.deleteCookie("RFT","/" + realm + "/tokens/refresh", request, response);
+            CookieUtils.deleteCookie("token_expire","/", request, response);
 
             response.sendRedirect("/"+realm);
-
+            return;
         }
 
         //리프레쉬 토큰 있을 경우(존재한다는 자체가 refresh토큰이 만료된 상태가 아님)

src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java

@@ -677,6 +677,8 @@ public class MngrMbrController {
 		content.put("sex", sex);
 		content.put("grad", grad);
 
+		log.debug("BOMbrSrchVO : {}", vo);
+
 		model.addAttribute("resultMap", content);
 //		responseHandler.handleResponse(
 //				sendToResrc.ofPost(RESRC.GCONEBO,"/gcone/mbr/mbr/selectBOMarketingTrgetSrchPopupForm", vo),

src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java

@@ -45,13 +45,12 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -626,137 +625,7 @@ public class OrdrmngrController {
         }
     }
 
-    /**
-     * 발주서 엑셀다운로드
-     * @param response
-     * @param ordrSrchVO
-     * @return ResponseEntity<WnbtResponse>
-     */
-    @Policy(AuthPolicy.PUBLIC)
-    @RequestMapping(value="/selectExcelPoDwldListInqire")
-    public void selectPurchOrderExcelList(HttpServletResponse response, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
-        String secretKey = commonService.selectSecretkey();
-        ordrSrchVO.setSecretKey(secretKey);
-        ordrSrchVO.setSopmalCd(authSopmalCd);
 
-        //엑셀 항목별 제목에 출력될 내용 설정
-        LinkedHashMap<String, String> headerMap	= new LinkedHashMap<String, String>();
-        List<String> headerValues = List.of(
-                "날짜",
-                "업체코드",
-                "업체명",
-                "업체TEL",
-                "업체주소",
-                "특별통관업체명",
-                "특별통관번호",
-                "주문번호",
-                "용도구분",
-                "수취인",
-                "수취인TEL",
-                "수취인HP",
-                "개인통관고유부호",
-                "우편번호",
-                "주소",
-                "나머지주소",
-                "메모",
-                "고객 구입사이트",
-                "무게",
-                "포장개수",
-                "HS CODE",
-                "상거래유형",
-                "내용물",
-                "Unit Value",
-                "상품개수",
-                "Value",
-                "Brand",
-                "사전식품신고 종류",
-                "제조국",
-                "제조회사명",
-                "중문상품명",
-                "Shipper 구입사이트",
-                "판매중개업체명",
-                "판매중개업체 등록부호",
-                "구매(배송)대행업체명",
-                "구매(배송)대행업체 등록부호",
-                "해외판매자명",
-                "해외판매자 등록부호",
-                "사이트 주문번호"
-        );
-        for (int i = 0; i < headerValues.size(); i++) {
-            headerMap.put(String.format("item%02d", i + 1), headerValues.get(i));
-        }
-
-        //엑셀 항목에 출력될 내용 설정
-        List<DataMap> resultList = service.selectExcelListPurchOrder(ordrSrchVO);
-        List<Map<String, Object>> excelList = new ArrayList<>();
-        if (resultList != null) {
-            for (int i = 0; i < resultList.size(); i++) {
-                HashMap<String, Object> dataMap = new HashMap<>();
-//                int cellInt = 1; // 셀 타입 = 숫자
-                List<Object> dataValues = Arrays.asList(
-                        resultList.get(i).get("ordrRceptDt"),
-                        resultList.get(i).get("entrpsCd"),
-                        resultList.get(i).get("entrpsNm"),
-                        resultList.get(i).get("entrpsTel"),
-                        resultList.get(i).get("entrpsAdres"),
-                        resultList.get(i).get("spclCstmclerEntrps"),
-                        resultList.get(i).get("spclCstmclerCd"),
-                        resultList.get(i).get("ordrInnb"),
-                        resultList.get(i).get("purpsDv"),
-                        resultList.get(i).get("recpntNm"),
-                        resultList.get(i).get("recpntMbtlnb"),
-                        resultList.get(i).get("recpntHp"),
-                        resultList.get(i).get("cstmclerCd"),
-                        resultList.get(i).get("dlvylcZip"),
-                        resultList.get(i).get("dlvylcRnmLnbAdres"),
-                        resultList.get(i).get("dlvylcAdresDtl"),
-                        resultList.get(i).get("dlvyMssageCn"),
-                        resultList.get(i).get("cstmrPurchsSite"),
-                        resultList.get(i).get("realWt"),
-                        resultList.get(i).get("packageCnt"),
-                        resultList.get(i).get("hscode"),
-                        resultList.get(i).get("cmmrcTy"),
-                        resultList.get(i).get("cn"),
-                        resultList.get(i).get("unitValue"),
-                        resultList.get(i).get("ordrQy"),
-                        resultList.get(i).get("value"),
-                        resultList.get(i).get("brand"),
-                        resultList.get(i).get("preFoodDcl"),
-                        resultList.get(i).get("provdNation"),
-                        resultList.get(i).get("provdCmpnyNm"),
-                        resultList.get(i).get("chnlngGoodsNm"),
-                        resultList.get(i).get("shipperPurchsSite"),
-                        resultList.get(i).get("sleAgntEntrpsNm"),
-                        resultList.get(i).get("sleAgntEntrpsRegistCd"),
-                        resultList.get(i).get("purchsDlvyAgencyNm"),
-                        resultList.get(i).get("purchsDlvyAgencyRegistCd"),
-                        resultList.get(i).get("ovseaSelerNm"),
-                        resultList.get(i).get("ovseaSelerRegistCd"),
-                        resultList.get(i).get("siteOrdrInnb")
-                );
-
-                for (int j = 0; j < dataValues.size(); j++) {
-                    dataMap.put(String.format("item%02d", j + 1), dataValues.get(j));
-                }
-                excelList.add(dataMap);
-            }
-        }
-
-        /******************************************************************/
-        try {
-            //엑셀생성 및 다운로드
-            LocalDateTime now = LocalDateTime.now();
-            String excelFileName = "발주서_";
-
-            excelFileName += String.format("%s~%s", ordrSrchVO.getSrchStartDate(), ordrSrchVO.getSrchEndDate()); // 엑셀 다운로드 파일명
-
-            String encodedFileName = URLEncoder.encode(excelFileName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
-            ExcelDownloadUtil.createExcel(encodedFileName, headerMap, excelList, response);
-        } catch (IOException ioe) {
-            log.error("엑셀다운로드 중 오류가 발생하였습니다.", ioe);
-            throw new WnbtRestException("엑셀다운로드 중 오류가 발생하였습니다.");
-        }
-    }
 
     /**
      * 주문내역서 팝업 화면 이동
@@ -1192,6 +1061,14 @@ public class OrdrmngrController {
             throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
         }
 
+        String cstmclerCd = ordrShippingVO.getCstmclerCd();
+        String cstmclerCdReg = "^P\\d{12}$";
+        if (cstmclerCd == null || cstmclerCd.trim().isEmpty()) {
+            throw new WnbtRestException("개인통관번호은(는) 필수 입력값입니다.");
+        }else if (!cstmclerCd.matches(cstmclerCdReg)) {
+            throw new WnbtRestException("개인통관번호는 P로 시작하는 13자리 부호만 입력할 수 있습니다.");
+        }
+
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
         ordrShippingVO.setUpdusr(user.getUserInnb());
 
@@ -1818,6 +1695,239 @@ public class OrdrmngrController {
        다운로드항목설정 종료
        #################################### */
 
+	/* ####################################
+	   발주서 관리 시작
+	   #################################### */
+	/**
+	 * 발주서 관리 화면 이동
+	 * @param ordrSrchVO
+	 * @return String
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectExcelPoListInqireRForm")
+	public String selectExcelPoListInqireForm(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		model.addAttribute("sopmalCd", ordrSrchVO.getSopmalCd());
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		// 공통코드 호출
+		BOMaComncdVO bOMaComncdVO	= new BOMaComncdVO();
+		bOMaComncdVO.setGroupCd("NATION_CD"); // 국가코드(NATION_CD)
+		model.addAttribute("nationCdList", bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO));
+
+		return "mngr/ordr/ordrmngr/PurchOrdrListInqireRForm";
+	}
+
+	/**
+	 * 발주서 목록 조회
+	 * @param ordrSrchVO
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value= "/selectExcelPoListInqire" , method = RequestMethod.POST)
+	public String selectExcelPoListInqire(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd){
+		Map<String, Object> content = new HashMap<>();
+		String secretKey = commonService.selectSecretkey();
+		ordrSrchVO.setSecretKey(secretKey);
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		ordrSrchVO.setSrchOrdrSttusCd("35");
+
+		//페이징 처리를 위한 pagination 객체 생성
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(ordrSrchVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(ordrSrchVO.getPageUnit());
+		paginationInfo.setPageSize(paginationProperties.getPageSize());
+		ordrSrchVO.setPaginationInfo(paginationInfo);
+
+		//페이징 처리를 위한 값 설정
+		ordrSrchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		ordrSrchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		ordrSrchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+		//회원 목록 조회 결과 및 페이징정보 넣기
+		content.put("paginationInfo", ordrSrchVO.getPaginationInfo());
+		content.put("resultList", service.selectExcelPoList(ordrSrchVO));
+
+		model.addAttribute("resultMap", content);
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		return "mngr/ordr/ordrmngr/PurchOrdrListInqireR";
+	}
+
+	/**
+	 * 주문내역서 팝업 화면 이동
+	 * @param model
+	 * @param ordrSrchVO
+	 * @return OrdrDtstmnDwldPopupR.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectPurchOrdrDtstmnDwldPopupForm")
+	public String selectPurchOrdrDtstmnDwldPopupForm(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) throws Exception {
+        Map<String, Object> content = new HashMap<>();
+        BOOrdrVO ordrVO = new BOOrdrVO();
+        ordrVO.setOrdrInnbs(ordrSrchVO.getSrchOrdrInnbs());
+		ordrVO.setSopmalCd(authSopmalCd);
+
+		content.put("ordrDtstmnDwldList", service.selectOrdrDtstmnDwld(ordrVO));
+		model.addAttribute("data", content);
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		return "mngr/ordr/ordrmngr/PurchOrdrDtstmnDwldPopupR";
+	}
+
+	/**
+	 * 발주서 엑셀다운로드
+	 * @param response
+	 * @param ordrSrchVO
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectExcelPoDwldListInqire")
+	public void selectPurchOrderExcelList(HttpServletResponse response, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		String secretKey = commonService.selectSecretkey();
+		ordrSrchVO.setSecretKey(secretKey);
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		ordrSrchVO.setSrchOrdrSttusCd("35");
+
+		//엑셀 항목별 제목에 출력될 내용 설정
+		LinkedHashMap<String, String> headerMap	= new LinkedHashMap<String, String>();
+		List<String> headerValues = List.of(
+				"날짜",
+				"업체코드",
+				"업체명",
+				"업체TEL",
+				"업체주소",
+				"특별통관업체명",
+				"특별통관번호",
+				"주문번호",
+				"용도구분",
+				"수취인",
+				"수취인TEL",
+				"수취인HP",
+				"개인통관고유부호",
+				"우편번호",
+				"주소",
+				"나머지주소",
+				"메모",
+				"고객 구입사이트",
+				"무게",
+				"포장개수",
+				"HS CODE",
+				"상거래유형",
+				"내용물",
+				"Unit Value",
+				"상품개수",
+				"Value",
+				"Brand",
+				"사전식품신고 종류",
+				"제조국",
+				"제조회사명",
+				"중문상품명",
+				"Shipper 구입사이트",
+				"판매중개업체명",
+				"판매중개업체 등록부호",
+				"구매(배송)대행업체명",
+				"구매(배송)대행업체 등록부호",
+				"해외판매자명",
+				"해외판매자 등록부호",
+				"사이트 주문번호"
+		);
+		for (int i = 0; i < headerValues.size(); i++) {
+			headerMap.put(String.format("item%02d", i + 1), headerValues.get(i));
+		}
+
+		String[] ordrInnbs = ordrSrchVO.getSrchOrdrInnbs();
+		String[] ordrDlvyInnbs = ordrSrchVO.getSrchOrdrDlvyInnbs();
+		List<Map<String, String>> srchInnbPairs = new ArrayList<>();
+		if (ordrInnbs != null && ordrDlvyInnbs != null) {
+			for (int i = 0; i < ordrInnbs.length; i++) {
+				Map<String, String> pair = new HashMap<>();
+				pair.put("srchOrdrInnb", ordrInnbs[i]);
+				pair.put("srchOrdrDlvyInnb", ordrDlvyInnbs[i]);
+
+				srchInnbPairs.add(pair);
+			}
+		}
+		ordrSrchVO.setSrchInnbPairs(srchInnbPairs);
+
+		//엑셀 항목에 출력될 내용 설정
+		List<DataMap> resultList = service.selectExcelPoListDwld(ordrSrchVO);
+		List<Map<String, Object>> excelList = new ArrayList<>();
+		if (resultList != null) {
+			for (int i = 0; i < resultList.size(); i++) {
+				HashMap<String, Object> dataMap = new HashMap<>();
+//				int cellInt = 1; // 셀 타입 = 숫자
+				List<Object> dataValues = Arrays.asList(
+						resultList.get(i).get("ordrRceptDt"),
+						resultList.get(i).get("entrpsCd"),
+						resultList.get(i).get("entrpsNm"),
+						resultList.get(i).get("entrpsTel"),
+						resultList.get(i).get("entrpsAdres"),
+						resultList.get(i).get("spclCstmclerEntrps"),
+						resultList.get(i).get("spclCstmclerCd"),
+						resultList.get(i).get("ordrInnb"),
+						resultList.get(i).get("purpsDv"),
+						resultList.get(i).get("recpntNm"),
+						resultList.get(i).get("recpntMbtlnb"),
+						resultList.get(i).get("recpntHp"),
+						resultList.get(i).get("cstmclerCd"),
+						resultList.get(i).get("dlvylcZip"),
+						resultList.get(i).get("dlvylcRnmLnbAdres"),
+						resultList.get(i).get("dlvylcAdresDtl"),
+						resultList.get(i).get("dlvyMssageCn"),
+						resultList.get(i).get("cstmrPurchsSite"),
+						resultList.get(i).get("realWt"),
+						resultList.get(i).get("packageCnt"),
+						resultList.get(i).get("hscode"),
+						resultList.get(i).get("cmmrcTy"),
+						resultList.get(i).get("cn"),
+						resultList.get(i).get("unitValue"),
+						resultList.get(i).get("ordrQy"),
+						resultList.get(i).get("value"),
+						resultList.get(i).get("brand"),
+						resultList.get(i).get("preFoodDcl"),
+						resultList.get(i).get("provdNation"),
+						resultList.get(i).get("provdCmpnyNm"),
+						resultList.get(i).get("chnlngGoodsNm"),
+						resultList.get(i).get("shipperPurchsSite"),
+						resultList.get(i).get("sleAgntEntrpsNm"),
+						resultList.get(i).get("sleAgntEntrpsRegistCd"),
+						resultList.get(i).get("purchsDlvyAgencyNm"),
+						resultList.get(i).get("purchsDlvyAgencyRegistCd"),
+						resultList.get(i).get("ovseaSelerNm"),
+						resultList.get(i).get("ovseaSelerRegistCd"),
+						resultList.get(i).get("siteOrdrInnb")
+				);
+
+				for (int j = 0; j < dataValues.size(); j++) {
+					dataMap.put(String.format("item%02d", j + 1), dataValues.get(j));
+				}
+				excelList.add(dataMap);
+			}
+		}
+
+		/******************************************************************/
+		try {
+			//엑셀생성 및 다운로드
+			/*LocalDateTime now = LocalDateTime.now();
+			String excelFileName = "발주서_";
+
+			excelFileName += String.format("%s~%s", ordrSrchVO.getSrchStartDate(), ordrSrchVO.getSrchEndDate()); // 엑셀 다운로드 파일명*/
+
+			String excelFileName = "발주서";
+			String encodedFileName = URLEncoder.encode(excelFileName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
+			ExcelDownloadUtil.createExcel(encodedFileName, headerMap, excelList, response);
+
+			service.updateExcelDownDt(ordrSrchVO);
+		} catch (IOException ioe) {
+			log.error("엑셀다운로드 중 오류가 발생하였습니다.", ioe);
+			throw new WnbtRestException("엑셀다운로드 중 오류가 발생하였습니다.");
+		}
+	}
+	/* ####################################
+	   발주서 관리 종료
+	   #################################### */
+
     /* ####################################
        주문조회 팝업 시작
        #################################### */

src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java

@@ -1573,9 +1573,24 @@ public class CscController {
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
 		DataMap bbsInfo = new DataMap();
 		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+
+		// 등록 기능 사용 여부와 별개로 현재 사용자의 등록 권한을 확인한다.
+		BOGnrlbbscttVO registAuthBbsctt = new BOGnrlbbscttVO();
+		registAuthBbsctt.setSopmalCd(user.getSopmalCd());
+		registAuthBbsctt.setBbsId(bbsctt.getBbsId());
+		registAuthBbsctt.setServerDv("sopmal");
+		registAuthBbsctt.setAuthDv("REGIST");
+		if (user.getUserInnb() > 0) {
+			registAuthBbsctt.setRegusr(user.getUserInnb());
+			registAuthBbsctt.setMbrDvCd(user.getMbrDvCd());
+		} else {
+			registAuthBbsctt.setRegusr(0);
+		}
+		DataMap registAuth = service.selectBOBbscttAuth(registAuthBbsctt);
 		DataMap content = new DataMap();
 
 		content.put("bbsInfo", bbsInfo);
+		content.put("registAuthResult", registAuth.get("resultAuth"));
 		content.put("bbsctt", bbsctt);
 		content.put("resultList", resultList);
 		content.put("paginationInfo", bbsctt.getPaginationInfo());

src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java

@@ -190,6 +190,23 @@ public class GoodsController {
 		return Util.getDeviceType(request)+"/goods/GoodsSrchRForm";
 	}
 
+	/**
+	 * 사용자 화면 상품 배지 목록 조회
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value = "/selectGoodsBadgeList", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<List<DataMap>> selectGoodsBadgeList() {
+		BOGoodsVO vo = new BOGoodsVO();
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		return ResponseEntity.ok(service.selectBOGoodsBadgeList(vo));
+	}
+
 	/**
 	 * 상품 검색 리스트
 	 * @param vo
@@ -288,6 +305,14 @@ public class GoodsController {
 	public String selectGoodsListForm(HttpServletRequest request,
 									  BOGoodsVO vo,
 									  ModelMap model) {
+		String mobileParentCtgryId = request.getParameter("mobileParentCtgryId");
+		String mobileCurrentCtgryId = request.getParameter("mobileCurrentCtgryId");
+		boolean mobileSubCategorySelected = mobileParentCtgryId != null && !mobileParentCtgryId.isBlank()
+				&& mobileCurrentCtgryId != null && !mobileCurrentCtgryId.isBlank();
+		if (mobileSubCategorySelected) {
+			vo.setCtgryId(mobileParentCtgryId);
+		}
+
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		if("01".equals(user.getSysDvCd())){
 			vo.setSopmalCd(user.getSopmalCd());
@@ -305,7 +330,7 @@ public class GoodsController {
 		//검색한 카테고리 정보로 vo 세팅
 		if(!CollectionUtils.isEmpty(goodsCategoryList)){
 			vo.setUpperCtgryId(goodsCategoryList.get(0).get("baseCtgryId").toString());
-			vo.setCtgryId(goodsCategoryList.get(0).get("baseCtgryId").toString());
+			vo.setCtgryId(mobileSubCategorySelected ? mobileCurrentCtgryId : goodsCategoryList.get(0).get("baseCtgryId").toString());
 		}else{
 			vo.setUpperCtgryId("0");
 			vo.setCtgryId("0");
@@ -462,6 +487,7 @@ public class GoodsController {
 
 		// 상세 조회
 		DataMap goodsDtl = service.selectBOGoodsDtlInfo(vo);
+		List<DataMap> goodsBadgeList = service.selectBOGoodsBadgeList(vo);
 
 		//상품 옵션 조회
 		DataMap goodsOptList = service.selectBOGoodsOptionList(vo);
@@ -513,6 +539,7 @@ public class GoodsController {
 		//담기
 		Map<String, Object> content = new HashMap<>();
 		content.put("goodsDtl", goodsDtl);
+		content.put("goodsBadgeList", goodsBadgeList);
 		content.put("evtBannerList", evtBannerList);
 		content.put("goodsOptList", goodsOptList);
 		content.put("GoodsRelateInfo", goodsReleateInfo);

src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java

@@ -198,6 +198,20 @@ public class MainController {
    }
 
 
+    /**
+     * 사이트맵 XML
+     * @return
+     */
+    @Policy(AuthPolicy.PUBLIC)
+    @RequestMapping(value="/sitemap", produces = MediaType.APPLICATION_XML_VALUE)
+    public ResponseEntity<String> selectSitemapXml() {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        String xml = boMaSopmalService.selectSitemapXml(user.getSopmalCd());
+
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_XML).body(xml);
+    }
+
+
    /**
     * 비회원 휴대폰번호 확인
     * @return OrdrDtlR.jsp

src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java

@@ -115,152 +115,12 @@ public class MyActController {
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				model,
-//				"resultMap"
-//		);
 
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQaR";
 	}
-    /**
-     * 상품 Q&A ajax 조회
-     * @param bbsctt
-     * @return String
-     */
-	@Policy(AuthPolicy.PUBLIC)
-	@RequestMapping(value="/selectGoodsQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> selectGoodsQnaInqireAjax(BOGnrlbbscttVO bbsctt){
-		bbsctt.setBbsTyCd("05");
-		bbsctt.setServerDv("sopmal");
-		bbsctt.setReqUrl("mpage");
-		//게시글 노출 항목 설정값과 게시판 목록 조회
-
-		DataMap content = selectBOBbscttListInqire(bbsctt);
-		return ResponseEntity.ok(
-				WnbtResponse.builder()
-						.resBody(new WnbtResponseBody(content))
-						.build()
-		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
-	}
-
-	/**
-	 * 상품 Q&A 파일정보 조회
-	 * @param bbsctt
-	 * @return String
-	 */
-	@Policy(AuthPolicy.PUBLIC)
-	@RequestMapping(value="/selectFileInfo", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> selectFileInfo(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt){
-		bbsctt.setServerDv("sopmal");
-		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
-		if ("01".equals(user.getSysDvCd())) {
-			bbsctt.setSopmalCd(user.getSopmalCd());
-		}
-		DataMap content = new DataMap();
-		content.put("fileInfo", service.selectFileInfo(bbsctt));
-
-		return ResponseEntity.ok(
-				WnbtResponse.builder()
-						.resBody(new WnbtResponseBody(content))
-						.build()
-		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOFileInfo",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
-	}
-	
-	/**
-	 * 상품 Q&A 수정 폼 이동
-	 * @param bbsctt
-	 * @return String
-	 */
-	@Policy(AuthPolicy.PUBLIC)
-	@RequestMapping(value="/selectGoodsQnaDtlUpdtForm")
-	public String selectGoodsQnaDtlUpdtForm(HttpServletRequest request, ModelMap model,BOGnrlbbscttVO bbsctt, BOMbrVO vo){
-		bbsctt.setServerDv("sopmal");
-		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
-		if ("01".equals(user.getSysDvCd())) {
-			bbsctt.setSopmalCd(user.getSopmalCd());
-		}
-		;
-		if (user.getUserInnb() > 0) {
-			if ("mngr".equals(bbsctt.getServerDv())) {
-				bbsctt.setRegusrDvCd("02"); //관리자
-			} else {
-				bbsctt.setRegusrDvCd("01"); //회원
-				bbsctt.setAnswMbtlnb(user.getMbtlnb());
-			}
-		} else {
-			bbsctt.setRegusrDvCd("99");//비회원
-		}
-		bbsctt.setSecretKey(boCommonService.selectSecretkey());
-		// 게시판 설정 정보
-		BOBbsVO bbsVO = new BOBbsVO();
-		// bbsVO에 쇼핑몰코드, 해당 게시판 set
-		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
-		bbsVO.setBbsId(bbsctt.getBbsId());
-		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
-		DataMap bbsInfo = new DataMap();
-		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
-
-		// 게시글 상세 조회
-		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
-		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
-
-		// 분류 조회
-		List<DataMap> itmList = new ArrayList<>();
-		itmList = service.selectBOBbscttItmInqire(bbsctt);
-
-		//추가 항목 조회, 추가항목 항목 조회
-		Map<String, Object> qesitmList = new HashMap<String, Object>();
-		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
-
-		//리뷰항목 리스트, 리뷰항목 항목 리스트
-		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
-		rvwQesitmList = service.selectBOStarItm(bbsctt);
-
-		Map<String, Object> content = new HashMap<String, Object>();
-		content.put("bbsInfo", bbsInfo);
-		content.put("bbscttVO", bbsctt);
-		content.put("bbscttInfo", bbscttInfo);
-		content.put("itmList", itmList);
-		content.put("qesitmList", qesitmList);
-		content.put("rvwQesitmList", rvwQesitmList);
-
-		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttUpdtPopupForm",bbsctt),
-//				model,
-//				"resultMap"
-//		);
-		model.addAttribute("bbsctt", bbsctt);
-
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
-		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
-		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
-
-		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQnaDtlUpdtU";
-	}
 
 	/**
 	 * 일반문의 조회
@@ -276,20 +136,9 @@ public class MyActController {
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				model,
-//				"resultMap"
-//		);
 
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/MyNormalQaR";
 	}
@@ -320,28 +169,22 @@ public class MyActController {
 			bbsctt.setRegusrDvCd("99");//비회원
 		}
 		bbsctt.setSecretKey(boCommonService.selectSecretkey());
-		// 게시판 설정 정보
 		BOBbsVO bbsVO = new BOBbsVO();
-		// bbsVO에 쇼핑몰코드, 해당 게시판 set
 		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
 		bbsVO.setBbsId(bbsctt.getBbsId());
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
 		DataMap bbsInfo = new DataMap();
 		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
 
-		// 게시글 상세 조회
 		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
 		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
 
-		// 분류 조회
 		List<DataMap> itmList = new ArrayList<>();
 		itmList = service.selectBOBbscttItmInqire(bbsctt);
 
-		//추가 항목 조회, 추가항목 항목 조회
 		Map<String, Object> qesitmList = new HashMap<String, Object>();
 		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
 
-		//리뷰항목 리스트, 리뷰항목 항목 리스트
 		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
 		rvwQesitmList = service.selectBOStarItm(bbsctt);
 
@@ -354,21 +197,10 @@ public class MyActController {
 		content.put("rvwQesitmList", rvwQesitmList);
 
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttUpdtPopupForm",bbsctt),
-//				model,
-//				"resultMap"
-//		);
 		model.addAttribute("bbsctt", bbsctt);
 
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/MyNormalQnaDtlUpdtU";
 	}
@@ -384,7 +216,6 @@ public class MyActController {
 		bbsctt.setBbsTyCd("01");
 		bbsctt.setServerDv("sopmal");
 		bbsctt.setReqUrl("mpage");
-		//게시글 노출 항목 설정값과 게시판 목록 조회
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		return ResponseEntity.ok(
@@ -392,10 +223,110 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
+	}
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
+
-//				ReplyFromResrc::getReply
+	/**
-//		);
+	 * 상품 Q&A ajax 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectGoodsQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectGoodsQnaInqireAjax(BOGnrlbbscttVO bbsctt){
+		bbsctt.setBbsTyCd("05");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+
+		DataMap content = selectBOBbscttListInqire(bbsctt);
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 상품 Q&A 파일정보 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectFileInfo", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectFileInfo(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt){
+		bbsctt.setServerDv("sopmal");
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if ("01".equals(user.getSysDvCd())) {
+			bbsctt.setSopmalCd(user.getSopmalCd());
+		}
+		DataMap content = new DataMap();
+		content.put("fileInfo", service.selectFileInfo(bbsctt));
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 상품 Q&A 수정 폼 이동
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectGoodsQnaDtlUpdtForm")
+	public String selectGoodsQnaDtlUpdtForm(HttpServletRequest request, ModelMap model,BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setServerDv("sopmal");
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if ("01".equals(user.getSysDvCd())) {
+			bbsctt.setSopmalCd(user.getSopmalCd());
+		}
+		;
+		if (user.getUserInnb() > 0) {
+			if ("mngr".equals(bbsctt.getServerDv())) {
+				bbsctt.setRegusrDvCd("02"); //관리자
+			} else {
+				bbsctt.setRegusrDvCd("01"); //회원
+				bbsctt.setAnswMbtlnb(user.getMbtlnb());
+			}
+		} else {
+			bbsctt.setRegusrDvCd("99");//비회원
+		}
+		bbsctt.setSecretKey(boCommonService.selectSecretkey());
+		BOBbsVO bbsVO = new BOBbsVO();
+		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
+		bbsVO.setBbsId(bbsctt.getBbsId());
+		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
+		DataMap bbsInfo = new DataMap();
+		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+
+		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
+		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
+
+		List<DataMap> itmList = new ArrayList<>();
+		itmList = service.selectBOBbscttItmInqire(bbsctt);
+
+		Map<String, Object> qesitmList = new HashMap<String, Object>();
+		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
+
+		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
+		rvwQesitmList = service.selectBOStarItm(bbsctt);
+
+		Map<String, Object> content = new HashMap<String, Object>();
+		content.put("bbsInfo", bbsInfo);
+		content.put("bbscttVO", bbsctt);
+		content.put("bbscttInfo", bbscttInfo);
+		content.put("itmList", itmList);
+		content.put("qesitmList", qesitmList);
+		content.put("rvwQesitmList", rvwQesitmList);
+
+		model.addAttribute("resultMap", content);
+		model.addAttribute("bbsctt", bbsctt);
+
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		model.addAttribute("mpageResultMap", content2);
+
+		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQnaDtlUpdtU";
 	}
 
 	/**
@@ -412,23 +343,13 @@ public class MyActController {
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				model,
-//				"resultMap"
-//		);
 
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/MyM2mQaR";
 	}
+
 	/**
 	 * 1:1 문의 ajax 조회
 	 * @param bbsctt
@@ -440,7 +361,6 @@ public class MyActController {
 		bbsctt.setBbsTyCd("12");
 		bbsctt.setServerDv("sopmal");
 		bbsctt.setReqUrl("mpage");
-		//게시글 노출 항목 설정값과 게시판 목록 조회
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		return ResponseEntity.ok(
@@ -448,10 +368,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -480,28 +396,22 @@ public class MyActController {
 			bbsctt.setRegusrDvCd("99");//비회원
 		}
 		bbsctt.setSecretKey(boCommonService.selectSecretkey());
-		// 게시판 설정 정보
 		BOBbsVO bbsVO = new BOBbsVO();
-		// bbsVO에 쇼핑몰코드, 해당 게시판 set
 		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
 		bbsVO.setBbsId(bbsctt.getBbsId());
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
 		DataMap bbsInfo = new DataMap();
 		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
 
-		// 게시글 상세 조회
 		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
 		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
 
-		// 분류 조회
 		List<DataMap> itmList = new ArrayList<>();
 		itmList = service.selectBOBbscttItmInqire(bbsctt);
 
-		//추가 항목 조회, 추가항목 항목 조회
 		Map<String, Object> qesitmList = new HashMap<String, Object>();
 		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
 
-		//리뷰항목 리스트, 리뷰항목 항목 리스트
 		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
 		rvwQesitmList = service.selectBOStarItm(bbsctt);
 
@@ -514,21 +424,10 @@ public class MyActController {
 		content.put("rvwQesitmList", rvwQesitmList);
 
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttUpdtPopupForm",bbsctt),
-//				model,
-//				"resultMap"
-//		);
 		model.addAttribute("bbsctt", bbsctt);
 
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/MyM2mQnaDtlUpdtU";
 	}
@@ -544,28 +443,17 @@ public class MyActController {
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		bbsctt.setSopmalCd(user.getSopmalCd());
 
-		/*리뷰 조회 폼*/
 		DataMap rvwBnefInfo = new DataMap();
 		rvwBnefInfo = service.selectBORvwBnefInfo(bbsctt);
 
 		model.addAttribute("mlgAccmlNtc", rvwBnefInfo);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBORvwBnefInfo",bbsctt),
-//				model,
-//				"mlgAccmlNtc"
-//		);
 
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 		model.addAttribute("vo",bbsctt);
 		return Util.getDeviceType(request)+"/mpage/act/MyRvwRForm";
 	}
+
 	/**
 	 * 나의 리뷰 조회 작성 가능한 리뷰
 	 * @param rvwVO
@@ -579,13 +467,9 @@ public class MyActController {
 
 		Map<String, Object> content = selectBOWritPosblRvw(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOWritPosblRvw",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/WritngPosblRvwR";
 	}
+
 	/**
 	 * 나의 리뷰 조회 작성 가능한 리뷰 ajax(인피니트스크롤)
 	 * @param rvwVO
@@ -603,10 +487,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOWritPosblRvw",rvwVO),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -623,11 +503,6 @@ public class MyActController {
 
 		DataMap content = selectBOMyRvwListInqire(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOMyRvwListInqire",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/MyRvwR";
 	}
 
@@ -649,10 +524,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOMyRvwListInqire",rvwVO),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -665,15 +536,9 @@ public class MyActController {
 	public String selectRvwWritngPopupForm(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO rvwVO){
 		rvwVO.setRvwBbscttDv("rvw");
 		rvwVO.setServerDv("sopmal");
-		//리뷰 등록 가능 여부 true시 등록폼 호출
 
 		Map<String, Object> content = selectBOBbscttRegistPopupForm(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/RvwWritngPopupC";
 	}
@@ -693,30 +558,24 @@ public class MyActController {
 			bbsctt.setSopmalCd(user.getSopmalCd());
 		}
 
-		// 작성자 정보 추출
+		if (user.getUserInnb() > 0) {
-		if (user.getUserInnb() > 0) { //회원 , 관리자
 			bbsctt.setUpdusr(user.getUserInnb());
-		} else { // 비회원
+		} else {
 			bbsctt.setUpdusr(0);
 		}
 
 		Map<String, Object> content = new HashMap<>();
 
-		/*게시글 삭제*/
 		DataMap bbscttDelResult = service.updateBOBbscttDel(bbsctt);
 		content.put("result", bbscttDelResult);
-		/*삭제 성공 시*/
 		if ("success".equals(bbscttDelResult.get("result"))) {
-			//리뷰 관련 처리
 			if ("06".equals(bbsctt.getBbsTyCd()) || "07".equals(bbsctt.getBbsTyCd())) {
 				if (!CollectionUtils.isEmpty(bbsctt.getDelInfoArr())) {
-					/*해당 정보로 마일리지 금액 조회하기*/
 					List<Object> accmlmnyAmtInfoArr = new ArrayList<>();
 					BOMlgVO mlgVo = new BOMlgVO();
 					for (BODelInfoVO delInfo : bbsctt.getDelInfoArr()) {
 						if ("01".equals(delInfo.getRegusrDvCd())) {
-							if ("03".equals(user.getSysDvCd())) { //관리자 삭제시  마일리지 회수
+							if ("03".equals(user.getSysDvCd())) {
-								/*공통 파라미터*/
 								mlgVo.setMbrInnb(String.valueOf(delInfo.getRegusr()));
 								mlgVo.setMbrDvCd(delInfo.getMbrDvCd());
 								mlgVo.setSopmalCd(bbsctt.getSopmalCd());
@@ -728,8 +587,7 @@ public class MyActController {
 								mlgVo.setRegusr(user.getUserInnb());
 								mlgVo.setUpdusr(user.getUserInnb());
 
-								/*마일리지 수동 회수 여부*/
+								if ("N".equals(bbsctt.getMlgPassivRtrvlAt())) {
-								if ("N".equals(bbsctt.getMlgPassivRtrvlAt())) { // 선택 삭제시
 									DataMap accmlmnyAmtInfo = new DataMap();
 									accmlmnyAmtInfo = mlgService.selectBOMlgByBbscttInnb(mlgVo);
 									if (accmlmnyAmtInfo != null) {
@@ -740,7 +598,7 @@ public class MyActController {
 										mlgVo.setAccmlmnyAmt((BigDecimal) accmlmnyAmtInfo.get("accmlmnyAmt"));
 										mlgService.insertBOMngrMlgDn(mlgVo);
 									}
-								} else { //단독 삭제시*/
+								} else {
 									if (delInfo.getRtrvlMlgAmt() != null) {
 										if (delInfo.getRtrvlMlgAmt().compareTo(BigDecimal.valueOf(0)) > 0) {
 											mlgVo.setAccmlmnyAmt(delInfo.getRtrvlMlgAmt());
@@ -749,7 +607,6 @@ public class MyActController {
 									}
 								}
 							}
-							//회원 관련
 							if (delInfo.getRegusr() != null) {
 								BOGnrlbbscttVO mbrSite = new BOGnrlbbscttVO();
 								mbrSite.setSopmalCd(bbsctt.getSopmalCd());
@@ -764,26 +621,20 @@ public class MyActController {
 							}
 						}
 
-						//상품관련 집계와 회원관련 집계는 관리자혹은 사용자가 모두 삭제 시 처리가 되어야해
-						//상품 관련
 						if (delInfo.getGoodsInnb() != null) {
 							BOGoodsVO goodsVO = new BOGoodsVO();
 							goodsVO.setGoodsInnb(String.valueOf(delInfo.getGoodsInnb()));
 							goodsVO.setSopmalCd(bbsctt.getSopmalCd());
-							/*상품정보 > 상품후기건수 차감*/
 							goodsService.updateRvwRelateSm(goodsVO);
 						}
 					}
 				}
-			} else if ("05".equals(bbsctt.getBbsTyCd())) {//상품qna는 상품문의 집계만
+			} else if ("05".equals(bbsctt.getBbsTyCd())) {
-				//상품 관련
 				if (!CollectionUtils.isEmpty(bbsctt.getGoodsInnbArr())) {
 					for (String goodsInnb : bbsctt.getGoodsInnbArr()) {
 						BOGoodsVO goodsVO = new BOGoodsVO();
 						goodsVO.setGoodsInnb(goodsInnb);
 						goodsVO.setSopmalCd(bbsctt.getSopmalCd());
-
-						/*상품정보 > 상품후기건수 차감*/
 						goodsService.updateGoodsInqryCnt(goodsVO);
 					}
 				}
@@ -795,10 +646,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/updateBOBbscttDel",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -814,11 +661,6 @@ public class MyActController {
 
 		Map<String, Object> content = selectBOBbscttRegistPopupForm(vo);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm", vo),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/RvwEasyRegistC";
 	}
 
@@ -830,7 +672,7 @@ public class MyActController {
 	public DataMap selectBOBbscttListInqire(BOGnrlbbscttVO bbsctt) {
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 
-		if ("01".equals(user.getSysDvCd())) {//사용자 조회 일 경우
+		if ("01".equals(user.getSysDvCd())) {
 			bbsctt.setSopmalCd(user.getSopmalCd());
 		}
 
@@ -847,7 +689,6 @@ public class MyActController {
 				bbsctt.setRegusrDvCd("99");
 			}
 		}
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -858,13 +699,10 @@ public class MyActController {
 		bbsctt.setLastIndex(paginationInfo.getLastRecordIndex());
 		bbsctt.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 
-		// 게시글 목록조회
 		Map<String, Object> resultList = new HashMap<String, Object>();
 		resultList = service.selectBOBbscttListInqire(bbsctt);
 
-		// 게시판 설정 정보 조회
 		BOBbsVO bbsVO = new BOBbsVO();
-		// bbsVO에 쇼핑몰코드, 해당 게시판 set
 		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
 		bbsVO.setBbsId(bbsctt.getBbsId());
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
@@ -884,13 +722,11 @@ public class MyActController {
 	 *
 	 */
 	public Map<String, Object> selectBOMpageInfoInqire(BOMbrVO vo) {
-		// 사용자 정보 추출 및 적용
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		vo.setSopmalCd(user.getSopmalCd());
 		vo.setMbrInnb(String.valueOf(user.getUserInnb()));
 		vo.setMbrDvCd(user.getMbrDvCd());
 
-		// 상품 옵션 조회
 		Map<String, Object> message = new HashMap<>();
 		message = boMbrService.selectBOMpageInfoInqire(vo);
 
@@ -915,7 +751,6 @@ public class MyActController {
 		bbsctt.setSopmalCd(user.getSopmalCd());
 		bbsctt.setRegusr(user.getUserInnb());
 		bbsctt.setMbrDvCd(user.getMbrDvCd());
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -948,7 +783,6 @@ public class MyActController {
 		if (!"crm".equals(bbsctt.getReqUrl())) {
 			bbsctt.setRegusr(user.getUserInnb());
 		}
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -958,7 +792,7 @@ public class MyActController {
 		bbsctt.setFirstIndex(paginationInfo.getFirstRecordIndex());
 		bbsctt.setLastIndex(paginationInfo.getLastRecordIndex());
 		bbsctt.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-		// 게시글 목록조회
+
 		Map<String, Object> resultList = new HashMap<String, Object>();
 		resultList = service.selectBOMyRvwListInqire(bbsctt);
 
@@ -974,7 +808,6 @@ public class MyActController {
 	 */
 	public Map<String, Object> selectBOBbscttRegistPopupForm(BOGnrlbbscttVO bbsctt) {
 		Map<String, Object> content = new HashMap<String, Object>();
-		// 작성자 정보 추출
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 
 		if ("01".equals(user.getSysDvCd())) {
@@ -987,9 +820,9 @@ public class MyActController {
 		if (user.getUserInnb() > 0) {
 			bbsctt.setRegusr(user.getUserInnb());
 			if (!"01".equals(user.getSysDvCd())) {
-				bbsctt.setRegusrDvCd("02"); //관리자
+				bbsctt.setRegusrDvCd("02");
 			} else {
-				bbsctt.setRegusrDvCd("01"); //회원
+				bbsctt.setRegusrDvCd("01");
 				bbsctt.setMbrDvCd(user.getMbrDvCd());
 				DataMap mbr = new DataMap();
 				mbr.put("mbrInnb", String.valueOf(bbsctt.getRegusr()));
@@ -1005,31 +838,25 @@ public class MyActController {
 			regusrInfo.setRegusrDvCd(bbsctt.getRegusrDvCd());
 		} else {
 			regusrInfo.setRegusr(0);
-			regusrInfo.setRegusrDvCd("99");//비회원
+			regusrInfo.setRegusrDvCd("99");
 		}
 
-		// 게시판 설정 정보
 		BOBbsVO bbsVO = new BOBbsVO();
-		// bbsVO에 쇼핑몰코드, 해당 게시판 set
 		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
 		bbsVO.setBbsId(bbsctt.getBbsId());
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
 		DataMap bbsInfo = new DataMap();
 		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
 
-		// 분류
 		List<DataMap> itmList = new ArrayList<>();
 		itmList = service.selectBOBbscttItmInqire(bbsctt);
 
-		//리뷰항목 리스트, 리뷰항목 항목 리스트
 		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
 		rvwQesitmList = service.selectBOStarItm(bbsctt);
 
-		//추가항목 리스트, 추가항목 항목 리스트
 		Map<String, Object> qesitmList = new HashMap<String, Object>();
 		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
 
-		//사용자 > 리뷰 상품 조회
 		DataMap rvwGoodsInfo = new DataMap();
 		DataMap mlgInfo = new DataMap();
 		if ("sopmal".equals(bbsctt.getServerDv())) {
@@ -1041,7 +868,6 @@ public class MyActController {
 
 				List<DataMap> rvwItmList = new ArrayList<>();
 				List<DataMap> starItmList = new ArrayList<>();
-				//사용자 별표 평점 역으로 리스트 set(퍼블리싱으로 인한 역처리)
 				if (rvwQesitmList.get("starItmCnList") != null) {
 					rvwItmList = (List<DataMap>) rvwQesitmList.get("starItmCnList");
 					for (int i = rvwItmList.size() - 1; i >= 0; i--) {
@@ -1052,7 +878,6 @@ public class MyActController {
 			}
 		}
 
-		//사용자 > 상품q&a 상품 조회
 		DataMap qnaGoodsInfo = new DataMap();
 		if ("sopmal".equals(bbsctt.getServerDv())) {
 			if ("modal".equals(bbsctt.getReqUrl())) {

src/main/java/com/wb/domainserver/interceptor/mngr/MngrLoggingInterceptor.java

@@ -371,7 +371,9 @@ public class MngrLoggingInterceptor implements HandlerInterceptor {
                 String cookieValue = agentId + ":" + md5(agentId + ":" + md5(System.currentTimeMillis() + ":" + random.nextInt())).substring(5, 10);
                 Cookie agentIdCookie = new Cookie("agent_id", cookieValue);
                 agentIdCookie.setMaxAge(86400 * 365 * 10); // 10년
+                if (!request.getServerName().startsWith("loc.")) {
                     agentIdCookie.setDomain(domain);
+                }
 //                agentIdCookie.setHttpOnly(true);
                 agentIdCookie.setPath("/mngr");
     //            agentIdCookie.setSecure(true);

src/main/java/com/wb/domainserver/security/filter/JwtAuthenticationFilter.java

@@ -51,14 +51,17 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             String accessToken = extractToken(request);
 
 
-            String sysDvCd = RealmContextHolder.getSysDvCdRealm();
             String expireChk = request.getParameter("expire");
             String tokenExpireCookie = CookieUtils.getCookieValue("token_expire", request);
 
             //사용자이면서 ACT가 없는데 tokenExpire는 있을 경우
             //로그인된 사용자지만 엑세스 토큰이 만료되어 다시 재발급 받아야 하는 대상
-            //expire값은 루프 요청 방지
+            //인증 진입점은 만료 쿠키가 남아 있어도 갱신 대상으로 보내지 않는다.
-            if("01".equals(sysDvCd) && !StringUtils.hasText(accessToken) && StringUtils.hasText(tokenExpireCookie) && !"p".equals(expireChk)){
+            //쿠키 삭제가 지연되거나 이전 경로의 쿠키가 남아도 로그인 화면까지는 항상 도달해야 한다.
+            if(!isAuthenticationEndpoint(requestUri, realm)
+                    && !StringUtils.hasText(accessToken)
+                    && StringUtils.hasText(tokenExpireCookie)
+                    && !"p".equals(expireChk)){
                 response.sendRedirect("/"+realm+"/tokens/refresh?redirect_uri=%s&expire=%s".formatted(URLEncoder.encode(UrlExtractor.getOriginalURL(request), StandardCharset.UTF_8), "p"));
                 return;
 
@@ -66,7 +69,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
 
             // accessToken이 있고 refresh Token 요청이 아닌경우
-            if (StringUtils.hasText(accessToken) && !requestUri.contains("/tokens/refresh")) {
+            if (StringUtils.hasText(accessToken) && !isAuthenticationEndpoint(requestUri, realm)) {
                 UserDetails userDetails = customUserDetailService.loadUserByUsername(accessToken);
                 if (userDetails != null) {
                     log.debug("user details: {}", userDetails);
@@ -92,6 +95,15 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     }
 
+    private boolean isAuthenticationEndpoint(String requestUri, String realm) {
+        String realmPath = "/" + realm;
+
+        return requestUri.equals(realmPath)
+                || requestUri.startsWith(realmPath + "/login")
+                || requestUri.equals(realmPath + "/logout")
+                || requestUri.startsWith(realmPath + "/tokens/refresh");
+    }
+
 
 
     private String extractToken(HttpServletRequest request) {

src/main/java/com/wb/domainserver/util/CookieUtils.java

@@ -44,9 +44,12 @@ public abstract class CookieUtils {
         Cookie cookie = new Cookie(name, null);
         cookie.setMaxAge(0);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(true);
         response.addCookie(cookie);
+
+        // loc 환경에서는 이전에 상위 도메인으로 저장된 쿠키도 함께 삭제한다.
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
     }
 
     public static void createCookie(String name, String value, String path, int maxAge, boolean httpOnly, HttpServletRequest request, HttpServletResponse response) {
@@ -58,10 +61,12 @@ public abstract class CookieUtils {
 
         String originHost = UrlExtractor.getOriginalHost(host);
 
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
+
         Cookie cookie = new Cookie(name, value);
         cookie.setMaxAge(maxAge);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(httpOnly);
         response.addCookie(cookie);
     }
@@ -77,7 +82,7 @@ public abstract class CookieUtils {
 
            Cookie cookie = new Cookie(name, value);
            cookie.setPath(path);
-           cookie.setDomain(originHost);
+           setCookieDomain(cookie, request, originHost);
            cookie.setHttpOnly(httpOnly);
            response.addCookie(cookie);
        }
@@ -96,4 +101,30 @@ public abstract class CookieUtils {
         return Map.of("ACTPath", ACTPath, "RFTPath", RFTPath);
     }
 
+    private static void setCookieDomain(Cookie cookie, HttpServletRequest request, String domain) {
+        if (!request.getServerName().startsWith("loc.")) {
+            cookie.setDomain(domain);
+        }
+    }
+
+    private static void deleteLegacyDomainCookie(String name, String path, HttpServletRequest request, HttpServletResponse response, String domain) {
+        if (request.getServerName().startsWith("loc.")) {
+            addDomainDeleteCookie(name, path, domain, response);
+
+            int firstDot = domain.indexOf('.');
+            if (firstDot > 0) {
+                addDomainDeleteCookie(name, path, domain.substring(firstDot + 1), response);
+            }
+        }
+    }
+
+    private static void addDomainDeleteCookie(String name, String path, String domain, HttpServletResponse response) {
+        Cookie domainCookie = new Cookie(name, null);
+        domainCookie.setMaxAge(0);
+        domainCookie.setPath(path);
+        domainCookie.setDomain(domain);
+        domainCookie.setHttpOnly(true);
+        response.addCookie(domainCookie);
+    }
+
 }

src/main/java/com/wb/domainserver/util/file/service/FileStorageService.java

@@ -310,8 +310,13 @@ public class FileStorageService {
 				if(image != null) {
 					thumbnail = image.getScaledInstance(destWidth, destHeight, Image.SCALE_SMOOTH);
 				}
-				BufferedImage convertImage = new BufferedImage(destWidth, destHeight, BufferedImage.TYPE_INT_RGB);
+				BufferedImage convertImage = new BufferedImage(destWidth, destHeight, getImageType(image, file.getOriginalFilename()));
-				convertImage.getGraphics().drawImage(thumbnail, posX, posY, null);
+				Graphics graphics = convertImage.getGraphics();
+				try {
+					graphics.drawImage(thumbnail, posX, posY, null);
+				} finally {
+					graphics.dispose();
+				}
 
 				String ext = FilenameUtils.getExtension(file.getOriginalFilename());
 				ImageIO.write(convertImage, ext, os);
@@ -376,8 +381,13 @@ public class FileStorageService {
 				if(image != null) {
 					thumbnail = image.getScaledInstance(destWidth, destHeight, Image.SCALE_SMOOTH);
 				}
-				BufferedImage convertImage = new BufferedImage(thumbnailWidth, thumbnailHeight, BufferedImage.TYPE_INT_RGB);
+				BufferedImage convertImage = new BufferedImage(thumbnailWidth, thumbnailHeight, getImageType(image, file.getOriginalFilename()));
-				convertImage.getGraphics().drawImage(thumbnail, posX, posY, null);
+				Graphics graphics = convertImage.getGraphics();
+				try {
+					graphics.drawImage(thumbnail, posX, posY, null);
+				} finally {
+					graphics.dispose();
+				}
 
 				ImageIO.write(convertImage, ext, os);
 			}catch (WnbtRestException wre){
@@ -407,6 +417,14 @@ public class FileStorageService {
 		return thumbnail_file;
 	}
 
+	private int getImageType(BufferedImage image, String originalFileName) {
+		String ext = FilenameUtils.getExtension(originalFileName).toLowerCase(Locale.ROOT);
+		boolean supportsAlpha = "png".equals(ext) || "gif".equals(ext);
+		return image != null && image.getColorModel().hasAlpha() && supportsAlpha
+				? BufferedImage.TYPE_INT_ARGB
+				: BufferedImage.TYPE_INT_RGB;
+	}
+
 
 	/**
 	 * combineFilePath 에 지정된 경로에 저장이 됨

src/main/resources/application-stage.yml

@@ -440,9 +440,9 @@ ordr:
 # 서치어드바이저 소유권 코드
 meta-content:
   google:
-    SK: "TcW6Bf9PLSo3GI3I2rwYcm0eTYfcIZCvrzVzupi6du8"
+    SK: "6RUF9UIWIu1nl1WlceNKH25YZG13jcEZHURfLrbSxQU"
   naver:
-    SK: "7fe912d3aa418532cc200050369420a8918bb372"
+    SK: "213a2c785853cdd006af58d286ffec23342a0e8a"
   facebook:
     SK: ""
 

src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml

@@ -1569,5 +1569,124 @@
 		  AND GD.USE_AT = 'Y'
 	</select>
 
+	<!-- 사이트맵 XML -->
+	<select id="selectSitemapXml"
+			parameterType="String"
+			resultType="dataMap">
+		WITH RECURSIVE CATEGORY_TREE AS (
+			SELECT
+				  GC.CTGRY_ID
+				, GC.UPPER_CTGRY_ID
+				, GC.SOPMAL_CD
+				, GC.CTGRY_NM
+				, GC.CTGRY_DEPTH
+				, GC.SORT_ORDR
+				, GC.CTGRY_DV_CD
+				, GC.EXPSR_CD
+				, GC.URL_DV_CD
+				, CASE
+					WHEN GC.URL_DV_CD = '01' THEN ''
+					WHEN GC.URL_DV_CD = '02' THEN GC.URL
+					ELSE NULL
+				END URL
+				, GC.USE_AT
+				, GC.EXPSR_BGN_DT
+				, GC.EXPSR_END_DT
+			FROM GC_CATEGORY GC
+			WHERE GC.SOPMAL_CD = #{sopmalCd}
+			  AND GC.UPPER_CTGRY_ID IS NULL
+			  AND GC.USE_AT = 'Y'
+			  AND (
+				GC.EXPSR_CD = '01'
+				OR (
+					GC.EXPSR_CD = '03'
+					AND SYSDATE() BETWEEN GC.EXPSR_BGN_DT AND GC.EXPSR_END_DT
+				)
+			  )
+			UNION ALL
+			SELECT
+				  CHILD.CTGRY_ID
+				, CHILD.UPPER_CTGRY_ID
+				, CHILD.SOPMAL_CD
+				, CHILD.CTGRY_NM
+				, CHILD.CTGRY_DEPTH
+				, CHILD.SORT_ORDR
+				, CHILD.CTGRY_DV_CD
+				, CHILD.EXPSR_CD
+				, CHILD.URL_DV_CD
+				, CASE
+					WHEN CHILD.URL_DV_CD = '01' THEN
+						CASE
+							WHEN CHILD.CTGRY_DV_CD = '01' THEN CONCAT('/sopmal/goods/selectGoodsListForm?ctgryId=', CHILD.CTGRY_ID)
+							ELSE NULL
+						END
+					WHEN CHILD.URL_DV_CD = '02' THEN CHILD.URL
+					ELSE NULL
+				END URL
+				, CHILD.USE_AT
+				, CHILD.EXPSR_BGN_DT
+				, CHILD.EXPSR_END_DT
+			FROM GC_CATEGORY CHILD
+			INNER JOIN CATEGORY_TREE PARENT
+				ON CHILD.SOPMAL_CD = PARENT.SOPMAL_CD
+			   AND CHILD.UPPER_CTGRY_ID = PARENT.CTGRY_ID
+			WHERE CHILD.USE_AT = 'Y'
+			  AND (
+				CHILD.EXPSR_CD = '01'
+				OR (
+					CHILD.EXPSR_CD = '03'
+					AND SYSDATE() BETWEEN CHILD.EXPSR_BGN_DT AND CHILD.EXPSR_END_DT
+				)
+			  )
+		)
+		SELECT CONCAT(GS.PC_DOMN_ADRES, GC.URL) AS TARGET_URL
+			 , DATE_FORMAT(SYSDATE(), '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
+			 , ROUND(POWER(0.8, GC.CTGRY_DEPTH - 1), 4) AS PRIORITY
+		FROM CATEGORY_TREE GC
+		INNER JOIN GC_SHOP GS
+			ON GC.SOPMAL_CD = GS.SOPMAL_CD
+		WHERE GC.CTGRY_DV_CD != '02'
+		  AND GC.CTGRY_DEPTH != 2
+		UNION
+		SELECT CONCAT(GS.PC_DOMN_ADRES, '/sopmal/goods/selectGoodsDtl?goodsInnb=', GG.GOODS_INNB) AS TARGET_URL
+			 , DATE_FORMAT(GG.UPDT_DT, '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
+			 , ROUND(POWER(0.8, 1), 4) AS PRIORITY
+		FROM GC_GOODS GG
+		INNER JOIN GC_SHOP GS
+				ON GG.SOPMAL_CD = GS.SOPMAL_CD
+		WHERE GG.USE_AT = 'Y'
+		  AND GG.SOPMAL_CD = #{sopmalCd}
+		  AND GG.GOODS_KND_CD = '01'
+		  AND GG.EXPSR_DV_CD = '01'
+		  AND GG.GOODS_STTUS_CD IN ('01', '02')
+		UNION
+		SELECT CONCAT(GS.PC_DOMN_ADRES, '/sopmal/csc/selectBbscttAuth?authDv=CM&amp;bbsTyCd=',
+			CASE
+				WHEN GB.BBS_ID = 'sake_column' THEN '01'
+				WHEN GB.BBS_ID = 'magazine'    THEN '09'
+				ELSE NULL
+			END,
+			'&amp;bbscttInnb=', GB.BBSCTT_INNB,
+			'&amp;reqUrl=subPage&amp;bbsId=', GB.BBS_ID,
+			'&amp;cscAt='
+			 ) AS TARGET_URL
+			 , DATE_FORMAT(GB.UPDT_DT, '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
+			 , ROUND(POWER(0.8, 1), 4) AS PRIORITY
+		FROM GC_BOARDDATA GB
+		INNER JOIN GC_SHOP GS
+			ON GB.SOPMAL_CD = GS.SOPMAL_CD
+		WHERE GB.USE_AT = 'Y'
+		  AND GB.EXPSR_AT = 'Y'
+		  AND (
+			GB.NTCE_PD_SETUP_AT = 'N'
+			OR (
+				GB.NTCE_PD_SETUP_AT = 'Y'
+				AND DATE_FORMAT(SYSDATE(), '%Y-%m-%d') BETWEEN DATE_FORMAT(GB.NTCE_BGN_DE, '%Y-%m-%d') AND DATE_FORMAT(GB.NTCE_END_DE, '%Y-%m-%d')
+			)
+		  )
+		  AND GB.BBS_ID IN ('sake_column', 'magazine')
+		  AND depth = 0
+		ORDER BY PRIORITY DESC
+	</select>
 </mapper>
 

src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml

@@ -1767,6 +1767,7 @@
 		        ,CAST(AES_DECRYPT(UNHEX(FB.ANSW_MBTLNB) , #{secretKey}) AS CHAR(50)) AS ANSW_MBTLNB
 		        ,FB.ANSW_SMS_RECPTN
 				,FB.SJ
+				,FB.RELATE_GOODS_WORDS
 				,FB.SORT_ORDR
 				,FB.USE_AT
 				,IFNULL(FBM.MNGR_NM, '관리자') AS MNGR_NM
@@ -1927,6 +1928,7 @@
 							,CAST(AES_DECRYPT(UNHEX(FB.ANSW_MBTLNB) , #{secretKey}) AS CHAR(50)) AS ANSW_MBTLNB
 					        ,FB.ANSW_SMS_RECPTN
 							,FB.SJ
+							,FB.RELATE_GOODS_WORDS
 							,FB.SORT_ORDR
 							,FB.USE_AT
 					        ,FB.CN_SCRIPT
@@ -2039,6 +2041,9 @@
 		PASSWORD,
 		SJ,
 		CN,
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(relateGoodsWords)">
+			RELATE_GOODS_WORDS,
+		</if>
 		INQIRE_CNT,
 		CM_USE_AT,
 		RECOMEND_CNT,
@@ -2087,6 +2092,9 @@
 		MD5(#{password}),
 		#{sj},
 		#{cn},
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(relateGoodsWords)">
+			#{relateGoodsWords},
+		</if>
 		0,
 		IFNULL(#{cmUseAt},'N'),
 		0,
@@ -2133,6 +2141,9 @@
 		SET
 			SJ = #{sj},
 			CN = #{cn},
+			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(relateGoodsWords)">
+				RELATE_GOODS_WORDS = #{relateGoodsWords},
+			</if>
 			CM_USE_AT =IFNULL(#{cmUseAt},'N'),
 			SORT_ORDR = #{sortOrdr},
 			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(represntFileInfo)">
@@ -2656,19 +2667,43 @@
 				WHERE 1=1
 				AND FGI.GOODS_INNB = FBG.GOODS_INNB
 				AND FGI.SOPMAL_CD = FBG.SOPMAL_CD
-				AND FGI.IMG_KND = '03'
+				AND FGI.IMG_KND = '02'
 				AND FGI.CUT_NB = 1
 				LIMIT 1
-			)IMG
+			) AS IMG
 			,FG.GOODS_NM
-			,FGO.CNSMRPRIC
+			,FG.GOODS_ICON_CD AS ICON_CD_NM_LIST
-			,FGO.SLEPRIC
+			,FG.SRT_DC AS REPRSNT_DC
-			,FGO.STDR_DV_AT
+			,FG.GOODS_STTUS_CD
-			,FN_GET_COMMCODE_NAME('GOODS_STTUS', FG.GOODS_STTUS_CD) AS GOODS_STTUS_NM
+			,FEGI.GOODS_NM_EXPSR_AT
-			,FN_GET_COMMCODE_NAME('EXPSR', FG.EXPSR_DV_CD) AS EXPSR_NM
+			,FEGI.GOODS_NM_EXPSR_ORDR
-			,FBG.ORDR_GOODS_OPTN_INNB
+			,FEGI.REPRSNT_DC_EXPSR_AT
-			,FBG.SOPMAL_CD
+			,FEGI.REPRSNT_DC_EXPSR_ORDR
-			,FBG.RE_ORDER_AT
+			,FEGI.PRIC_EXPSR_AT
+			,FEGI.PRIC_EXPSR_ORDR
+			,FEGI.RVW_EVL_SCRE_EXPSR_AT
+			,FEGI.RVW_EVL_SCRE_EXPSR_ORDR
+			,FEGI.ICON_EXPSR_AT
+			,FEGI.ICON_EXPSR_ORDR
+			,IFNULL(ROUND(FGO.CNSMRPRIC, 0), 0) AS CNSMRPRIC
+			,IFNULL(ROUND(FGO.SLEPRIC, 0), 0) AS SLEPRIC
+			,IFNULL(ROUND(((FGO.CNSMRPRIC - FGO.SLEPRIC) / NULLIF(FGO.CNSMRPRIC, 0)) * 100, 0), 0) AS SLE_PERCENT
+			,IFNULL((SELECT ROUND(AVG(FBA.EVL_SCORE), 1)
+				FROM GC_BOARDDATA_GOODS RBG
+				INNER JOIN GC_BOARDDATA RB ON RB.BBSCTT_INNB = RBG.BBSCTT_INNB AND RB.SOPMAL_CD = RBG.SOPMAL_CD
+				INNER JOIN GC_BOARDMANAGER RBM ON RBM.BBS_ID = RB.BBS_ID AND RBM.SOPMAL_CD = RB.SOPMAL_CD
+				LEFT JOIN GC_BOARDFORM RBF ON RBF.BBS_ID = RBM.BBS_ID AND RBF.SOPMAL_CD = RBM.SOPMAL_CD AND RBF.USE_AT = 'Y' AND RBF.ADIT_ITM_DV_CD = '04'
+				LEFT JOIN GC_BOARD_ADDITM FBA ON FBA.BBSCTT_INNB = RB.BBSCTT_INNB AND FBA.SOPMAL_CD = RB.SOPMAL_CD AND FBA.QESITM_INNB = RBF.QESITM_INNB
+				WHERE RBG.SOPMAL_CD = FG.SOPMAL_CD
+				  AND RBG.GOODS_INNB IN (SELECT CAST(RVW_GROUP_NB AS DECIMAL(10)) FROM GC_GOODS_RVW_V WHERE SOPMAL_CD = FG.SOPMAL_CD AND GOODS_INNB = FG.GOODS_INNB)
+				  AND RB.USE_AT = 'Y' AND RB.DEPTH = 0 AND RBM.BBS_TY_CD IN ('06', '07')), 0) AS AVG_EVL_SCORE
+			,IFNULL((SELECT COUNT(RB.BBSCTT_INNB)
+				FROM GC_BOARDDATA_GOODS RBG
+				INNER JOIN GC_BOARDDATA RB ON RB.BBSCTT_INNB = RBG.BBSCTT_INNB AND RB.SOPMAL_CD = RBG.SOPMAL_CD
+				INNER JOIN GC_BOARDMANAGER RBM ON RBM.BBS_ID = RB.BBS_ID AND RBM.SOPMAL_CD = RB.SOPMAL_CD
+				WHERE RBG.SOPMAL_CD = FG.SOPMAL_CD
+				  AND RBG.GOODS_INNB IN (SELECT CAST(RVW_GROUP_NB AS DECIMAL(10)) FROM GC_GOODS_RVW_V WHERE SOPMAL_CD = FG.SOPMAL_CD AND GOODS_INNB = FG.GOODS_INNB)
+				  AND RB.USE_AT = 'Y' AND RB.DEPTH = 0 AND RBM.BBS_TY_CD IN ('06', '07')), 0) AS CNT_EVL_SCOR
 	FROM GC_BOARDDATA_GOODS FBG
 	INNER JOIN GC_GOODS FG ON
 		FG.GOODS_INNB = FBG.GOODS_INNB
@@ -2676,6 +2711,9 @@
 	INNER JOIN GC_GOODS_OPTION FGO ON
 		FG.GOODS_INNB = FGO.GOODS_INNB
 		AND FG.SOPMAL_CD = FGO.SOPMAL_CD
+	LEFT JOIN GC_GOODS_EXPSR_INFO FEGI ON
+		FG.SOPMAL_CD = FEGI.SOPMAL_CD
+		AND FEGI.USE_AT = 'Y'
 	WHERE 1 = 1
 	AND FG.SOPMAL_CD =#{sopmalCd}
 	AND FBG.BBSCTT_INNB =
@@ -2688,6 +2726,16 @@
 			</otherwise>
 		</choose>
 	AND FGO.STDR_DV_AT = 'Y'
+	<if test="serverDv == 'sopmal'">
+		AND FGO.OPTN_EXPSR_AT = 'Y'
+		AND FGO.USE_AT = 'Y'
+		AND FG.USE_AT = 'Y'
+		AND FG.GOODS_KND_CD = '01'
+		AND FG.GOODS_STTUS_CD IN ('01', '02')
+		AND (FG.EXPSR_DV_CD = '01' OR (FG.EXPSR_DV_CD = '03' AND SYSDATE() BETWEEN FG.EXPSR_BGN_DT AND FG.EXPSR_END_DT))
+		ORDER BY CASE FG.GOODS_STTUS_CD WHEN '02' THEN 1 ELSE 0 END ASC, FBG.REGIST_DT ASC, FBG.GOODS_INNB ASC
+		LIMIT 12
+	</if>
 	</select>
 
 	<!-- 게시글 연관상품 삭제 (게시글 수정시)-->

src/main/resources/mybatis/xml/mapper/gcone/goods/badge/BOGoodsBadgeMapper.xml

@@ -0,0 +1,29 @@
+<?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.wb.domainserver.domain.gcone.goods.badge.mapper.BOGoodsBadgeMapper">
+	<select id="selectBOGoodsBadgeList" parameterType="com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO" resultType="dataMap">
+		SELECT BADGE_CD, BADGE_NM, FONT_COLOR, BG_COLOR, BORDER_COLOR, SORT_ORDR, USE_AT
+		FROM GC_GOODS_BADGE
+		WHERE SOPMAL_CD = #{sopmalCd}
+		ORDER BY SORT_ORDR ASC, BADGE_CD ASC
+	</select>
+
+	<select id="selectBOGoodsBadgeCount" parameterType="com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO" resultType="int">
+		SELECT COUNT(1) FROM GC_GOODS_BADGE WHERE SOPMAL_CD = #{sopmalCd} AND BADGE_CD = #{badgeCd}
+	</select>
+
+	<insert id="insertBOGoodsBadge" parameterType="com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO">
+		INSERT INTO GC_GOODS_BADGE (
+			SOPMAL_CD, BADGE_CD, BADGE_NM, FONT_COLOR, BG_COLOR, BORDER_COLOR, SORT_ORDR, USE_AT, REGUSR, REGIST_DT, UPDUSR, UPDT_DT
+		) VALUES (
+			#{sopmalCd}, #{badgeCd}, #{badgeNm}, #{fontColor}, #{bgColor}, #{borderColor}, #{sortOrdr}, #{useAt}, #{regusr}, SYSDATE(), #{updusr}, SYSDATE()
+		)
+	</insert>
+
+	<update id="updateBOGoodsBadge" parameterType="com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO">
+		UPDATE GC_GOODS_BADGE
+		SET BADGE_NM = #{badgeNm}, FONT_COLOR = #{fontColor}, BG_COLOR = #{bgColor}, BORDER_COLOR = #{borderColor},
+			SORT_ORDR = #{sortOrdr}, USE_AT = #{useAt}, UPDUSR = #{updusr}, UPDT_DT = SYSDATE()
+		WHERE SOPMAL_CD = #{sopmalCd} AND BADGE_CD = #{badgeCd}
+	</update>
+</mapper>

src/main/resources/mybatis/xml/mapper/gcone/goods/goods/BOGoodsMapper.xml

@@ -5,6 +5,20 @@
      상품/사은품 START
     ############################-->
 
+    <!-- 관리자 상품 배지 목록 -->
+    <select id="selectBOGoodsBadgeList" parameterType="com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO" resultType="dataMap">
+        SELECT BADGE_CD AS cd
+             , BADGE_NM AS cdNm
+             , FONT_COLOR AS fontColor
+             , BG_COLOR AS bgColor
+             , BORDER_COLOR AS borderColor
+             , SORT_ORDR AS sortOrdr
+        FROM GC_GOODS_BADGE
+        WHERE SOPMAL_CD = #{sopmalCd}
+          AND USE_AT = 'Y'
+        ORDER BY SORT_ORDR ASC, BADGE_CD ASC
+    </select>
+
     <sql id="goodsWhere">
         <!-- 검색조건 별 검색 -->
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchStr)">
@@ -223,72 +237,86 @@
         <choose>
             <when test="sortDv == 'goodsNmAsc'">
                 <![CDATA[
-					ORDER BY FG.GOODS_NM ASC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , FG.GOODS_NM ASC
 		]]>
             </when>
             <when test="sortDv == 'goodsNmDesc'">
                 <![CDATA[
-					ORDER BY FG.GOODS_NM DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , FG.GOODS_NM DESC
 		]]>
             </when>
             <when test="sortDv == 'slepricAsc'">
                 <![CDATA[
-					ORDER BY SLEPRIC ASC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , SLEPRIC ASC
 		]]>
             </when>
             <when test="sortDv == 'slepricDesc'">
                 <![CDATA[
-					ORDER BY SLEPRIC DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , SLEPRIC DESC
 		]]>
             </when>
             <when test="sortDv == 'cnsmrpricAsc'">
                 <![CDATA[
-					ORDER BY CNSMRPRIC ASC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , CNSMRPRIC ASC
 		]]>
             </when>
             <when test="sortDv == 'cnsmrpricDesc'">
                 <![CDATA[
-					ORDER BY CNSMRPRIC DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , CNSMRPRIC DESC
 		]]>
             </when>
             <when test="sortDv == 'invntryQyAsc'">
                 <![CDATA[
-					ORDER BY INVNTRY_QY ASC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , INVNTRY_QY ASC
 		]]>
             </when>
             <when test="sortDv == 'invntryQyDesc'">
                 <![CDATA[
-					ORDER BY INVNTRY_QY DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , INVNTRY_QY DESC
 		]]>
             </when>
             <when test="sortDv == 'registDtAsc'">
                 <![CDATA[
-					ORDER BY REGIST_DT ASC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , REGIST_DT ASC
 		]]>
             </when>
             <when test="sortDv == 'registDtDesc'">
                 <![CDATA[
-					ORDER BY REGIST_DT DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , REGIST_DT DESC
 		]]>
             </when>
             <when test="sortDv == 'avgEvlScore'">
                 <![CDATA[
-					ORDER BY GCL.GOODS_ORDR, AVG_EVL_SCORE DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , GCL.GOODS_ORDR, AVG_EVL_SCORE DESC
 		]]>
             </when>
             <when test="sortDv == 'cntEvlScor'">
                 <![CDATA[
-					ORDER BY CNT_EVL_SCOR DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , CNT_EVL_SCOR DESC
 		]]>
             </when>
             <when test="sortDv == 'goodsInnbDesc'">
                 <![CDATA[
-					ORDER BY GOODS.GOODS_INNB DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , GOODS.GOODS_INNB DESC
 		]]>
             </when>
             <otherwise>
                 <![CDATA[
-					ORDER BY GCL.GOODS_ORDR, AVG_EVL_SCORE DESC
+					ORDER BY CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+					       , GCL.GOODS_ORDR, AVG_EVL_SCORE DESC
 		                ]]>
             </otherwise>
         </choose>

src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml

@@ -11,24 +11,44 @@
         AND FM.USE_AT = 'Y'
     	]]>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchMbrNm)">
-            <![CDATA[
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND FM.MBR_NM LIKE CONCAT('%', #{srchMbrNm}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
                     AND FM.MBR_NM = #{srchMbrNm}
-    		]]>
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordID)">
-            <![CDATA[
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND FM.MBR_ID LIKE CONCAT('%', #{srchKywordID}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
                     AND FM.MBR_ID = #{srchKywordID}
-    		]]>
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordEmail)">
-            <![CDATA[
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND AES_DECRYPT(UNHEX(FM.EMAIL), #{secretKey}) LIKE CONCAT('%', #{srchKywordEmail}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
                     AND FM.EMAIL = (select HEX(AES_ENCRYPT(#{srchKywordEmail} , #{secretKey})))
-    		]]>
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordMb)">
-            <![CDATA[
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND AES_DECRYPT(UNHEX(FM.MBTLNB), #{secretKey}) LIKE CONCAT('%', #{srchKywordMb}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
                     AND FM.MBTLNB =  (select HEX(AES_ENCRYPT(REPLACE(#{srchKywordMb},'-',''), #{secretKey})))
-    		]]>
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(actionDv)">
             <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(eventYn)">

src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml

@@ -1440,101 +1440,6 @@
                GROUP BY A.ORDR_INNB
                ) EXCEL
     </select>
-
-	<!-- 전체 주문 조회 > 엑셀다운로드 발주서 -->
-	<select id="selectExcelListPurchOrder" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO" resultType="dataMap">
-		SELECT
-			GO.ORDR_RCEPT_DT,
-			'UNIHAN' AS ENTRPS_CD,
-			'UNIHAN CO.,LTD.' AS ENTRPS_NM,
-			'03-5990-2880' AS ENTRPS_TEL,
-			'RM.302,YOTSUYA-AKEBONOBASHI BLDG.,2-14, SUMIYOSHI-CHO, SHINJUKU-KU, TOKYO, 162-0065, JAPAN' AS ENTRPS_ADRES,
-			NULL AS SPCL_CSTMCLER_ENTRPS,
-			NULL AS SPCL_CSTMCLER_CD,
-			GO.ORDR_INNB,
-			1 AS PURPS_DV,
-			GOS.RECPNT_NM,
-			CAST(AES_DECRYPT(UNHEX(GOS.RECPNT_MBTLNB) , #{secretKey}) AS CHAR(50)) AS RECPNT_MBTLNB,
-			NULL AS RECPNT_HP,
-			GOS.CSTMCLER_CD,
-			GOS.DLVYLC_ZIP,
-			CASE
-				WHEN GOS.DLVYLC_ADRES_DV_CD = '01'
-				THEN GOS.DLVYLC_RNM_ADRES
-				ELSE GOS.DLVYLC_LNB_ADRES
-			END DLVYLC_RNM_LNB_ADRES,
-			GOS.DLVYLC_ADRES_DTL,
-			GOS.DLVY_MSSAGE_CN,
-			'www.sake1jan.com' AS CSTMR_PURCHS_SITE,
-			GOIO.REAL_WT,
-			GOIO.PACKAGE_CNT,
-			GOIO.HSCODE,
-			'A' AS CMMRC_TY,
-			CONCAT(GOI.GOODS_NM_EN, ' ', GOIO.OPTN_NM_1, '-', GOIO.OPTN_VAL_1) AS CN,
-			/*원가 관리 시작*/
-			GOIO.SLEPRIC,
-			GOS.DFT_DLVY_AMT,
-			GGC.CSTMS_FEE,
-			(
-			    (GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
-			        * GGC.PLTFOM_FEE
-			        * GGC.EXPCT_TAX
-			) AS EXPCT_TAX_AMT,
-			GGC.EXPCT_TAX,
-			GGC.KR_DLVY_CT,
-			GGC.PLTFOM_FEE,
-			GGC.USD_RATE,
-			GGO.TAXABLE_USD AS UNIT_VALUE,
-			/*원가 관리 종료*/
-			GOIO.ORDR_QY,
-			GGO.TAXABLE_USD * GOIO.ORDR_QY AS VALUE,
-			NULL AS BRAND,
-			NULL AS PRE_FOOD_DCL,
-			NULL AS PROVD_NATION,
-			NULL AS PROVD_CMPNY_NM,
-			NULL AS CHNLNG_GOODS_NM,
-			NULL AS SHIPPER_PURCHS_SITE,
-			NULL AS SLE_AGNT_ENTRPS_NM,
-			NULL AS SLE_AGNT_ENTRPS_REGIST_CD,
-			NULL AS PURCHS_DLVY_AGENCY_NM,
-			NULL AS PURCHS_DLVY_AGENCY_REGIST_CD,
-			NULL AS OVSEA_SELER_NM,
-			GOS.ORDR_DLVY_INNB AS OVSEA_SELER_REGIST_CD,
-			CONCAT(GO.SUBSVC_AT, GOS.DLVYLC_AREA_CD, GOS.ORDR_DLVY_INNB) AS SITE_ORDR_INNB,
-			/*아래부터는 발주서에 포함되지 않음*/
-			GO.ORDR_STTUS_CD,
-			GOI.ORDR_GOODS_INNB,
-			GOI.GOODS_INNB,
-			GOI.GOODS_NM,
-			GOIO.ORDR_GOODS_OPTN_INNB,
-			GOIO.GOODS_OPTN_INNB,
-			GOS.DLVYLC_AREA_CD,
-			GGC.STDR_DE
-		FROM GC_ORDER GO
-		INNER JOIN GC_ORDER_ITEM GOI
-			ON GOI.ORDR_INNB = GO.ORDR_INNB
-			AND GOI.SOPMAL_CD = GO.SOPMAL_CD
-		INNER JOIN GC_ORDER_ITEM_OPTION GOIO
-			ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
-			AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
-		INNER JOIN GC_ORDER_SHIPPING GOS
-			ON GOS.ORDR_DLVY_INNB = GOIO.ORDR_DLVY_INNB
-			AND GOS.SOPMAL_CD = GOIO.SOPMAL_CD
-		INNER JOIN GC_GOODS_OPTION GGO
-			ON GGO.GOODS_OPTN_INNB = GOIO.GOODS_OPTN_INNB
-			AND GGO.GOODS_INNB = GOI.GOODS_INNB
-			AND GGO.SOPMAL_CD = GO.SOPMAL_CD
-		LEFT JOIN GC_GOODS_COST GGC
-			ON GGC.STDR_DE = (
-				SELECT MAX(GGC.STDR_DE)
-				FROM GC_GOODS_COST GGC
-				WHERE GGC.STDR_DE <![CDATA[<=]]> GO.ORDR_RCEPT_DT
-			)
-		WHERE 1 = 1
-			AND GO.ORDR_RCEPT_DT BETWEEN #{srchStartDate} AND #{srchEndDate} ' 23:59:59'
-			AND GOIO.ORDR_STTUS_CD = #{srchOrdrSttusCd}
-			AND GO.SOPMAL_CD = #{sopmalCd}
-	</select>
     <!--
     ####################################
         전체주문 조회 서비스 종료
@@ -2137,6 +2042,7 @@
                 ELSE
                     CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))
                 END AS RECPNT_MBTLNB
+             , FOS.CSTMCLER_CD
              , FOS.DLVYLC_ZIP
              , FOS.DLVYLC_ADRES_DV_CD
              , CASE WHEN FOS.DLVYLC_ADRES_DV_CD = '01'
@@ -2486,6 +2392,9 @@
            SET FOS.RECPNT_NM = #{recpntNm}
              , FOS.RECPNT_TELNB = HEX(AES_ENCRYPT(REPLACE(#{recpntTelnb}, '-', ''), '1df5be2f7e90ae36'))
              , FOS.RECPNT_MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(cstmclerCd)">
+			 , FOS.CSTMCLER_CD = #{cstmclerCd}
+		</if>
              , FOS.DLVYLC_ZIP = #{dlvylcZip}
              , FOS.DLVYLC_ADRES_DV_CD = #{dlvylcAdresDvCd}
              , FOS.DLVYLC_LNB_ADRES = #{dlvylcLnbAdres}
@@ -3019,6 +2928,281 @@
     ####################################
     -->
 
+	<!--
+	####################################
+	관리자 > 주문 > 주문관리 > 발주서 관리 시작
+	####################################
+	-->
+	<!-- 발주서 목록 건수 -->
+	<select id="selectExcelListPurchOrderTotCnt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO" resultType="Integer">
+		SELECT COUNT(1)
+		FROM GC_ORDER GO
+		INNER JOIN GC_ORDER_ITEM GOI
+			ON GOI.ORDR_INNB = GO.ORDR_INNB
+			AND GOI.SOPMAL_CD = GO.SOPMAL_CD
+		INNER JOIN GC_ORDER_ITEM_OPTION GOIO
+			ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+			AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+		INNER JOIN GC_ORDER_SHIPPING GOS
+			ON GOS.ORDR_DLVY_INNB = GOIO.ORDR_DLVY_INNB
+			AND GOS.SOPMAL_CD = GOIO.SOPMAL_CD
+		INNER JOIN GC_GOODS_OPTION GGO
+			ON GGO.GOODS_OPTN_INNB = GOIO.GOODS_OPTN_INNB
+			AND GGO.GOODS_INNB = GOI.GOODS_INNB
+			AND GGO.SOPMAL_CD = GO.SOPMAL_CD
+		LEFT JOIN GC_GOODS_COST GGC
+			ON GGC.STDR_DE = (
+				SELECT MAX(GGC.STDR_DE)
+				FROM GC_GOODS_COST GGC
+				WHERE GGC.STDR_DE <![CDATA[<=]]> GO.ORDR_RCEPT_DT
+			)
+		WHERE 1 = 1
+			AND GOIO.ORDR_STTUS_CD = #{srchOrdrSttusCd}
+			AND GO.SOPMAL_CD = #{sopmalCd}
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dlvylcAreaCds)">
+			AND GOS.DLVYLC_AREA_CD IN
+			<foreach collection="dlvylcAreaCds" item="dlvylcAreaCd" open="(" separator="," close=")">
+				#{dlvylcAreaCd}
+			</foreach>
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(excelInclude, 'N')">
+			AND GOS.EXCEL_DOWN_DT IS NULL
+		</if>
+	</select>
+	
+	<!-- 발주서 목록 조회 -->
+	<select id="selectExcelListPurchOrder" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO" resultType="dataMap">
+		SELECT *
+		FROM (
+			SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM,
+				   TB.*
+			FROM (
+				SELECT
+					GO.ORDR_RCEPT_DT,
+					'UNIHAN' AS ENTRPS_CD,
+					'UNIHAN CO.,LTD.' AS ENTRPS_NM,
+					'03-5990-2880' AS ENTRPS_TEL,
+					'RM.302,YOTSUYA-AKEBONOBASHI BLDG.,2-14, SUMIYOSHI-CHO, SHINJUKU-KU, TOKYO, 162-0065, JAPAN' AS ENTRPS_ADRES,
+					NULL AS SPCL_CSTMCLER_ENTRPS,
+					NULL AS SPCL_CSTMCLER_CD,
+					GO.ORDR_INNB,
+					1 AS PURPS_DV,
+					GOS.RECPNT_NM,
+					CAST(AES_DECRYPT(UNHEX(GOS.RECPNT_MBTLNB) , #{secretKey}) AS CHAR(50)) AS RECPNT_MBTLNB,
+					NULL AS RECPNT_HP,
+					GOS.CSTMCLER_CD,
+					GOS.DLVYLC_ZIP,
+					CASE
+						WHEN GOS.DLVYLC_ADRES_DV_CD = '01'
+						THEN GOS.DLVYLC_RNM_ADRES
+						ELSE GOS.DLVYLC_LNB_ADRES
+					END DLVYLC_RNM_LNB_ADRES,
+					GOS.DLVYLC_ADRES_DTL,
+					GOS.DLVY_MSSAGE_CN,
+					'www.sake1jan.com' AS CSTMR_PURCHS_SITE,
+					GOIO.REAL_WT,
+					GOIO.PACKAGE_CNT,
+					GOIO.HSCODE,
+					'A' AS CMMRC_TY,
+					CONCAT(GOI.GOODS_NM_EN, ' ', GOIO.OPTN_NM_1, '-', GOIO.OPTN_VAL_1) AS CN,
+					/*원가 관리 시작*/
+					GOIO.SLEPRIC,
+					GOS.DFT_DLVY_AMT,
+					GGC.CSTMS_FEE,
+					(
+						(GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+							* GGC.PLTFOM_FEE
+							* GGC.EXPCT_TAX
+					) AS EXPCT_TAX_AMT,
+					GGC.EXPCT_TAX,
+					GGC.KR_DLVY_CT,
+					GGC.PLTFOM_FEE,
+					GGC.USD_RATE,
+					GGO.TAXABLE_USD AS UNIT_VALUE,
+					/*원가 관리 종료*/
+					GOIO.ORDR_QY,
+					GGO.TAXABLE_USD * GOIO.ORDR_QY AS VALUE,
+					NULL AS BRAND,
+					NULL AS PRE_FOOD_DCL,
+					NULL AS PROVD_NATION,
+					NULL AS PROVD_CMPNY_NM,
+					NULL AS CHNLNG_GOODS_NM,
+					NULL AS SHIPPER_PURCHS_SITE,
+					NULL AS SLE_AGNT_ENTRPS_NM,
+					NULL AS SLE_AGNT_ENTRPS_REGIST_CD,
+					NULL AS PURCHS_DLVY_AGENCY_NM,
+					NULL AS PURCHS_DLVY_AGENCY_REGIST_CD,
+					NULL AS OVSEA_SELER_NM,
+					GOS.ORDR_DLVY_INNB AS OVSEA_SELER_REGIST_CD,
+					CONCAT(GO.SUBSVC_AT, GOS.DLVYLC_AREA_CD, GOS.ORDR_DLVY_INNB) AS SITE_ORDR_INNB,
+					GOS.EXCEL_DOWN_DT,
+					/*아래부터는 발주서에 포함되지 않음*/
+					GO.ORDR_STTUS_CD,
+					GOI.ORDR_GOODS_INNB,
+					GOI.GOODS_INNB,
+					GOI.GOODS_NM,
+					GOIO.ORDR_GOODS_OPTN_INNB,
+					GOIO.GOODS_OPTN_INNB,
+					GOS.DLVYLC_AREA_CD,
+					GGC.STDR_DE
+				FROM GC_ORDER GO
+				INNER JOIN GC_ORDER_ITEM GOI
+					ON GOI.ORDR_INNB = GO.ORDR_INNB
+					AND GOI.SOPMAL_CD = GO.SOPMAL_CD
+				INNER JOIN GC_ORDER_ITEM_OPTION GOIO
+					ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+					AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+				INNER JOIN GC_ORDER_SHIPPING GOS
+					ON GOS.ORDR_DLVY_INNB = GOIO.ORDR_DLVY_INNB
+					AND GOS.SOPMAL_CD = GOIO.SOPMAL_CD
+				INNER JOIN GC_GOODS_OPTION GGO
+					ON GGO.GOODS_OPTN_INNB = GOIO.GOODS_OPTN_INNB
+					AND GGO.GOODS_INNB = GOI.GOODS_INNB
+					AND GGO.SOPMAL_CD = GO.SOPMAL_CD
+				LEFT JOIN GC_GOODS_COST GGC
+					ON GGC.STDR_DE = (
+						SELECT MAX(GGC.STDR_DE)
+						FROM GC_GOODS_COST GGC
+						WHERE GGC.STDR_DE <![CDATA[<=]]> GO.ORDR_RCEPT_DT
+					)
+				WHERE 1 = 1
+					AND GOIO.ORDR_STTUS_CD = #{srchOrdrSttusCd}
+					AND GO.SOPMAL_CD = #{sopmalCd}
+					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dlvylcAreaCds)">
+						AND GOS.DLVYLC_AREA_CD IN
+						<foreach collection="dlvylcAreaCds" item="dlvylcAreaCd" open="(" separator="," close=")">
+							#{dlvylcAreaCd}
+						</foreach>
+					</if>
+					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(excelInclude, 'N')">
+						AND GOS.EXCEL_DOWN_DT IS NULL
+					</if>
+				ORDER BY GOS.CSTMCLER_CD ASC
+			) TB
+			WHERE (@rownum:=0)=0
+		) PV
+		LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+	</select>
+	
+	<!-- 발주서 엑셀다운로드 -->
+	<select id="selectExcelPoListDwld" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO" resultType="dataMap">
+		SELECT
+			SYSDATE() AS ORDR_RCEPT_DT,
+			'UNIHAN' AS ENTRPS_CD,
+			'UNIHAN CO.,LTD.' AS ENTRPS_NM,
+			'03-5990-2880' AS ENTRPS_TEL,
+			'RM.302,YOTSUYA-AKEBONOBASHI BLDG.,2-14, SUMIYOSHI-CHO, SHINJUKU-KU, TOKYO, 162-0065, JAPAN' AS ENTRPS_ADRES,
+			NULL AS SPCL_CSTMCLER_ENTRPS,
+			NULL AS SPCL_CSTMCLER_CD,
+			CONCAT(GO.ORDR_INNB, 'A', GOS.ORDR_DLVY_INNB) AS ORDR_INNB,
+			1 AS PURPS_DV,
+			GOS.RECPNT_NM,
+			CAST(AES_DECRYPT(UNHEX(GOS.RECPNT_MBTLNB) , #{secretKey}) AS CHAR(50)) AS RECPNT_MBTLNB,
+			NULL AS RECPNT_HP,
+			GOS.CSTMCLER_CD,
+			GOS.DLVYLC_ZIP,
+			CASE
+				WHEN GOS.DLVYLC_ADRES_DV_CD = '01'
+				THEN GOS.DLVYLC_RNM_ADRES
+				ELSE GOS.DLVYLC_LNB_ADRES
+			END DLVYLC_RNM_LNB_ADRES,
+			GOS.DLVYLC_ADRES_DTL,
+			GOS.DLVY_MSSAGE_CN,
+			'www.sake1jan.com' AS CSTMR_PURCHS_SITE,
+			GOIO.REAL_WT,
+			GOIO.PACKAGE_CNT,
+			GOIO.HSCODE,
+			'A' AS CMMRC_TY,
+			CONCAT(GOI.GOODS_NM_EN, ' ', GOIO.OPTN_NM_1, '-', GOIO.OPTN_VAL_1) AS CN,
+			/*원가 관리 시작*/
+			GOIO.SLEPRIC,
+			GOS.DFT_DLVY_AMT,
+			GGC.CSTMS_FEE,
+			(
+				(GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+					* GGC.PLTFOM_FEE
+					* GGC.EXPCT_TAX
+			) AS EXPCT_TAX_AMT,
+			GGC.EXPCT_TAX,
+			GGC.KR_DLVY_CT,
+			GGC.PLTFOM_FEE,
+			GGC.USD_RATE,
+			GGO.TAXABLE_USD AS UNIT_VALUE,
+			/*원가 관리 종료*/
+			GOIO.ORDR_QY,
+			GGO.TAXABLE_USD * GOIO.ORDR_QY AS VALUE,
+			NULL AS BRAND,
+			NULL AS PRE_FOOD_DCL,
+			NULL AS PROVD_NATION,
+			NULL AS PROVD_CMPNY_NM,
+			NULL AS CHNLNG_GOODS_NM,
+			NULL AS SHIPPER_PURCHS_SITE,
+			NULL AS SLE_AGNT_ENTRPS_NM,
+			NULL AS SLE_AGNT_ENTRPS_REGIST_CD,
+			NULL AS PURCHS_DLVY_AGENCY_NM,
+			NULL AS PURCHS_DLVY_AGENCY_REGIST_CD,
+			NULL AS OVSEA_SELER_NM,
+			GOS.ORDR_DLVY_INNB AS OVSEA_SELER_REGIST_CD,
+			CONCAT(GO.SUBSVC_AT, GOS.DLVYLC_AREA_CD, GOS.ORDR_DLVY_INNB) AS SITE_ORDR_INNB,
+			GOS.EXCEL_DOWN_DT,
+			/*아래부터는 발주서에 포함되지 않음*/
+			GO.ORDR_STTUS_CD,
+			GOI.ORDR_GOODS_INNB,
+			GOI.GOODS_INNB,
+			GOI.GOODS_NM,
+			GOIO.ORDR_GOODS_OPTN_INNB,
+			GOIO.GOODS_OPTN_INNB,
+			GOS.DLVYLC_AREA_CD,
+			GGC.STDR_DE
+		FROM GC_ORDER GO
+		INNER JOIN GC_ORDER_ITEM GOI
+			ON GOI.ORDR_INNB = GO.ORDR_INNB
+			AND GOI.SOPMAL_CD = GO.SOPMAL_CD
+		INNER JOIN GC_ORDER_ITEM_OPTION GOIO
+			ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+			AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+		INNER JOIN GC_ORDER_SHIPPING GOS
+			ON GOS.ORDR_DLVY_INNB = GOIO.ORDR_DLVY_INNB
+			AND GOS.SOPMAL_CD = GOIO.SOPMAL_CD
+		INNER JOIN GC_GOODS_OPTION GGO
+			ON GGO.GOODS_OPTN_INNB = GOIO.GOODS_OPTN_INNB
+			AND GGO.GOODS_INNB = GOI.GOODS_INNB
+			AND GGO.SOPMAL_CD = GO.SOPMAL_CD
+		LEFT JOIN GC_GOODS_COST GGC
+			ON GGC.STDR_DE = (
+				SELECT MAX(GGC.STDR_DE)
+				FROM GC_GOODS_COST GGC
+				WHERE GGC.STDR_DE <![CDATA[<=]]> GO.ORDR_RCEPT_DT
+			)
+		WHERE 1 = 1
+			AND GOIO.ORDR_STTUS_CD = #{srchOrdrSttusCd}
+			AND GO.SOPMAL_CD = #{sopmalCd}
+			AND <foreach collection="srchInnbPairs" item="pair" index="index" open="(" separator=" OR " close=")">
+				(
+					GOS.ORDR_INNB = #{pair.srchOrdrInnb}
+					AND GOS.ORDR_DLVY_INNB = #{pair.srchOrdrDlvyInnb}
+				)
+			</foreach>
+		ORDER BY GOS.CSTMCLER_CD ASC
+	</select>
+
+	<!-- 엑셀 다운로드 일시 업데이트 -->
+	<update id="updateExcelDownDt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO">
+		UPDATE GC_ORDER_SHIPPING GOS
+		SET GOS.EXCEL_DOWN_DT = SYSDATE()
+		WHERE <foreach collection="srchInnbPairs" item="pair" index="index" open="(" separator=" OR " close=")">
+			(
+				GOS.ORDR_INNB = #{pair.srchOrdrInnb}
+				AND GOS.ORDR_DLVY_INNB = #{pair.srchOrdrDlvyInnb}
+			)
+		</foreach>
+	</update>
+	<!--
+	####################################
+	관리자 > 주문 > 주문관리 > 발주서 관리 종료
+	####################################
+	-->
+
     <!--
     ####################################
     관리자 > 주문 > 개인결제관리 시작

src/main/resources/mybatis/xml/mapper/gcone/setup/site/BOSiteMapper.xml

@@ -3003,7 +3003,11 @@ FROM (
 		 	) CPN ON GOODS.SOPMAL_CD = CPN.SOPMAL_CD
 		     	  AND GOODS.GOODS_INNB = CPN.GOODS_INNB
 		     WHERE 1 = 1
-		ORDER BY GOODS.RELM_DV_CD , GOODS.S_ORDR, GOODS.I_ORDR, GOODS.EXPSR_ORDR
+		ORDER BY GOODS.RELM_DV_CD
+		       , GOODS.S_ORDR
+		       , GOODS.I_ORDR
+		       , CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+		       , GOODS.EXPSR_ORDR
 
 
 				]]>
@@ -3905,7 +3909,11 @@ FROM (
 		 	) CPN ON GOODS.SOPMAL_CD = CPN.SOPMAL_CD
 		     	  AND GOODS.GOODS_INNB = CPN.GOODS_INNB
     WHERE 1 = 1
-	ORDER BY GOODS.RELM_DV_CD , GOODS.S_ORDR, GOODS.I_ORDR, GOODS.GOODS_ORDR
+	ORDER BY GOODS.RELM_DV_CD
+	       , GOODS.S_ORDR
+	       , GOODS.I_ORDR
+	       , CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
+	       , GOODS.GOODS_ORDR
 
 
 		]]>
@@ -4954,7 +4962,10 @@ FROM (
 		 	) CPN ON GOODS.SOPMAL_CD = CPN.SOPMAL_CD
 		     	  AND GOODS.GOODS_INNB = CPN.GOODS_INNB
 		     WHERE 1 = 1
-		ORDER BY GOODS.RELM_DV_CD , GOODS.S_ORDR, GOODS.I_ORDR
+		ORDER BY GOODS.RELM_DV_CD
+		       , GOODS.S_ORDR
+		       , GOODS.I_ORDR
+		       , CASE GOODS.GOODS_STTUS_CD WHEN '01' THEN 0 WHEN '02' THEN 1 WHEN '03' THEN 2 ELSE 3 END
 
 
 

src/main/resources/static/mobile/css/default.css

@@ -4269,6 +4269,9 @@ body {
 .header--sub:has(.headerTab) ~ .content-wrap {
   padding-top: 96px;
 }
+.header--sub:has(.mobile-about-menu) ~ .content-wrap {
+  padding-top: 96px;
+}
 .header--sub::before {
   content: "";
   position: absolute;
@@ -5706,6 +5709,17 @@ body {
   color: #16191d;
   font-weight: 400;
 }
+.mainNotice__customerContact-alwaysonbottom {
+  position: fixed;
+  left: 10px;
+  bottom: 60px;
+  z-index: 10;
+}
+.icon_kakao-customer-service {
+  width: 72px;
+  height: 72px;
+  background-image: url(../images/icon_kakao_customer.png);
+}
 
 .notice__title {
   display: inline-block;

src/main/resources/static/pc/css/default.css

@@ -5560,20 +5560,36 @@ main {
 }
 .quick-menu__customer-service {
   position: relative;
+  cursor: pointer;
 }
 .quick-menu__customer-service__num {
   position: absolute;
-  bottom: 24px;
+  top: 80%;
   left: 50%;
-  transform: translateX(-50%);
+  width: 100%;
-  font-size: 24px;
+  transform: translate(-50%, -50%);
+  font-size: 14px;
   line-height: 1;
   font-weight: 700;
   color: #212529;
+  text-align: center;
+}
+.quick-menu__customer-service-alwaysonbottom {
+  position: fixed;
+  left: 20px;
+  bottom: 20px;
+  z-index: 10;
 }
 .quick-menu > * + * {
   margin-top: 16px;
 }
+.icon_kakao-customer-service {
+  width: 108px;
+  height: 108px;
+  background-image: url(../images/icon_kakao_customer.png);
+  /* 이미지 그림자 */
+  filter: drop-shadow(0px 3px 4px rgba(0, 0, 0, 0.15));
+}
 
 .recentProductSlick {
   width: 100%;

src/main/webapp/WEB-INF/views/comm/Include.jsp

@@ -53,6 +53,42 @@
 <!-- 스크립트 -->
 <script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
 <script src="<c:url value='/js/sopmal/common.js'/>"></script>
+<script>
+    (function () {
+        var badgeMap = {};
+
+        function applyBadge(element) {
+            var badge = badgeMap[element.dataset.badgeCd.toLowerCase()];
+            if (!badge) { return; }
+            element.textContent = badge.cdNm || element.textContent;
+            if (badge.fontColor) { element.style.setProperty('color', badge.fontColor, 'important'); }
+            if (badge.bgColor) { element.style.setProperty('background-color', badge.bgColor, 'important'); }
+            if (badge.borderColor) { element.style.setProperty('border-color', badge.borderColor, 'important'); }
+        }
+
+        function applyBadges(root) {
+            if (root.nodeType === Node.ELEMENT_NODE && root.matches('.product-badge[data-badge-cd]')) {
+                applyBadge(root);
+            }
+            if (root.querySelectorAll) {
+                root.querySelectorAll('.product-badge[data-badge-cd]').forEach(applyBadge);
+            }
+        }
+
+        function initialize() {
+            fetch('/sopmal/goods/selectGoodsBadgeList')
+                .then(function (response) { return response.ok ? response.json() : []; })
+                .then(function (badgeList) {
+                    badgeList.forEach(function (badge) { badgeMap[badge.cd.toLowerCase()] = badge; });
+                    applyBadges(document);
+                    new MutationObserver(function (mutations) {
+                        mutations.forEach(function (mutation) { mutation.addedNodes.forEach(applyBadges); });
+                    }).observe(document.documentElement, { childList: true, subtree: true });
+                });
+        }
+        document.addEventListener('DOMContentLoaded', initialize);
+    }());
+</script>
 <script src="<c:url value='/pc/js/script.js'/>" defer></script>
 <script src="<c:url value='/js/sopmal/gcone.js'/>"></script>
 
@@ -489,3 +525,10 @@
 <div class="loadingImg" style="display:none; position: relative; z-index: 1010;">
     <div class="loding_popup_wrap"><img src="/mobile/images/loading.svg" alt="loading"></div>
 </div>
+<!--고객센터 아이콘-->
+<div class="quick-menu__customer-service-alwaysonbottom"
+     onclick="window.open('http://pf.kakao.com/_xjxjHxnX', '_blank');">
+    <i class="icon icon_kakao-customer-service"></i>
+    <span class="visually-hidden">고객센터</span>
+<%--	<span class="quick-menu__customer-service__num">문의는 카톡으로 </span>--%>
+</div>

src/main/webapp/WEB-INF/views/comm/mobile/Header.jsp

@@ -35,6 +35,28 @@
                 </div>
             </div>
         </div>
+        <c:if test="${param.mobileAboutMenuAt eq 'Y' && not empty param.mobileParentCtgryId}">
+            <c:set var="mobileAboutCurrentCtgryId" value="${param.mobileCurrentCtgryId}"/>
+            <nav class="home-category mobile-about-menu" aria-label="하위 메뉴">
+                <div class="home-category__content">
+                <ul class="home-category__list">
+                    <c:forEach var="topMenuList" items="${sopmallInfo.menuList}">
+                        <c:if test="${topMenuList.ctgryDvCd eq '01' && topMenuList.rnum eq '3' && topMenuList.upperCtgryId eq param.mobileParentCtgryId && topMenuList.menuExpsrAt eq 'Y'}">
+                            <c:if test="${empty mobileAboutCurrentCtgryId}">
+                                <c:set var="mobileAboutCurrentCtgryId" value="${topMenuList.ctgryId}"/>
+                            </c:if>
+                            <li class="home-category__item<c:if test="${topMenuList.ctgryId eq mobileAboutCurrentCtgryId}"> active</c:if>">
+                                <a href="<c:out value="${topMenuList.url}"/><c:choose><c:when test="${fn:contains(topMenuList.url, '?')}">&amp;</c:when><c:otherwise>?</c:otherwise></c:choose>mobileParentCtgryId=<c:out value="${param.mobileParentCtgryId}"/>&amp;mobileAboutMenuAt=Y&amp;mobileCurrentCtgryId=<c:out value="${topMenuList.ctgryId}"/>"
+                                   class="home-category__link">
+                                    <c:out value="${topMenuList.ctgryNm}"/>
+                                </a>
+                            </li>
+                        </c:if>
+                    </c:forEach>
+                </ul>
+                </div>
+            </nav>
+        </c:if>
     </div>
 <script>
     //뒤로가기 이벤트 부여, 각 페이지 마다 이벤트 삭제 후 다른 이벤트 사용 가능

src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp

@@ -32,6 +32,42 @@
 <!-- 스크립트 -->
 <script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
 <script src="/mobile/js/script.js" defer=""></script>
+<script>
+    (function () {
+        var badgeMap = {};
+
+        function applyBadge(element) {
+            var badge = badgeMap[element.dataset.badgeCd.toLowerCase()];
+            if (!badge) { return; }
+            element.textContent = badge.cdNm || element.textContent;
+            if (badge.fontColor) { element.style.setProperty('color', badge.fontColor, 'important'); }
+            if (badge.bgColor) { element.style.setProperty('background-color', badge.bgColor, 'important'); }
+            if (badge.borderColor) { element.style.setProperty('border-color', badge.borderColor, 'important'); }
+        }
+
+        function applyBadges(root) {
+            if (root.nodeType === Node.ELEMENT_NODE && root.matches('.product-badge[data-badge-cd]')) {
+                applyBadge(root);
+            }
+            if (root.querySelectorAll) {
+                root.querySelectorAll('.product-badge[data-badge-cd]').forEach(applyBadge);
+            }
+        }
+
+        function initialize() {
+            fetch('/sopmal/goods/selectGoodsBadgeList')
+                .then(function (response) { return response.ok ? response.json() : []; })
+                .then(function (badgeList) {
+                    badgeList.forEach(function (badge) { badgeMap[badge.cd.toLowerCase()] = badge; });
+                    applyBadges(document);
+                    new MutationObserver(function (mutations) {
+                        mutations.forEach(function (mutation) { mutation.addedNodes.forEach(applyBadges); });
+                    }).observe(document.documentElement, { childList: true, subtree: true });
+                });
+        }
+        document.addEventListener('DOMContentLoaded', initialize);
+    }());
+</script>
 <script src="<c:url value='/js/gcone.js'/>"></script>
 
 <script src="/mobile/js/bottom-sheet.js" defer=""></script>
@@ -1034,10 +1070,11 @@
                                                 <c:if test="${topMenuList.gnbExpsrAt eq 'Y'}">
                                                     <c:if test="${topMenuList.rnum eq '2'}">
                                                         <c:set var="mDpth3Chk" value="N"/>
+																		<c:set var="mobileAboutParentAt" value="${topMenuList.ctgryNm eq 'ABOUT'}"/>
                                                         <li class="isSub list">
                                                         <div class="isSubDv">
-                                                            <a href="<c:out value="${topMenuList.url}"/>" class="depth"><c:out value ="${topMenuList.ctgryNm}"/><em class="visually-hidden">상세내용닫기</em></a>
+									<a href="<c:out value="${topMenuList.url}"/><c:choose><c:when test="${fn:contains(topMenuList.url, '?')}">&amp;</c:when><c:otherwise>?</c:otherwise></c:choose>mobileParentCtgryId=<c:out value="${topMenuList.ctgryId}"/><c:if test="${topMenuList.ctgryNm eq 'ABOUT'}">&amp;mobileAboutMenuAt=Y</c:if>" class="depth"><c:out value ="${topMenuList.ctgryNm}"/><em class="visually-hidden">상세내용닫기</em></a>
-                                                            <a href="<c:out value="${topMenuList.url}"/>" class="moer"></a>
+									<a href="<c:out value="${topMenuList.url}"/><c:choose><c:when test="${fn:contains(topMenuList.url, '?')}">&amp;</c:when><c:otherwise>?</c:otherwise></c:choose>mobileParentCtgryId=<c:out value="${topMenuList.ctgryId}"/><c:if test="${topMenuList.ctgryNm eq 'ABOUT'}">&amp;mobileAboutMenuAt=Y</c:if>" class="moer"></a>
                                                         </div>
                                                     </c:if>
                                                     <c:if test="${topMenuList.rnum eq '3'}">
@@ -1046,7 +1083,7 @@
                                                             <c:set var="mDpth3Chk" value="Y"/>
                                                             <ul class="view">
                                                         </c:if>
-                                                        <li><a href='<c:out value="${topMenuList.url}"/>'><c:out value ="${topMenuList.ctgryNm}"/></a></li>
+																				<li><a href="<c:out value="${topMenuList.url}"/><c:choose><c:when test="${fn:contains(topMenuList.url, '?')}">&amp;</c:when><c:otherwise>?</c:otherwise></c:choose>mobileParentCtgryId=<c:out value="${topMenuList.upperCtgryId}"/>&amp;mobileCurrentCtgryId=<c:out value="${topMenuList.ctgryId}"/><c:if test="${mobileAboutParentAt}">&amp;mobileAboutMenuAt=Y</c:if>"><c:out value ="${topMenuList.ctgryNm}"/></a></li>
                                                     </c:if>
                                                     <c:if test="${topMenuList.rnum < 4}">
                                                         <c:set var="chkUpperMenuCd" value="${topMenuList.upperCtgryId}"/>
@@ -1197,6 +1234,12 @@
 
 <div id="mbrMarktClauseAgreeDiv"></div>
 
+<%--고객센터 아이콘--%>
+<div class="mainNotice__customerContact-alwaysonbottom" style="display: none;"
+     onclick="window.open('http://pf.kakao.com/_xjxjHxnX', '_blank');">
+    <i class="icon icon_kakao-customer-service"></i>
+</div>
+
 <script>
 
 /*최초 로그인시 마케팅 수신동의를 받지 않았을 경우 마케팅 수신동의 팝업 띄우기*/
@@ -1235,6 +1278,16 @@ $(document).ready(function() {
     if(locationUrl.includes("selectMbrPurchsForm")){
 		document.cookie = 'marktAgreeAt=P; path=/'
 	}
+
+	$(document).ready(function() {
+		var $notice = $('.mainNotice__customerContact-alwaysonbottom');
+
+		if ($('.tab-bar').length) {
+			$notice.fadeIn(500);
+		} else if ($('.productDetail').length) {
+			$notice.css('bottom', '70px').fadeIn(500);
+		}
+	});
 })
 
 //광고 수신동의여부 수정

src/main/webapp/WEB-INF/views/comm/mobile/MainHeader.jsp

@@ -66,7 +66,7 @@
 								<c:if test="${topMenuList.ctgryDvCd eq '01' && topMenuList.menuExpsrAt eq 'Y'}">
 									<c:if test="${topMenuList.rnum eq '2'}">
 										<li class="home-category__item">
-											<a href="<c:out value="${topMenuList.url}"/>" onclick="setTopMenuCode()" <c:if test="${not empty topMenuList.menuChrColor}"> style="color:${topMenuList.menuChrColor};"</c:if>><c:out value ="${topMenuList.ctgryNm}"/></a>
+											<a href="<c:out value="${topMenuList.url}"/><c:choose><c:when test="${fn:contains(topMenuList.url, '?')}">&amp;</c:when><c:otherwise>?</c:otherwise></c:choose>mobileParentCtgryId=<c:out value="${topMenuList.ctgryId}"/><c:if test="${topMenuList.ctgryNm eq 'ABOUT'}">&amp;mobileAboutMenuAt=Y</c:if>" onclick="setTopMenuCode()" <c:if test="${not empty topMenuList.menuChrColor}"> style="color:${topMenuList.menuChrColor};"</c:if>><c:out value ="${topMenuList.ctgryNm}"/></a>
 										</li>
 									</c:if>
 								</c:if>

src/main/webapp/WEB-INF/views/index.jsp

@@ -104,10 +104,10 @@
         										                                	<c:forEach items="${fn:split(case02.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         								                                                <c:choose>
         								                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         								                                                    </c:when>
         								                                                    <c:otherwise>
-        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         								                                                    </c:otherwise>
         								                                                </c:choose>
         					                                            			</c:forEach>
@@ -282,10 +282,10 @@
         								                                            	<c:forEach items="${fn:split(case04.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         									                                                <c:choose>
         									                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         									                                                    </c:when>
         									                                                    <c:otherwise>
-        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         									                                                    </c:otherwise>
         									                                                </c:choose>
         						                                            			</c:forEach>
@@ -414,10 +414,10 @@
         								                                            	<c:forEach items="${fn:split(case05.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         									                                                <c:choose>
         									                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         									                                                    </c:when>
         									                                                    <c:otherwise>
-        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        									                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         									                                                    </c:otherwise>
         									                                                </c:choose>
         						                                            			</c:forEach>
@@ -521,10 +521,10 @@
         									                                            	<c:forEach items="${fn:split(case04.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         										                                                <c:choose>
         										                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         										                                                    </c:when>
         										                                                    <c:otherwise>
-        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         										                                                    </c:otherwise>
         										                                                </c:choose>
         							                                            			</c:forEach>
@@ -614,10 +614,10 @@
         									                                            	<c:forEach items="${fn:split(case06.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         										                                                <c:choose>
         										                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         										                                                    </c:when>
         										                                                    <c:otherwise>
-        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        										                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         										                                                    </c:otherwise>
         										                                                </c:choose>
         							                                            			</c:forEach>
@@ -727,10 +727,10 @@
         						                                            	<c:forEach items="${fn:split(case07.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         							                                                <c:choose>
         							                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        							                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        							                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         							                                                    </c:when>
         							                                                    <c:otherwise>
-        							                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        							                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         							                                                    </c:otherwise>
         							                                                </c:choose>
         				                                            			</c:forEach>
@@ -863,10 +863,10 @@
         							                                            	<c:forEach items="${fn:split(case08.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
         								                                                <c:choose>
         								                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
         								                                                    </c:when>
         								                                                    <c:otherwise>
-        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+        								                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
         								                                                    </c:otherwise>
         								                                                </c:choose>
         					                                            			</c:forEach>
@@ -1272,13 +1272,14 @@
         			                    </div>
         		                    </c:if>
         		                </div>
-<%--        		                <div class="quick-menu__customer-service">--%>
+								<%--<div class="quick-menu__customer-service"
-<%--        		                    <i class="icon icon_quick-customer-service"></i>--%>
+									 onclick="window.open('http://pf.kakao.com/_xjxjHxnX', '_blank');">
-<%--        		                    <span class="visually-hidden">고객센터</span>--%>
+									<i class="icon icon_kakao-customer-service"></i>
-<%--        		                    <span class="quick-menu__customer-service__num">--%>
+									<span class="visually-hidden">고객센터</span>
-<%--        		                        ${ fn:replace(resultMap.operAt.cscTelnb, '-', '<br>')  }--%>
+									<span class="quick-menu__customer-service__num">
-<%--        		                    </span>--%>
+										문의는 카톡으로
-<%--        		                </div>--%>
+									</span>
+								</div>--%>
         		                <div class="quick-menu__to-top">
         		                    <button><i class="icon icon_quick-to-top"></i><span class="visually-hidden">위로
         		                            가기</span></button>
@@ -1532,10 +1533,10 @@
 																	<c:forEach items="${fn:split(case02.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																		<c:choose>
 																			<c:when test="${fn:contains(iconCdNm, '-')}">
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																			</c:when>
 																			<c:otherwise>
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																			</c:otherwise>
 																		</c:choose>
 																	</c:forEach>
@@ -1710,10 +1711,10 @@
 																		<c:forEach items="${fn:split(case04.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																			<c:choose>
 																				<c:when test="${fn:contains(iconCdNm, '-')}">
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																				</c:when>
 																				<c:otherwise>
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																				</c:otherwise>
 																			</c:choose>
 																		</c:forEach>
@@ -1842,10 +1843,10 @@
 																		<c:forEach items="${fn:split(case05.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																			<c:choose>
 																				<c:when test="${fn:contains(iconCdNm, '-')}">
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																				</c:when>
 																				<c:otherwise>
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																				</c:otherwise>
 																			</c:choose>
 																		</c:forEach>
@@ -1949,10 +1950,10 @@
 																			<c:forEach items="${fn:split(case04.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																				<c:choose>
 																					<c:when test="${fn:contains(iconCdNm, '-')}">
-																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																					</c:when>
 																					<c:otherwise>
-																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																					</c:otherwise>
 																				</c:choose>
 																			</c:forEach>
@@ -2042,10 +2043,10 @@
 																			<c:forEach items="${fn:split(case06.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																				<c:choose>
 																					<c:when test="${fn:contains(iconCdNm, '-')}">
-																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																					</c:when>
 																					<c:otherwise>
-																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																						<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																					</c:otherwise>
 																				</c:choose>
 																			</c:forEach>
@@ -2155,10 +2156,10 @@
 																<c:forEach items="${fn:split(case07.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																	<c:choose>
 																		<c:when test="${fn:contains(iconCdNm, '-')}">
-																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																		</c:when>
 																		<c:otherwise>
-																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																		</c:otherwise>
 																	</c:choose>
 																</c:forEach>
@@ -2291,10 +2292,10 @@
 																	<c:forEach items="${fn:split(case08.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																		<c:choose>
 																			<c:when test="${fn:contains(iconCdNm, '-')}">
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																			</c:when>
 																			<c:otherwise>
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																			</c:otherwise>
 																		</c:choose>
 																	</c:forEach>
@@ -3055,9 +3056,9 @@
 
 						if (iconCdNm.includes('-')) {
 							let temp = upper.replace(/-/g, ' ');
-							str += '<span class="product-badge ' + lower + '">' + temp + '</span>';
+							str += '<span class="product-badge ' + lower + '" data-badge-cd="' + iconCdNm + '">' + temp + '</span>';
 						} else {
-							str += '<span class="product-badge ' + lower + '">' + upper + '</span>';
+							str += '<span class="product-badge ' + lower + '" data-badge-cd="' + iconCdNm + '">' + upper + '</span>';
 						}
 					});
 				}

src/main/webapp/WEB-INF/views/mngr/bbs/bbsmngr/BbsDtlUpdtU.jsp

@@ -1553,6 +1553,29 @@
                                             </td>
                                         </c:if>
                                     </tr>
+                                    <c:if test="${resultMap.bbsVo.bbsTyCd eq '01'}">
+                                        <tr>
+                                            <th>추천 상품 노출</th>
+                                            <td colspan="3">
+                                                <div class="td-inner">
+                                                    <div class="custom-radio-container">
+                                                        <div class="custom-radio">
+                                                            <input type="radio" id="recomendGoodsExpsrAt-y"
+                                                                   name="recomendGoodsExpsrAt"
+                                                                   value="Y" ${f:setChecked(resultMap.bbsVo.recomendGoodsExpsrAt, 'Y') } />
+                                                            <label for="recomendGoodsExpsrAt-y">사용</label>
+                                                        </div>
+                                                        <div class="custom-radio">
+                                                            <input type="radio" id="recomendGoodsExpsrAt-n"
+                                                                   name="recomendGoodsExpsrAt"
+                                                                   value="N" ${f:setChecked(resultMap.bbsVo.recomendGoodsExpsrAt, 'N') } />
+                                                            <label for="recomendGoodsExpsrAt-n">미사용</label>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </c:if>
                                     </tbody>
                                 </table>
                             </div>

src/main/webapp/WEB-INF/views/mngr/bbs/bbsmngr/BbsRegistC.jsp

@@ -948,7 +948,8 @@
                                                             <input type="radio" id="write${cgn024.cd }"
                                                                    name="bbscttRegistAuthorDvCd"
                                                                    value="${cgn024.cd }"  ${attrCheck }
-                                                                   onclick="fn_click_check('bbscttRegistAuthorDvCd', 'all');">
+                                                                   onclick="fn_change_event('bbscttRegistAuthorDvCd');
+                                                                            fn_click_check('bbscttRegistAuthorDvCd', 'all');">
                                                             <label for="write${cgn024.cd }"><c:out
                                                                     value="${cgn024.cdNm }"/></label>
                                                         </div>
@@ -2042,13 +2043,25 @@
                 url		: url,
                 data	: paramsArray,
                 success : function(data) {
+                    const result = JSON.parse(data.resBody.result);
+                    const bbsId = result.bbsid;
+                    if (result.message !== 'success' || !bbsId) {
+                        alert('게시판 등록에 실패했습니다. 다시 시도해 주세요.');
+                        return;
+                    }
+
                     alert('<spring:message code="success.common.insert"/>');
-                    const bbsId = JSON.parse(data.resBody.result).bbsid;
                     <%-- fn_move_dtlupdt(bbsId); --%>
-                    $('#backUpData').find('[name=bbsId]').val(JSON.parse(data.resBody.result).bbsid);
+                    $('#backUpData').find('[name=bbsId]').val(bbsId);
                     $('#backUpData').find('[name=pageDv]').val('I');
                     $('#backUpData').attr('action', '<c:url value="/mngr/bbs/bbsmngr/selectBbsDtlUpdtForm"/>');
                     $('#backUpData').submit();
+                },
+                error : function(data) {
+                    const message = data.responseJSON
+                        && data.responseJSON.resBody
+                        && data.responseJSON.resBody.result;
+                    alert(message || '게시판 등록 중 오류가 발생했습니다.');
                 }
             });
         }

src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttDtlPopupR.jsp

@@ -6,7 +6,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui" %>
 <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld" %>
-<%@ page import="java.util.Date" %>
+<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 <%--
 	Class Name : GnrlBbscttDtlPopupR.jsp
 	Description : 일반 게시글 상세 조회 화면
@@ -21,36 +21,36 @@
     $(document).ready(function () {
         console.log('urlval 태그' +  $('.urlVal').length);
 
-        const pcDomnAdres = document.querySelector('.header__logo').getAttribute('data-pcurl');
+        const popup = document.getElementById('board-list-detail');
 
         let urlVal = '';
-        const bbscttInnb = document.getElementsByName("script_bbscttInnb")[0]?.value || "";
+        const bbscttInnb = popup.querySelector('[name="script_bbscttInnb"]')?.value || "";
-        const bbsId = document.getElementsByName("bbsId")[0]?.value || "";
+        const bbsId = popup.querySelector('[name="bbsId"]')?.value || "";
-        const bbsTyCd = document.getElementsByName("bbsTyCd")[0]?.value || "";
+        const bbsTyCd = popup.querySelector('[name="bbsTyCd"]')?.value || "";
-        const sopmalCd = document.getElementsByName("sopmalCd")[0]?.value || "";
+        const sopmalCd = popup.querySelector('[name="sopmalCd"]')?.value || "";
-        const bbsUseAt = document.getElementsByName("bbsUseAt")[0]?.value || "";
+        const bbsUseAt = popup.querySelector('[name="bbsUseAt"]')?.value || "";
-        const npayBbscttSnb = document.getElementsByName("npayBbscttSnb")[0]?.value || "";
+        const npayBbscttSnb = popup.querySelector('[name="npayBbscttSnb"]')?.value || "";
 
         console.log("bbscttInnb:", bbscttInnb);
         console.log("bbsId:", bbsId);
         console.log("bbsTyCd:", bbsTyCd);
         console.log("sopmalCd:", sopmalCd);
 
-        if(bbsUseAt == 'Y' && (npayBbscttSnb === null || npayBbscttSnb === undefined || npayBbscttSnb === '')) {
+        if (bbsUseAt === 'Y' && !npayBbscttSnb) {
-            if (bbsTyCd === '03' || bbsId == 'main_event' || bbsId == 'largeLMS_event') {
+            if (bbsId === 'largeLMS_event') {
-                if (bbsTyCd === '03' || bbsId == 'main_event') {
-                    urlVal = pcDomnAdres + '/sopmal/csc/selectBbscttAuth?authDv=CM&bbsTyCd=03&reqUrl=subPage&bbsId=' + bbsId + '&bbscttInnb=' + bbscttInnb;
-                } else {
                 urlVal = '/' + sopmalCd + '/extra/bbs/selectSMSEventPage?bbscttInnb=' + bbscttInnb;
-                }
+            } else {
+                urlVal = '/sopmal/csc/selectBbscttAuth?authDv=CM&reqUrl=detail&bbsTyCd='
+                    + encodeURIComponent(bbsTyCd)
+                    + '&bbsId=' + encodeURIComponent(bbsId)
+                    + '&bbscttInnb=' + encodeURIComponent(bbscttInnb);
             }
         }
 
 
         console.log(' urlVal 실행됨: ' + urlVal);
-        console.log(' pcDomnAdres 실행됨: ' + pcDomnAdres);
 
-        $('.urlVal').val(urlVal);
+        popup.querySelector('.urlVal').value = urlVal;
     });
 
 
@@ -88,15 +88,18 @@
             <input type="hidden" id="bbsId" name="bbsId" value="<c:out value='${bbsInfo.bbsId}' />" />
         <div class="form-control-container mb-10">
             <div class="left">
+                <c:if test="${bbscttInfo.useAt eq 'Y' && empty bbscttInfo.npayBbscttSnb}">
+                    <div class="input-container inline-block mr-5">
+                        <label class="visually-hidden" for="url">사용자 페이지 URL</label>
+                        <input type="text" id="url" class="input-text urlVal" readonly style="width: 500px;"/>
+                    </div>
+                    <button type="button" class="btn xsm primary" onclick="fn_copy_url();">URL 복사</button>
+                </c:if>
             </div>
             <div class="center">
             </div>
             <div class="right">
                 <c:if test="${bbscttInfo.useAt eq 'Y' && empty bbscttInfo.npayBbscttSnb}">
-                    <c:if test="${(bbsInfo.bbsTyCd eq '03') || (bbsInfo.bbsId eq 'main_event') || (bbsInfo.bbsId eq 'largeLMS_event')}">
-                        <input type="text" id="url" class="urlVal" style="display: none;"/>
-                        <button type="button" class="btn xsm primary" onclick="fn_copy_url();">url복사</button>
-                    </c:if>
                     <button type="button" class="btn xsm primary outline" onclick="fn_select_bbsctt_update_pop('<c:out
                             value="${ bbscttInfo.bbscttInnb }"/>','dtlPop');"><spring:message
                             code="button.update"/></button>
@@ -158,7 +161,7 @@
                                                 <div class="product-group__description">
                                                     <p><c:out value="${goods.goodsNm}"/></p>
                                                     <p class="product-group__description-price"><fmt:formatNumber
-                                                            value="${goods.slepric}" pattern="#,###"/>원</p>
+                                                            value="${goods.slepric}" pattern="#,###"/>${curUnit}</p>
                                                 </div>
                                                 <c:if test="${bbsInfo.bbsTyCd eq '05'}">
                                                     <input hidden id="goodsInnb" value="${goods.goodsInnb}"/>
@@ -168,6 +171,14 @@
                                     </div>
                                 </td>
                             </tr>
+							<tr>
+								<th>상품 정보 문구</th>
+								<td colspan="3">
+									<div class="td-inner" id="relateGoodsWords">
+										${bbscttInfo.relateGoodsWords}
+									</div>
+								</td>
+							</tr>
                         </c:if>
                     </c:if>
                     <tr>

src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp

@@ -22,6 +22,7 @@
     <%@include file ="/WEB-INF/views/comm/mngr/Include.jsp" %>
     <script src="<c:url value='/js/fileupload_comm.js'/>"></script>
     <spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
+    <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
     <script>
         $(document).ready(function () {
             /************************************************
@@ -1515,6 +1516,7 @@
             selected.forEach((good, index) => {
                 let goodsPrice = fn_format_comma(good.goodsPrice);
                 let slepric = fn_format_comma(good.goodsPrice);
+                let curUnit = '${curUnit}';
                 var productHtml = `
                             <div class="product-group__item">
                                 <input type="hidden" id="relatedGoodsId" name="relatedGoodsId" value="\${good.goodsId}">
@@ -1528,7 +1530,7 @@
                                 </button>
                                 <div class="product-group__description">
                                     <p>\${good.goodsNm}</p>
-                                    <p class="product-group__description-price">\${goodsPrice}</p>
+                                    <p class="product-group__description-price">\${goodsPrice}\${curUnit}</p>
                                 </div>
                                 <%--게시글 연관 상품--%>
                                 <input type="hidden" name="goodsInnbArr[]" value="\${good.goodsId}"/>

src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttRegistPopupC.jsp

@@ -280,8 +280,8 @@
                             </td>
                         </c:if>
                     </tr>
-                    <tr class="visibleAt">
 					<c:if test="${bbsInfo.goodsChoice  eq 'Y'}">
+						<tr class="visibleAt">
 							<th>상품 정보
 								<button type="button" class="btn xsm primary ml-5"
 										onclick="fn_open_modal('#modalDiv',
@@ -298,8 +298,16 @@
 									</div>
 								</div>
 							</td>
-                        </c:if>
 						</tr>
+						<tr class="visibleAt">
+							<th>상품 정보 문구</th>
+							<td colspan="3">
+								<div class="td-inner">
+									<input class="input-text full" type="text" title="해당 인풋에 대한 설명" placeholder="관련 상품 문구를 입력해 주세요." name="relateGoodsWords" maxlength="50" value="이 글과 관련된 사케">
+								</div>
+							</td>
+						</tr>
+					</c:if>
                     <c:if test="${not empty qesitmList}">
                         <tr>
                             <th>추가 입력 항목</th>

src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttUpdtPopupU.jsp

@@ -6,6 +6,8 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
 <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
+<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
+<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 <%--
 	Class Name : GnrlBbscttUpdtPopupU.jsp
 	Description : 일반 게시글 등록 팝업
@@ -15,7 +17,6 @@
 	------- -------- ---------------------------
 	2024-01-08 김혜지 최초 생성
 --%>
-<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
 <div id="board-list-update" class="modal" style="max-width: 1400px;">
     <div class="modal-header">
         <h4>게시글 수정</h4>
@@ -474,8 +475,8 @@
 	                        </td>
                         </c:if>
                     </tr>
-                    <tr class ="visibleAt">
 					<c:if test = "${bbsInfo.goodsChoice  eq 'Y'}">
+						<tr class ="visibleAt">
 							<th>상품 정보
 								<c:choose>
 									<c:when test = "${not empty goods}">
@@ -486,7 +487,7 @@
 									</c:when>
 									<c:otherwise>
 										<button type="button" class="btn xsm primary ml-5"
-												onclick="fn_open_modal('#modalDiv','#product-search','/mngr/goods/goodsmngr/selectGoodsSrchPopupForm',{'goodsKndCd':'01'}); return false;">
+												onclick="selected = []; fn_open_modal('#modalDiv','#product-search','/mngr/goods/goodsmngr/selectGoodsSrchPopupForm',{'goodsKndCd':'01'}); return false;">
 											검색
 										</button>
 									</c:otherwise>
@@ -510,7 +511,7 @@
 													</button>
 													<div class="product-group__description">
 														<p><c:out value="${goods.goodsNm}"/></p>
-														<p class="product-group__description-price"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>원</p>
+														<p class="product-group__description-price"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>${curUnit}</p>
 													</div>
 													<%--게시글 연관 상품--%>
 													<input type="hidden" name="goodsInnbArr[]" value="${goods.goodsInnb}"/>
@@ -520,8 +521,16 @@
 									</div>
 								</div>
 							</td>
-	                   </c:if>
 						</tr>
+						<tr class="visibleAt">
+							<th>상품 정보 문구</th>
+							<td colspan="3">
+								<div class="td-inner">
+									<input class="input-text full" type="text" title="해당 인풋에 대한 설명" placeholder="관련 상품 문구를 입력해 주세요." name="relateGoodsWords" maxlength="50" value = "${bbscttInfo.relateGoodsWords}">
+								</div>
+							</td>
+						</tr>
+					</c:if>
 					<c:if test="${not empty qesitmList}">
 						<tr>
 							<th>추가 입력 항목</th>

src/main/webapp/WEB-INF/views/mngr/goods/badge/GoodsBadgeSetupU.jsp

@@ -0,0 +1,79 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+	<meta charset="UTF-8">
+	<%@include file ="/WEB-INF/views/comm/mngr/Include.jsp" %>
+	<style>
+		.badge-preview { display: inline-block; min-width: 70px; padding: 4px 8px; border: 1px solid; border-radius: 3px; text-align: center; }
+		.color-field { display: flex; align-items: center; gap: 6px; position: relative; }
+		.color-palette-toggle { width: 32px; min-width: 32px; height: 32px; padding: 3px; border: 1px solid #bbb; background: #fff; cursor: pointer; }
+		.color-swatch { display: block; width: 100%; height: 100%; border: 1px solid rgba(0, 0, 0, .15); }
+		.color-palette { display: none; position: absolute; z-index: 10; top: 36px; left: 0; width: 260px; padding: 8px; background: #fff; border: 1px solid #aaa; box-shadow: 0 3px 10px rgba(0, 0, 0, .18); grid-template-columns: repeat(12, 1fr); gap: 4px; }
+		.color-palette.is-open { display: grid; }
+		.color-choice { width: 16px; height: 16px; padding: 0; border: 1px solid rgba(0, 0, 0, .18); cursor: pointer; }
+	</style>
+</head>
+<body>
+<%@include file ="/WEB-INF/views/comm/mngr/Header.jsp" %>
+<main class="main">
+	<%@include file ="/WEB-INF/views/comm/mngr/Left.jsp" %>
+	<div class="content"><div class="content__inner">
+		<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
+		<div class="page-title">
+			<h2 class="page-title__title">상품배지설정관리</h2>
+			<div class="page-title__btn-container"><button type="button" class="btn primary" onclick="fn_save_badges()">저장하기</button></div>
+		</div>
+		<form id="badgeForm">
+			<section class="content-section">
+				<div class="form-control-container mb-8"><div class="left"><h3 class="content-section__inner-title">상품 배지</h3></div><div class="center"></div><div class="right"><button type="button" class="btn primary outline xsm" onclick="fn_add_badge()">추가</button><button type="button" class="btn dark xsm" onclick="fn_remove_badge()">선택 행 제거</button></div></div>
+				<div class="table-wrapper"><table class="table vertical"><caption>상품 배지 설정</caption><thead><tr><th><label class="b-checkbox checkbox is-medium check-all"><input type="checkbox" id="badgeAll"><span class="check"></span></label></th><th>배지코드</th><th>배지명</th><th>글자색</th><th>배경색</th><th>테두리색</th><th>노출순서</th><th>사용여부</th><th>미리보기</th></tr></thead>
+					<tbody id="badgeBody">
+					<c:forEach var="badge" items="${resultMap.badgeList}">
+						<tr data-new-at="N"><td><label class="b-checkbox checkbox is-medium"><input type="checkbox" name="badgeChk"><span class="check"></span></label></td><td><input type="text" class="input-text xl badge-cd" name="badgeCdArr" value="<c:out value='${badge.badgeCd}'/>" readonly><input type="hidden" name="originalBadgeCdArr" value="<c:out value='${badge.badgeCd}'/>"></td><td><input type="text" class="input-text xl badge-nm" name="badgeNmArr" value="<c:out value='${badge.badgeNm}'/>"></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="글자색 선택"><span class="color-swatch" style="background-color:<c:out value='${badge.fontColor}'/>"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="fontColorArr" maxlength="7" value="<c:out value='${badge.fontColor}'/>"></div></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="배경색 선택"><span class="color-swatch" style="background-color:<c:out value='${badge.bgColor}'/>"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="bgColorArr" maxlength="7" value="<c:out value='${badge.bgColor}'/>"></div></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="테두리색 선택"><span class="color-swatch" style="background-color:<c:out value='${badge.borderColor}'/>"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="borderColorArr" maxlength="7" value="<c:out value='${badge.borderColor}'/>"></div></td><td><input type="text" class="input-text xl sort-ordr" name="sortOrdrArr" value="<c:out value='${badge.sortOrdr}'/>"></td><td><select class="select" name="useAtArr"><option value="Y" ${badge.useAt eq 'Y' ? 'selected' : ''}>사용</option><option value="N" ${badge.useAt eq 'N' ? 'selected' : ''}>미사용</option></select><input type="hidden" name="newAtArr" value="N"></td><td><span class="badge-preview"></span></td></tr>
+					</c:forEach>
+					<tr id="noData" ${not empty resultMap.badgeList ? 'style="display:none"' : ''}><td class="row-no-data" colspan="9">등록된 배지가 없습니다.</td></tr>
+					</tbody></table></div>
+			</section>
+		</form>
+	</div></div>
+</main>
+<script>
+	function fn_add_badge() {
+		$('#noData').hide();
+		$('#badgeBody').append('<tr data-new-at="Y"><td><label class="b-checkbox checkbox is-medium"><input type="checkbox" name="badgeChk"><span class="check"></span></label></td><td><input type="text" class="input-text xl badge-cd" name="badgeCdArr" maxlength="30"><input type="hidden" name="originalBadgeCdArr" value=""></td><td><input type="text" class="input-text xl badge-nm" name="badgeNmArr" maxlength="100"></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="글자색 선택"><span class="color-swatch" style="background-color:#000000"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="fontColorArr" maxlength="7" value="#000000"></div></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="배경색 선택"><span class="color-swatch" style="background-color:#FFFFFF"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="bgColorArr" maxlength="7" value="#FFFFFF"></div></td><td><div class="color-field"><button type="button" class="color-palette-toggle" aria-label="테두리색 선택"><span class="color-swatch" style="background-color:#000000"></span></button><div class="color-palette"></div><input type="text" class="input-text xl color-input" name="borderColorArr" maxlength="7" value="#000000"></div></td><td><input type="text" class="input-text xl sort-ordr" name="sortOrdrArr" value="0" maxlength="5"></td><td><select class="select" name="useAtArr"><option value="Y">사용</option><option value="N">미사용</option></select><input type="hidden" name="newAtArr" value="Y"></td><td><span class="badge-preview"></span></td></tr>');
+		fn_init_color_palettes();
+		fn_render_preview();
+	}
+	function fn_remove_badge() {
+		const selected = $('[name=badgeChk]:checked');
+		if (!selected.length) { alert('항목을 선택해 주세요.'); return; }
+		selected.each(function () { const row = $(this).closest('tr'); if (row.data('new-at') === 'Y') { row.remove(); } else { alert('기존 배지는 삭제할 수 없습니다. 사용여부를 미사용으로 변경해 주세요.'); } });
+		$('#badgeAll').prop('checked', false);
+		if ($('#badgeBody tr:not(#noData)').length === 0) { $('#noData').show(); }
+	}
+	function fn_render_preview() {
+		$('#badgeBody tr:not(#noData)').each(function () { const row = $(this); row.find('.badge-preview').text(row.find('.badge-nm').val() || '배지명').css({color: row.find('[name=fontColorArr]').val(), backgroundColor: row.find('[name=bgColorArr]').val(), borderColor: row.find('[name=borderColorArr]').val()}); });
+	}
+	function fn_normalize_colors() {
+		$('#badgeBody tr:not(#noData)').each(function () { const row = $(this); row.find('.color-input').each(function () { const input = $(this); if (!/^#[0-9A-Fa-f]{6}$/.test(input.val().trim())) { input.val(input.attr('name') === 'borderColorArr' ? (row.find('[name=bgColorArr]').val() || '#000000') : '#000000'); } }); });
+	}
+	function fn_validate_badges() {
+		let valid = true; const colorPattern = /^#[0-9A-Fa-f]{6}$/; const codePattern = /^[A-Za-z0-9_-]+$/; const codes = {};
+		$('#badgeBody tr:not(#noData)').each(function () { const row = $(this); const code = row.find('.badge-cd').val().trim(); const isNew = row.data('new-at') === 'Y'; if ((!code || (isNew && !codePattern.test(code))) || !row.find('.badge-nm').val().trim() || !colorPattern.test(row.find('[name=fontColorArr]').val().trim()) || !colorPattern.test(row.find('[name=bgColorArr]').val().trim()) || !colorPattern.test(row.find('[name=borderColorArr]').val().trim()) || !/^\d+$/.test(row.find('.sort-ordr').val().trim())) { valid = false; return false; } if (isNew && codes[code]) { valid = false; return false; } if (isNew) { codes[code] = true; } });
+		if (!valid) { alert('배지코드, 배지명, 색상(#RRGGBB), 노출순서를 확인해 주세요.'); } return valid;
+	}
+	function fn_save_badges() { if (!fn_validate_badges() || !confirm('상품 배지 설정을 저장하시겠습니까?')) { return; } $.ajax({ type: 'post', url: '<c:url value="/mngr/goods/badge/updateGoodsBadgeSetup"/>', data: $('#badgeForm').serialize(), success: function () { alert('저장되었습니다.'); location.reload(); } }); }
+	function fn_hsl_to_hex(h, s, l) { s /= 100; l /= 100; const c = (1 - Math.abs(2 * l - 1)) * s; const x = c * (1 - Math.abs((h / 60) % 2 - 1)); const m = l - c / 2; let r = 0, g = 0, b = 0; if (h < 60) { r = c; g = x; } else if (h < 120) { r = x; g = c; } else if (h < 180) { g = c; b = x; } else if (h < 240) { g = x; b = c; } else if (h < 300) { r = x; b = c; } else { r = c; b = x; } return '#' + [r, g, b].map(function (v) { return Math.round((v + m) * 255).toString(16).padStart(2, '0'); }).join('').toUpperCase(); }
+	const paletteColors = (function () { const colors = ['#000000','#202020','#404040','#606060','#808080','#A0A0A0','#C0C0C0','#D9D9D9','#EFEFEF','#FFFFFF']; const lightnesses = [92, 82, 72, 62, 52, 42, 32, 22]; for (let lightnessIndex = 0; lightnessIndex < lightnesses.length; lightnessIndex++) { for (let hue = 0; hue < 360; hue += 30) { colors.push(fn_hsl_to_hex(hue, 78, lightnesses[lightnessIndex])); } } return colors; })();
+	function fn_init_color_palettes() { $('.color-palette').each(function () { const palette = $(this); if (palette.children().length) { return; } $.each(paletteColors, function (_, color) { palette.append('<button type="button" class="color-choice" data-color="' + color + '" title="' + color + '" style="background-color:' + color + '"></button>'); }); }); }
+	$(document).on('input change', '.badge-nm, .color-input', function () { const input = $(this); if (input.hasClass('color-input') && /^#[0-9A-Fa-f]{6}$/.test(input.val())) { input.siblings('.color-palette-toggle').find('.color-swatch').css('background-color', input.val()); } fn_render_preview(); });
+	$(document).on('click', '.color-palette-toggle', function (e) { e.stopPropagation(); $('.color-palette').not($(this).siblings('.color-palette')).removeClass('is-open'); $(this).siblings('.color-palette').toggleClass('is-open'); });
+	$(document).on('click', '.color-choice', function () { const field = $(this).closest('.color-field'); field.find('.color-input').val($(this).data('color')).trigger('change'); field.find('.color-palette').removeClass('is-open'); });
+	$(document).on('click', function () { $('.color-palette').removeClass('is-open'); });
+	$('#badgeAll').on('change', function () { $('[name=badgeChk]').prop('checked', this.checked); });
+	$(function () { fn_init_color_palettes(); fn_normalize_colors(); $('.color-input').trigger('change'); fn_render_preview(); });
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp

@@ -2661,7 +2661,7 @@
                                                         <input type="checkbox" value="${ iconList.cd }" name="iconCd">
                                                         <span class="check"></span>
                                                         <span class="control-label">
-                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}">${ iconList.cdNm }</span>
+                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}" style="color: ${iconList.fontColor} !important; background-color: ${iconList.bgColor} !important; border-color: ${iconList.borderColor} !important;">${ iconList.cdNm }</span>
                                                         </span>
                                                     </label>
                                                 </c:forEach>

src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp

@@ -2832,7 +2832,7 @@
                                                         <input type="checkbox" value="${iconList.cd}" name="iconCd" ${isChecked}/>
                                                         <span class="check"></span>
                                                         <span class="control-label">
-                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}">${iconList.cdNm}</span>
+                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}" style="color: ${iconList.fontColor} !important; background-color: ${iconList.bgColor} !important; border-color: ${iconList.borderColor} !important;">${iconList.cdNm}</span>
                                                         </span>
                                                     </label>
 

src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsDtlU.jsp

@@ -3283,7 +3283,7 @@
                                                         <input type="checkbox" value="${iconList.cd}" name="iconCd" ${isChecked}/>
                                                         <span class="check"></span>
                                                         <span class="control-label">
-                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}">${iconList.cdNm}</span>
+                                                            <span class="product-badge ${fn:toLowerCase(iconList.cd)}" style="color: ${iconList.fontColor} !important; background-color: ${iconList.bgColor} !important; border-color: ${iconList.borderColor} !important;">${iconList.cdNm}</span>
                                                         </span>
                                                     </label>
 

src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsListRForm.jsp

@@ -133,6 +133,17 @@
         });
     }
 
+	/* ********************************************************
+	 * xml 임시
+	 ******************************************************** */
+	const fn_update_xml = function () {
+		const url = '<c:url value="/mngr/goods/goodsmngr/selectGoodsRegistForm"/>';
+
+		$('#listForm').attr('action', url);
+		$('#listForm').attr('method', 'post');
+		$('#listForm').submit();
+	};
+
     /* ********************************************************
      * 등록폼 이동
      ******************************************************** */
@@ -441,6 +452,7 @@
             <div class="page-title">
                 <h2 class="page-title__title">상품 목록</h2>
                 <div class="page-title__btn-container">
+                    <button onclick="fn_update_xml()" class="btn primary">XML 업데이트(임시)</button>
                     <button onclick="fn_move_regpage()" class="btn primary">상품 <spring:message code="button.insert"/></button>
                 </div>
             </div>

src/main/webapp/WEB-INF/views/mngr/ntcn/atmcsndng/EmailAtmcSndngListRForm.jsp

@@ -23,7 +23,7 @@
 
 		fn_select_list(pageIndex, pageUnit);
 		//지정일
-		fn_set_date('srchStrtSndngDt','srchEndSndngDt','srchEndSndngDㄴt');
+		fn_set_date('srchStrtSndngDt','srchEndSndngDt','srchEndSndngDt');
 
 		//날짜 선택 버튼 선택 처리
 		$(".dateRange-btnContainer").on("click", ".dateRange-btn", function(){

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp

@@ -446,7 +446,8 @@
              * 열 헤더, 푸터 > 프린트 버튼 클릭 이벤트
              */
             $(document).on('click', '[class*="btn-order-print"]', function() {
-                const tr = ($(this).attr('class').split(' ')[0]).replace('btn-order-print-', 'order-sttus-cd-');
+				fn_select_dwld_purch_ordr_list();
+				/*const tr = ($(this).attr('class').split(' ')[0]).replace('btn-order-print-', 'order-sttus-cd-');
 				const rowCheckboxs = $('.' + tr).closest('#orderList').find('.' + tr + ' input[name="ordrInnb"]:checked');
 
 				if (rowCheckboxs.length === 0) {
@@ -461,27 +462,7 @@
 					ordrInnbs.push($(item).val());
 				});
 
-                fn_go_ordr_dtstmn_dwld_popup(ordrInnbs)
+				fn_go_ordr_dtstmn_dwld_popup(ordrInnbs)*/
-            });
-
-            /*
-             * 열 헤더 > 엑셀 발주서 다운로드 버튼 클릭 이벤트
-             */
-            $(document).on('click', '.excel-dwld-purch-order', function() {
-                const srchStartDate = $('#srchStartDate').val();
-                const srchEndDate = $('#srchEndDate').val();
-                const srchOrdrSttusCd = '35';
-
-                var form = $('#condForm').clone().prop("id", "excelCondForm")
-                $(form).append($('<input/>', {type:'hidden', name:'srchOrdrSttusCd', value:srchOrdrSttusCd}));
-
-                $(form).attr('method', 'post');
-                $(form).attr('action', '<c:url value="/mngr/ordr/ordrmngr/selectExcelPoDwldListInqire"/>');
-
-                $(form).appendTo('body');
-
-                $(form).submit();
-                $(form).remove();
             });
 
             /*
@@ -806,7 +787,7 @@
 
                 header += '                <button type="button" class="btn-order-print-' + data.ordrSttusCd + ' btn outline xsm fs-13"><i class="icon icon_print"></i>프린트</button>';
                 if ('35' === data.ordrSttusCd) {
-                    header += '            <button type="button" class="btn sm outline fs-13 excel-dwld-purch-order">';
+                    header += '            <button type="button" onclick="fn_select_dwld_purch_ordr_list()" class="btn sm outline fs-13">';
                     header += '                <i class="icon icon_excel"></i>발주서 다운로드';
                     header += '            </button>';
                 }
@@ -1404,7 +1385,7 @@
                 }
                 footer += '                <button type="button" class="btn-order-print-' + data.ordrSttusCd + ' btn outline xsm fs-13"><i class="icon icon_print"></i>프린트</button>';
                 if ('35' === prevOrderSttusCd) {
-                    footer += '            <button type="button" class="btn sm outline fs-13 excel-dwld-purch-order">';
+                    footer += '            <button type="button" onclick="fn_select_dwld_purch_ordr_list()" class="btn sm outline fs-13">';
                     footer += '                <i class="icon icon_excel"></i>발주서 다운로드';
                     footer += '            </button>';
                 }
@@ -1738,8 +1719,6 @@
             $(form).submit();
         }
 
-
-
         /* 다운로드 항목 목록 이동 */
         const fn_select_dwld_ordr_list = function() {
             var form = $('#condForm')
@@ -1753,9 +1732,17 @@
             $(form).submit();
         }
 
+        /* 발주서 다운로드 항목 목록 이동 */
+        const fn_select_dwld_purch_ordr_list = function() {
+            var form = $('#condForm')
 
+            $(form).find('input[name="ordrInnb"]').remove();
 
+            $(form).attr('method', 'post');
+            $(form).attr('action', '<c:url value="/mngr/ordr/ordrmngr/selectExcelPoListInqireRForm"/>');
 
+            $(form).submit();
+        }
     </script>
 </head>
 <body>
@@ -1785,6 +1772,7 @@
                     <a type="button" onclick="fn_select_indvdl_setle_list();" class="btn outline">개인 결제 목록</a>
                     <a href="<c:url value="/crm/ordr/selectMngrOrdrRegistForm"/>" class="btn outline" target='_blank'>관리자 주문 등록</a>
                     <a type="button" onclick="fn_select_dwld_ordr_list();" class="btn outline">다운로드 항목설정 목록</a>
+                    <a type="button" onclick="fn_select_dwld_purch_ordr_list()" class="btn outline"><i class="icon icon_excel"></i>발주서 다운로드</a>
                     <button type="button" class="btn primary" onclick="fn_dlivy_procs_popup('/mngr/ordr/dlivy/selectOrdrDlivyPopupForm','팝업','1400','840', 'O');">출고처리</button>
                 </div>
             </div>

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp

@@ -1518,7 +1518,10 @@
             $("#overlay").fadeOut();
 
             if (!data.responseJSON.resBody.message) {
+                if(!data.responseJSON.resBody.result)
                     alert('<spring:message code="error.internal-server"/>');
+                else
+                    alert(data.responseJSON.resBody.result);
             } else {
                 if (fn_check_json(data.responseJSON.resBody.message)) {
                     const errorObject = JSON.parse(data.responseJSON.resBody.message);

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlShippingR.jsp

@@ -63,7 +63,9 @@
                                                 <col style="width: auto;">
                                                 <col style="width: auto;">
                                                 <col style="width: auto;">
-                                                <col style="width: 40%;">
+                                                <col style="width: auto;">
+                                                <col style="width: auto;">
+                                                <col style="width: 20%;">
                                             </colgroup>
                                             <tbody>
                                                 <tr>
@@ -103,6 +105,12 @@
                                                             </div>
                                                         </div>
                                                     </td>
+                                                    <th class="text-right">개인통관부호</th>
+                                                    <td>
+                                                        <div class="td-inner">
+                                                            <input type="text" class="input-text" name="cstmclerCd" id="cstmclerCd" value="${orderShipping.cstmclerCd}" maxlength="13" placeholder="P로 시작하는 13자리 부호를 입력하세요"/>
+                                                        </div>
+                                                    </td>
                                                 </tr>
                                             </tbody>
                                         </table>

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/PurchOrdrDtstmnDwldPopupR.jsp

@@ -0,0 +1,533 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
+<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
+<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<%@ include file="/WEB-INF/views/comm/mngr/Include.jsp"%>
+	<style>
+		@media print {
+			html, body {
+				height:auto;
+				width:auto;
+				margin: 0 !important;
+				padding: 0 !important;
+				overflow: hidden;
+			}
+		}
+		.right {
+			text-align: right;
+		}
+		.pbreak {
+			page-break-after: always;
+		}
+		.pbreak:last-child {
+			page-break-after: auto;
+		}
+		table.order_print_info tr th {
+			padding:3px 3px 3px 3px;
+			text-align:left;
+			font-size:11px;
+			color:#4d4d4d;
+			font-weight:normal;
+		}
+		table.order_print_info tr td {
+			padding:3px 3px 3px 3px;
+			text-align:right;
+			font-size:11px;
+		}
+		table.delivery_print_info {
+			border-collapse:collapse !important;
+			border:1px solid #bcbfc1;
+			table-layout: fixed;
+		}
+		table.delivery_print_info tr th {
+			padding:3px 3px 3px 3px;
+			font-size:11px;
+			color:#4d4d4d;
+			font-weight:normal;
+		}
+		table.delivery_print_info tr td {
+			padding:3px 3px 3px 3px;
+			font-size:11px;
+		}
+		table.delivery_goods_print_info {
+			border-collapse:collapse !important;
+			border:1px solid #bcbfc1;
+			table-layout: fixed
+		}
+		table.delivery_goods_print_info tr th {
+			padding:3px 3px 3px 3px;
+			font-size:11px;
+			color:#4d4d4d;
+			font-weight:normal;
+			border-left:1px solid #bcbfc1;
+			border-top:1px solid #bcbfc1;
+		}
+		table.delivery_goods_print_info tr td {
+			padding:3px 3px 3px 3px;
+			font-size:11px;
+			border-left:1px solid #bcbfc1;
+			border-top:1px solid #bcbfc1;
+		}
+		span.title_print_info {
+			font-size:12px;
+			color:#000000;
+			font-weight:normal;
+			letter-spacing:-1px;
+		}
+		table.order-sale-summary tr.total-sale-title td {
+			font-size:14px !important;
+			font-weight:normal !important;
+			color:#000000 !important;
+		}
+		tr.detail-sale-summary td div {
+			padding:0px !important;
+			color:#000000 !important;
+		}
+		tr.detail-sale-summary td {
+			color:#000000 !important;
+		}
+		tr.detail-sale-summary td span {
+			padding:0px !important;
+			color:#000000;
+		}
+		tr.total-sale-title td span {
+			padding:0px !important;
+			color:#000000;
+		}
+		tr.detail-sale-summary td:last-child {
+			padding:0px !important;
+			color:#000000 !important;
+			font-weight:normal !important;
+		}
+		tr.detail-sale-summary td:last-child span {
+			padding:0px !important;
+			color:#000000 !important;
+			font-size:14px !important;
+			font-weight:normal !important;
+		}
+		span.unit-money {
+			display:inline-block;width:10px;
+		}
+		tr {
+			page-break-inside:avoid;
+			page-break-after:auto;
+		}
+		td {
+			page-break-inside:avoid;
+			page-break-after:auto;
+		}
+	</style>
+	<script>
+		$(document).ready(function(){
+			loding(false);
+			window.print();
+		});
+	</script>
+</head>
+<body>
+	<div id="wrap">
+		<c:set var="ordrDtstmnDwlds" value="${data.ordrDtstmnDwldList}"/>
+		<c:forEach var="ordrDtstmnDwld" items="${ordrDtstmnDwlds}" varStatus="status">
+			<c:set var="shipping" value="${ordrDtstmnDwld.shipping}"/>
+			<c:set var="srchOrdrDlvyInnb" value="${ordrSrchVO.srchOrdrDlvyInnbs[status.index]}"/>
+			<c:set var="isLast" value="${ordrDtstmnDwlds.size() ne status.count}"/>
+			<div class="pbreak">
+				<div align="center">
+					<table>
+						<tr>
+							<td>
+								<span style="text-align:center;font-size:20px;letter-spacing:-1px;font-weight:bold;padding-top:20px;">
+									주문내역서
+								</span>
+							</td>
+						</tr>
+					</table>
+				</div>
+				<div style="height:5px;"></div>
+				<table style="width:100%;">
+					<col style="width:48%;">
+					<col style="width:4%;">
+					<col style="width:48%;">
+					<tr>
+						<td><span class="title_print_info">주문정보</span></td>
+						<td></td>
+						<td><span class="title_print_info">결제정보</span></td>
+					</tr>
+					<tr>
+						<td><div style="width:100%;border-top:1px solid #545454;height:1px;"></div></td>
+						<td></td>
+						<td><div style="width:100%;border-top:1px solid #545454;height:1px;"></div></td>
+					</tr>
+					<tr>
+						<td>
+							<c:set var="ordr" value="${ordrDtstmnDwld.ordr}"/>
+							<c:set var="setle" value="${ordrDtstmnDwld.setle}"/>
+							<table class="order_print_info" style="width:100%;">
+								<tr>
+									<th>주문번호</th>
+									<td>${ordr.ordrInnb}</td>
+								</tr>
+								<tr>
+									<th>주문일자</th>
+									<td>${ordr.ordrRceptDt}</td>
+								</tr>
+								<tr>
+									<th>주문고객</th>
+									<td>${ordr.mbrNm}</td>
+								</tr>
+								<tr>
+									<th>전화</th>
+									<td>${ordr.ordrrTelnb}</td>
+								</tr>
+								<tr>
+									<th>휴대전화</th>
+									<td>${ordr.ordrrMbtlnb}</td>
+								</tr>
+								<tr>
+									<th>이메일</th>
+									<td>${ordr.ordrrEmailAdres}</td>
+								</tr>
+							</table>
+						</td>
+						<td></td>
+						<td valign="top">
+							<table class="order_print_info" style="width:100%;">
+								<tr>
+									<th>상품금액</th>
+									<td><fmt:formatNumber value="${setle.slepric}" pattern="#,###"/>${curUnit}</td>
+								</tr>
+								<tr>
+									<th>배송비</th>
+									<td><fmt:formatNumber value="${setle.dlvyAmt}" pattern="#,###"/>${curUnit}</td>
+								</tr>
+								<tr>
+									<th>할인</th>
+									<td><fmt:formatNumber value="${setle.dscntAmt}" pattern="#,###"/>${curUnit}</td>
+								</tr>
+								<tr>
+									<th>총 결제금액</th>
+									<td>
+										<span style="font-size:12px;">
+											<fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/>${curUnit}
+											(<fmt:formatNumber value="${setle.wonRlSetleAmt}" pattern="#,###"/>${krUnit})
+										</span>
+									</td>
+								</tr>
+								<tr>
+									<th>결제수단</th>
+									<td>${ordr.setleTyNm}</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<div style="height:10px"></div>
+				<table align="center" style="width:100%;">
+					<tr>
+						<td class="left"><span class="title_print_info">주문상품 (${ordr.itemCnt}종 - 총 ${ordr.orderCnt}개)</span></td>
+					</tr>
+				</table>
+				<div style="height:3px"></div>
+				<c:set var="goodsList" value="${ordrDtstmnDwld.goods}"/>
+				<c:if test="${not empty goodsList}">
+					<table class="delivery_goods_print_info" align="center" style="width:100%; ${status.count > 1 ? 'margin-top:5px;' : '' }">
+						<colgroup>
+							<col style="width:auto;">
+							<col style="width:50px;">
+							<col style="width:35px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:35px;">
+						</colgroup>
+						<tr>
+							<th>상품명</th>
+							<th>순번</th>
+							<th>주문</th>
+							<th>판매가</th>
+							<th>할인</th>
+							<th>할인가(단가)</th>
+							<th>적립</th>
+							<th>배송</th>
+							<th>취소</th>
+						</tr>
+						<c:forEach var="goods" items="${goodsList}" varStatus="status">
+							<tr>
+								<td>
+									<table style="border:0px">
+										<tr>
+											<td style="font-size:11px;border:0px;">
+													${goods.goodsNm}
+												<c:if test="${not empty goods.optnNm}">
+													<div style="padding:2px 0px 0px 0px;">- ${goods.optnNm}</div>
+												</c:if>
+											</td>
+										</tr>
+									</table>
+								</td>
+								<td class="right">
+									<c:forEach var="ship" items="${shipping}" varStatus="status">
+										<c:if test="${ship.ordrDlvyInnb == goods.ordrDlvyInnb}">
+											${status.count}번째
+										</c:if>
+									</c:forEach>
+								</td>
+								<td class="right"><fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/></td>
+								<td class="right"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>${curUnit}</td>
+								<td class="right"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/>${curUnit}</td>
+								<td class="right"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/>${curUnit}<br/>(<fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>${curUnit})</td>
+								<td class="right"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></td>
+								<td class="right">
+									<div><span>${goods.dlvyMthNm}</span></div>
+									<div><span class="bold"><fmt:formatNumber value="${goods.dlvyAmt}" pattern="#,###"/>${curUnit}</span></div>
+								</td>
+								<td class="right"><fmt:formatNumber value="${goods.setleCanclQy}" pattern="#,###"/></td>
+							</tr>
+						</c:forEach>
+					</table>
+				</c:if>
+				<c:if test="${empty goodsList}">
+					<table class="delivery_goods_print_info" align="center" style="width:100%;">
+						<colgroup>
+							<col style="width:auto;">
+							<col style="width:50px;">
+							<col style="width:35px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:35px;">
+						</colgroup>
+						<tr>
+							<th>상품명</th>
+							<th>순번</th>
+							<th>주문</th>
+							<th>판매가</th>
+							<th>할인</th>
+							<th>할인가(단가)</th>
+							<th>적립</th>
+							<th>배송</th>
+							<th>취소</th>
+						</tr>
+						<tr>
+							<td colspan="9" style="text-align: center">조회된 데이터가 없습니다.</td>
+						</tr>
+					</table>
+				</c:if>
+				<div style="height:10px"></div>
+				<div>
+					<table style="width:100%;">
+						<tr>
+							<td><span class="title_print_info">배송정보</span></td>
+						</tr>
+					</table>
+					<c:if test="${not empty shipping}">
+						<c:forEach var="ship" items="${shipping}" varStatus="status">
+							<c:if test="${srchOrdrDlvyInnb eq ship.ordrDlvyInnb}">
+								<table class="delivery_goods_print_info" style="width:100%; ${status.count > 1 ? 'margin-top:5px;' : '' }">
+									<col style="width:5%;">
+									<col style="width:20%;">
+									<col style="width:20%;">
+									<col style="width:20%;">
+									<tr align="left">
+										<td rowspan="3">${status.count}번째</td>
+										<td>${ship.recpntNm}</td>
+										<td>${ship.recpntMbtlnb}</td>
+										<td>${ship.recpntTelnb}</td>
+									</tr>
+									<tr align="left">
+										<td colspan="3">
+											${not empty ship.dlvylcZip ? '(' += ship.dlvylcZip += ')' : ''}
+											${ship.adres}
+											${ship.dlvylcAdresDtl}
+										</td>
+									</tr>
+									<tr align="left">
+										<td colspan="3">
+											<c:if test="${empty ship.dlvyMssageCn}">
+												-
+											</c:if>
+											<c:if test="${not empty ship.dlvyMssageCn}">
+												${ship.dlvyMssageCn}
+											</c:if>
+										</td>
+									</tr>
+								</table>
+							</c:if>
+						</c:forEach>
+					</c:if>
+					<c:if test="${empty shipping}">
+						<table class="delivery_goods_print_info" style="width:100%; ${status.count > 1 ? 'margin-top:5px;' : '' }">
+							<col style="width:5%;">
+							<col style="width:20%;">
+							<col style="width:20%;">
+							<col style="width:20%;">
+							<tr><td colspan="9" style="text-align: center">조회된 데이터가 없습니다.</td></tr>
+						</table>
+					</c:if>
+				</div>
+				<div style="height:10px"></div>
+				<table align="center" style="width:100%;">
+					<tr>
+						<td class="left"><span class="title_print_info">발송상품</span></td>
+					</tr>
+				</table>
+				<div style="height:3px"></div>
+				<c:set var="goodsList" value="${ordrDtstmnDwld.goods}"/>
+				<c:if test="${not empty goodsList}">
+					<table class="delivery_goods_print_info" align="center" style="width:100%; ${status.count > 1 ? 'margin-top:5px;' : '' }">
+						<colgroup>
+							<col style="width:auto;">
+							<col style="width:35px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:35px;">
+						</colgroup>
+						<tr>
+							<th>상품명</th>
+							<th>주문</th>
+							<th>판매가</th>
+							<th>할인</th>
+							<th>할인가(단가)</th>
+							<th>적립</th>
+							<th>취소</th>
+							<th>발송</th>
+						</tr>
+						<c:forEach var="goods" items="${goodsList}" varStatus="status">
+							<c:if test="${srchOrdrDlvyInnb eq goods.ordrDlvyInnb}">
+								<tr>
+									<td>
+										<table style="border:0px">
+											<tr>
+												<td style="font-size:11px;border:0px;">
+														${goods.goodsNm}
+													<div style="padding:2px 0px 0px 0px;">- ${goods.optnNm}</div>
+												</td>
+											</tr>
+										</table>
+									</td>
+									<td class="right"><fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/></td>
+									<td class="right"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>${curUnit}</td>
+									<td class="right"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/>${curUnit}</td>
+									<td class="right"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/>${curUnit}<br/>(<fmt:formatNumber value="${goods.slepric}" pattern="#,###"/>${curUnit})</td>
+									<td class="right"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></td>
+									<td class="right"><fmt:formatNumber value="${goods.setleCanclQy}" pattern="#,###"/></td>
+									<td class="right"><fmt:formatNumber value="${goods.sndngQy}" pattern="#,###"/></td>
+								</tr>
+							</c:if>
+						</c:forEach>
+					</table>
+				</c:if>
+				<c:if test="${empty goodsList}">
+					<table class="delivery_goods_print_info" align="center" style="width:100%;">
+						<colgroup>
+							<col style="width:auto;">
+							<col style="width:50px;">
+							<col style="width:35px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:70px;">
+							<col style="width:35px;">
+						</colgroup>
+						<tr>
+							<th>상품명</th>
+							<th>배송지</th>
+							<th>주문</th>
+							<th>판매가</th>
+							<th>할인</th>
+							<th>할인가(단가)</th>
+							<th>적립</th>
+							<th>배송</th>
+							<th>취소</th>
+						</tr>
+						<tr>
+							<td colspan="9" style="text-align: center">조회된 데이터가 없습니다.</td>
+						</tr>
+					</table>
+				</c:if>
+				<%--<div style="height:5px;"></div>
+				<table align="center" style="width:696px;">
+					<colgroup>
+						<col style="width:20%;">
+						<col>
+						<col style="width:20%;">
+						<col>
+						<col style="width:20%;">
+						<col>
+						<col style="width:20%;">
+					</colgroup>
+					<tbody>
+						<tr>
+							<td style="text-align:right;font-size:12px;">
+								<span>총 상품금액</span>
+							</td>
+							<td style="text-align:center;font-size:12px;"><span>+</span></td>
+							<td style="text-align:right;font-size:12px;">
+								<span>배송비</span>
+							</td>
+							<td style="text-align:center;font-size:12px;"><span>-</span></td>
+							<td style="text-align:right;font-size:12px;">
+								<span>할인<span> <fmt:formatNumber value="${setle.dscntAmt}" pattern="#,###"/>${curUnit}</span></span>
+							</td>
+							<td style="text-align:center;font-size:12px;"><span>=</span></td>
+							<td style="text-align:right;font-size:12px;">
+								<span>총 결제금액</span>
+							</td>
+						</tr>
+						<tr>
+							<td style="text-align:right;font-size:11px;">
+								<span><fmt:formatNumber value="${setle.slepric}" pattern="#,###"/>${curUnit}</span>
+							</td>
+							<td></td>
+							<td style="text-align:right;font-size:11px;">
+								<div>
+									<span><fmt:formatNumber value="${setle.dlvyAmt}" pattern="#,###"/>${curUnit}</span>
+								</div>
+							</td>
+							<td></td>
+							<td style="text-align:right;font-size:11px;">
+								<c:set var="dscnts" value="${ordrDtstmnDwld.dscnt}"/>
+								<c:if test="${not empty dscnts}">
+									<c:forEach var="dscnt" items="${dscnts}" varStatus="status">
+										<div>${dscnt.dscntDvNm}:<span><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</span></div>
+									</c:forEach>
+								</c:if>
+								<c:if test="${empty dscnts}">
+									<div><span>0${curUnit}</span></div>
+								</c:if>
+							</td>
+							<td></td>
+							<td style="text-align:right;font-size:12px;">
+								<span>
+									<fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/>${curUnit}
+									(<fmt:formatNumber value="${setle.wonRlSetleAmt}" pattern="#,###"/>${krUnit})
+								</span>
+							</td>
+						</tr>
+					</tbody>
+				</table>--%>
+			</div>
+			<c:if test="${isLast}">
+				<div style="height:50px"></div>
+			</c:if>
+		</c:forEach>
+	</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/PurchOrdrListInqireR.jsp

@@ -0,0 +1,126 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page import="java.util.Date" %>
+<%--
+	Class Name : PurchOrdrListInqireR.jsp
+	Description : 발주서 대상 목록 조회
+	Modification Information
+
+	수정일 수정자 수정내용
+	------- -------- ---------------------------
+	2026-07-15 이대환 최초 생성
+--%>
+<!DOCTYPE html>
+<html lang="ko">
+	<section class="content-section">
+	<div class="form-control-container">
+		<div class="left">
+			<div class="search-number">
+				<span class="search-number__text">총<strong><c:out value="${ resultMap.paginationInfo.totalRecordCount }"/></strong>건</span>
+			</div>
+		</div>
+		<div class="center">
+		</div>
+		<div class="right">
+			<!-- 코드 사용 -->
+			<div class="select-box">
+				<select title="페이지당 출력될 목록건수" name="pageUnit" id="pageUnit" onchange="fn_select_list(1);return false;">
+					<c:forEach items="${ resultMap.paginationInfo.pageUnitArr }" var="pageUnit" varStatus="pageUnitStatus">
+						<option value="<c:out value="${ pageUnit }"/>"<c:if test="${ resultMap.paginationInfo.recordCountPerPage eq pageUnit}">selected="selected"</c:if>><c:out value="${ pageUnit }"/>개씩</option>
+					</c:forEach>
+				</select>
+			</div>
+		</div>
+	</div>
+	<hr class="horizontal-line">
+	<div class="form-control-container">
+		<div class="left">
+			<button type="button" class="btn outline sm" onclick="fn_ordrdtstmn_print();">
+				<i class="icon icon_print"></i>프린트
+			</button>
+			<button type="button" class="btn outline sm" onclick="fn_excel_download();">
+				<i class="icon icon_excel"></i>발주서 다운로드
+			</button>
+		</div>
+		<div class="center"></div>
+		<div class="right"></div>
+	</div>
+	<hr class="spacing">
+	<div class="table-wrapper">
+		<table class="table vertical">
+			<caption>회원 목록</caption>
+			<!-- 각 열 width 설정 -->
+			<colgroup>
+				<col style="width: 4%;">
+				<col style="width: 10%;">
+				<col style="width: 12%;">
+				<col style="width: 6%;">
+				<col style="width: 8%;">
+				<col style="width: auto;">
+				<col style="width: auto;">
+				<col style="width: 6%;">
+				<col style="width: auto;">
+				<col style="width: 6%;">
+			</colgroup>
+			<thead>
+				<tr>
+					<th>
+						<label class="b-checkbox checkbox is-medium check-all" id="chkALabel">
+							<input type="checkbox" id="chkA">
+							<span class="check"></span>
+						</label>
+					</th>
+					<th>엑셀 다운일</th>
+					<th>주문번호</th>
+					<th>배송번호</th>
+					<th>수취인</th>
+					<th>수취인 TEL</th>
+					<th>개인통관부호</th>
+					<th>우편번호</th>
+					<th>내용물</th>
+					<th>Unit Value</th>
+				</tr>
+			</thead>
+			<tbody>
+				<c:choose>
+					<c:when test="${not empty resultMap.resultList}">
+						<c:forEach var="resultList" items="${resultMap.resultList}">
+							<tr>
+								<td>
+									<label class="b-checkbox checkbox is-medium">
+										<input type="checkbox" value="${resultList.ordrInnb}/${resultList.ovseaSelerRegistCd}" class="chk" name="purchOrdrPK">
+										<span class="check"></span>
+									</label>
+									<input type="hidden" class="cstmclerCd" value="${resultList.cstmclerCd}">
+								</td>
+								<td><c:out value="${resultList.excelDownDt}"/></td>
+								<td><c:out value="${resultList.ordrInnb}"/></td>
+								<td><c:out value="${resultList.ovseaSelerRegistCd}"/></td>
+								<td><c:out value="${resultList.recpntNm}"/></td>
+								<td><c:out value="${resultList.recpntMbtlnb}"/></td>
+								<td><c:out value="${resultList.cstmclerCd}"/></td>
+								<td><c:out value="${resultList.dlvylcZip}"/></td>
+								<td><c:out value="${resultList.cn}"/></td>
+								<td><c:out value="${resultList.unitValue}"/></td>
+							</tr>
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr>
+							<td colspan="100%"><spring:message code="common.nodata"/></td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
+			</tbody>
+		</table>
+	</div>
+	</section>
+	<div class="pagination__container mt-30">
+		<input type="hidden" id="pageIndex" name="pageIndex" value="${ ordrSrchVO.pageIndex}"/>
+		<ui:pagination paginationInfo="${resultMap.paginationInfo}" type="image" jsFunction="fn_select_list"/>
+	</div>
+</html>

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/PurchOrdrListInqireRForm.jsp

@@ -0,0 +1,320 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page import="java.util.Date" %>
+<%--
+	Class Name : PurchOrdrListInqireRForm.jsp
+	Description : 발주서 관리 폼
+	Modification Information
+
+	수정일 수정자 수정내용
+	------- -------- ---------------------------
+	2026-07-15 이대환 최초 생성
+--%>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+	<%-- 공통 include --%>
+	<%@include file ="/WEB-INF/views/comm/mngr/Include.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			//form메소드에서 pageIndex, pageUnit 갖고옴
+			let pageIndex = '<c:out value="${ ordrSrchVO.pageIndex }"/>';
+			<%--let pageUnit = '<c:out value="${ ordrSrchVO.pageUnit }"/>';--%>
+			let pageUnit = 100;
+
+			fn_select_list(pageIndex, pageUnit);
+
+			//검색 버튼 클릭
+			$('#btnSearch').on('click', function(){
+				fn_select_list(1);
+			});
+		});
+
+		/* ********************************************************
+		 * 발주서 목록 조회
+		 ******************************************************** */
+		const fn_select_list = function(pageIndex, pageUnit) {
+			let dataStr;
+			if(!pageIndex) {
+				$('#pageIndex').val(1);
+			} else {
+				$('#pageIndex').val(pageIndex);
+			}
+
+			if(!pageUnit) {
+				dataStr	= $('#listForm').serialize();
+			} else {
+				if($('#pageUnit').length){
+					$('#pageUnit').val(pageUnit);
+					dataStr	= $('#listForm').serialize();
+				} else {
+					dataStr	= $('#listForm').serialize()+'&pageUnit='+pageUnit;
+				}
+			}
+
+			$.ajax({
+				type: 'post',
+				url : '/mngr/ordr/ordrmngr/selectExcelPoListInqire',
+				data : dataStr,
+				success:function(resultHtml) {
+					$('#pageDiv').html(resultHtml);
+					$('#pageUnit').niceSelect();
+				}
+			});
+		}
+
+		/* ********************************************************
+		 * 발주서 주문내역서 프린트
+		 ******************************************************** */
+		const fn_ordrdtstmn_print = function () {
+			const checkedBoxes = $('input[name="purchOrdrPK"]:checked');
+
+			if (checkedBoxes.length === 0) {
+				alert('선택값이 없습니다.');
+
+				return false;
+			}
+
+			let srchOrdrInnbs = [];
+			let srchOrdrDlvyInnbs = [];
+
+			$(checkedBoxes).each(function(idx, item) {
+				const split = $(item).val().split('/');
+				srchOrdrInnbs.push(split[0]);
+				srchOrdrDlvyInnbs.push(split[1]);
+			});
+
+			const title = 'orderPrint';
+			fn_open_center_popup(title, '900', '700');
+
+			var tempForm = $('<form>', {
+				target: title,
+				method: 'post',
+				action: '/mngr/ordr/ordrmngr/selectPurchOrdrDtstmnDwldPopupForm'
+			});
+
+			$.each(srchOrdrInnbs, function(key, value) {
+				$('<input>', {
+					type: 'hidden',
+					name: 'srchOrdrInnbs',
+					value: value
+				}).appendTo(tempForm);
+			});
+			$.each(srchOrdrDlvyInnbs, function(key, value) {
+				$('<input>', {
+					type: 'hidden',
+					name: 'srchOrdrDlvyInnbs',
+					value: value
+				}).appendTo(tempForm);
+			});
+			tempForm.appendTo('body');
+            console.log(tempForm.prop('outerHTML'));
+
+			tempForm.submit();
+			tempForm.remove();
+		}
+
+		/**
+		 * 발주서 엑셀다운로드
+		 * */
+		const fn_excel_download = function () {
+			const checkedBoxes = $('input[name="purchOrdrPK"]:checked');
+
+			if (checkedBoxes.length === 0) {
+				alert('선택값이 없습니다.');
+
+				return false;
+			}
+
+			let cstmclerCds = [];
+			let srchOrdrInnbs = [];
+			let srchOrdrDlvyInnbs = [];
+
+			$(checkedBoxes).each(function(idx, item) {
+				const cstmclerCd = $(this).closest('td').find('.cstmclerCd').val();
+				cstmclerCds.push(cstmclerCd);
+
+				const split = $(item).val().split('/');
+				srchOrdrInnbs.push(split[0]);
+				srchOrdrDlvyInnbs.push(split[1]);
+			});
+
+			const duplicate = new Set(cstmclerCds).size !== cstmclerCds.length;
+			if(duplicate) {
+				alert('개인통관부호가 중복되었습니다.')
+				return false;
+			}
+
+			var tempForm = $('<form>', {
+				method: 'post',
+				action: '/mngr/ordr/ordrmngr/selectExcelPoDwldListInqire'
+			});
+
+			$.each(srchOrdrInnbs, function(key, value) {
+				$('<input>', {
+					type: 'hidden',
+					name: 'srchOrdrInnbs',
+					value: value
+				}).appendTo(tempForm);
+			});
+			$.each(srchOrdrDlvyInnbs, function(key, value) {
+				$('<input>', {
+					type: 'hidden',
+					name: 'srchOrdrDlvyInnbs',
+					value: value
+				}).appendTo(tempForm);
+			});
+			tempForm.appendTo('body');
+
+			tempForm.submit();
+			tempForm.remove();
+		}
+
+		/* open popup */
+		const fn_open_center_popup = function (title, w, h) {
+			const dualScreenLeft = window.screenLeft != undefined ? window.screenLeft : screen.left;
+			const dualScreenTop = window.screenTop != undefined ? window.screenTop : screen.top;
+
+			const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width;
+			const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height;
+
+			const left = ((width / 2) - (w / 2)) + dualScreenLeft;
+			const top = ((height / 2) - (h / 2)) + dualScreenTop;
+
+			window.open('', title, 'scrollbars=yes, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left);
+		}
+
+		/**
+		 * 체크박스 전체 처리
+		 * */
+		const fn_change_event = function (_target, _arg) {
+			if (_arg === 'all') {
+
+				if ($('#' + _target + '-all').is(':checked')) {
+					$('[name=' + _target + ']').prop('checked', true);
+				} else {
+					$('[name=' + _target + ']').prop('checked', false);
+				}
+
+			} else {
+
+				let chkCnt = $('[name=' + _target + ']:checked').length;
+				let allCnt = $('[name=' + _target + ']').length;
+				if (chkCnt !== allCnt && $('#' + _target + '-all').is(':checked')) {
+					$('#' + _target + '-all').prop('checked', false);
+				} else if (chkCnt === allCnt) {
+					$('#' + _target + '-all').prop('checked', true);
+				}
+			}
+		}
+
+		// 테이블 체크박스 전체 선택
+		$(document).on("click", "#chkA", function () {
+			if($(this).is(':checked')){
+				$(".chk").prop('checked', true);
+			}else{
+				$(".chk").prop('checked', false);
+			}
+		});
+
+		// 목록에서 체크 해제시 전체 체크박스 해제 및 목록 항목 전체 체크 시 전체체크 버튼 true
+		$(document).on("click", ".chk", function () {
+			let length = $(".chk").length;
+			let chcedLen = $(".chk:checked").length;
+			if (length == chcedLen) {
+				$("#chkA").prop('checked', true);
+			}else{
+				$("#chkA").prop('checked', false);
+			}
+		});
+	</script>
+</head>
+<body>
+	<%-- 상단메뉴 공통화 적용 : 2023-11-30 / 박철민 추가 --%>
+	<%@include file ="/WEB-INF/views/comm/mngr/Header.jsp" %>
+	<main class="main">
+		<%-- 좌측메뉴 공통화 적용 : 2023-11-30 / 박철민 추가 --%>
+		<%@include file ="/WEB-INF/views/comm/mngr/Left.jsp" %>
+		<div class="content">
+			<div class="content__inner">
+				<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
+				<div class="page-title">
+					<h2 class="page-title__title">발주서 대상 조회</h2>
+				</div>
+				<form id="listForm">
+					<section class="content-section">
+						<span class="red-7">*검색어는 정확히 입력해주세요</span>
+						<div class="table-wrapper">
+							<table class="table">
+								<caption>발주서 대상 검색</caption>
+								<colgroup>
+									<col style="width: 12%;">
+									<col>
+								</colgroup>
+								<tr>
+									<th>배송지</th>
+									<td>
+										<div class="td-inner">
+											<div class="b-checkbox-container">
+												<label class="b-checkbox checkbox check-all">
+													<input id="dlvylcAreaCds-all" type="checkbox" onclick="fn_change_event('dlvylcAreaCds', 'all');">
+													<span class="check"></span>
+													<span class="control-label">전체</span>
+												</label>
+												<c:forEach items="${nationCdList}" var="nationCd" varStatus="status">
+													<label class="b-checkbox checkbox">
+														<input type="checkbox" name="dlvylcAreaCds" value="${nationCd.cd}"onclick="fn_change_event('dlvylcAreaCds', 'other');" <c:if test="${nationCd.cd eq 'KR'}">checked</c:if>>
+														<span class="check"></span>
+														<span class="control-label">${nationCd.cdNm}</span>
+													</label>
+												</c:forEach>
+											</div>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>엑셀다운 포함 여부</th>
+									<td>
+										<div class="td-inner">
+											<div class="custom-radio-container">
+												<div class="custom-radio">
+													<input type="radio" id="excelIncY" name="excelInclude" value="Y" checked>
+													<label for="excelIncY">포함</label>
+												</div>
+												<div class="custom-radio">
+													<input type="radio" id="excelIncN" name="excelInclude" value="N">
+													<label for="excelIncN">미포함</label>
+												</div>
+											</div>
+										</div>
+									</td>
+								</tr>
+							</table>
+						</div>
+						<div class="form-control-container">
+							<div class="left"></div>
+							<div class="center">
+								<button type="button" class="btn outline" id="btnResetForm">
+									<spring:message code="button.init"/>
+								</button>
+								<button type="button" class="btn primary" id="btnSearch">
+									<spring:message code="button.search"/>
+								</button>
+							</div>
+							<div class="right">
+							</div>
+						</div>
+					</section>
+					<div id="pageDiv"></div>
+				</form>
+				<button class="scroll-to-top"><span class="visually-hidden">위로가기</span></button>
+			</div>
+		</div>
+	</main>
+	<div id = "modalDiv"></div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mobileMain.jsp

@@ -180,10 +180,10 @@
 															                                	<c:forEach items="${fn:split(case02.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 													                                                <c:choose>
 													                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-													                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+													                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 													                                                    </c:when>
 													                                                    <c:otherwise>
-													                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+													                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 													                                                    </c:otherwise>
 													                                                </c:choose>
 										                                            			</c:forEach>
@@ -355,10 +355,10 @@
 											                                            	<c:forEach items="${fn:split(case04.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 												                                                <c:choose>
 												                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 												                                                    </c:when>
 												                                                    <c:otherwise>
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 												                                                    </c:otherwise>
 												                                                </c:choose>
 									                                            			</c:forEach>
@@ -507,10 +507,10 @@
 													                                	<c:forEach items="${fn:split(case05.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 											                                                <c:choose>
 											                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-											                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+											                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 											                                                    </c:when>
 											                                                    <c:otherwise>
-											                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+											                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 											                                                    </c:otherwise>
 											                                                </c:choose>
 								                                            			</c:forEach>
@@ -622,10 +622,10 @@
 											                                            	<c:forEach items="${fn:split(case07.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 												                                                <c:choose>
 												                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 												                                                    </c:when>
 												                                                    <c:otherwise>
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 												                                                    </c:otherwise>
 												                                                </c:choose>
 									                                            			</c:forEach>
@@ -754,10 +754,10 @@
 											                                            	<c:forEach items="${fn:split(case08.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 												                                                <c:choose>
 												                                                    <c:when test="${fn:contains(iconCdNm, '-')}">
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 												                                                    </c:when>
 												                                                    <c:otherwise>
-												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+												                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 												                                                    </c:otherwise>
 												                                                </c:choose>
 									                                            			</c:forEach>
@@ -1220,10 +1220,10 @@
 																		<c:forEach items="${fn:split(case02.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																			<c:choose>
 																				<c:when test="${fn:contains(iconCdNm, '-')}">
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																				</c:when>
 																				<c:otherwise>
-																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																					<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																				</c:otherwise>
 																			</c:choose>
 																		</c:forEach>
@@ -1403,10 +1403,10 @@
 																			   var="iconCdNm" varStatus="iconStatus">
 																		<c:choose>
 																			<c:when test="${fn:contains(iconCdNm, '-')}">
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																			</c:when>
 																			<c:otherwise>
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																			</c:otherwise>
 																		</c:choose>
 																	</c:forEach>
@@ -1566,10 +1566,10 @@
 																<c:forEach items="${fn:split(case05.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																	<c:choose>
 																		<c:when test="${fn:contains(iconCdNm, '-')}">
-																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																		</c:when>
 																		<c:otherwise>
-																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																			<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																		</c:otherwise>
 																	</c:choose>
 																</c:forEach>
@@ -1681,10 +1681,10 @@
 																	<c:forEach items="${fn:split(case07.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																		<c:choose>
 																			<c:when test="${fn:contains(iconCdNm, '-')}">
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																			</c:when>
 																			<c:otherwise>
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																			</c:otherwise>
 																		</c:choose>
 																	</c:forEach>
@@ -1813,10 +1813,10 @@
 																	<c:forEach items="${fn:split(case08.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
 																		<c:choose>
 																			<c:when test="${fn:contains(iconCdNm, '-')}">
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
 																			</c:when>
 																			<c:otherwise>
-																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+																				<span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
 																			</c:otherwise>
 																		</c:choose>
 																	</c:forEach>
@@ -2156,9 +2156,9 @@
 
 						if (iconCdNm.includes('-')) {
 							let temp = upper.replace(/-/g, ' ');
-							str += '<span class="product-badge ' + lower + '">' + temp + '</span>';
+							str += '<span class="product-badge ' + lower + '" data-badge-cd="' + iconCdNm + '">' + temp + '</span>';
 						} else {
-							str += '<span class="product-badge ' + lower + '">' + upper + '</span>';
+							str += '<span class="product-badge ' + lower + '" data-badge-cd="' + iconCdNm + '">' + upper + '</span>';
 						}
 					});
 				}

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttDtlR.jsp

@@ -16,6 +16,7 @@
 --%>
 <!DOCTYPE html>
 <html lang="ko">
+<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -132,13 +133,13 @@
             });
         } else { //메인화면 호출 안할 시
             // 상품 - 4열 슬라이드 타입 (이벤트 추천 상품 슬릭 이벤트)
-            $('.four-row-slick').slick({
+            $('.relate-goods-slick').slick({
                 slidesToShow: 4,
                 slidesToScroll: 4,
                 speed: 900,
                 infinite: true,
-                prevArrow: $('.four-row-slick__prev'),
+                prevArrow: $('.relate-goods-slick__prev'),
-                nextArrow: $('.four-row-slick__next'),
+                nextArrow: $('.relate-goods-slick__next'),
             });
         }
     }
@@ -266,7 +267,7 @@
         const reqUrl = $("#reqUrl").val();
         if (reqUrl === 'csc') {
             form.attr("action", "/sopmal/csc/selectCscListForm");
-        } else if (reqUrl === 'subPage') {
+        } else if (reqUrl === 'subPage' || reqUrl === 'detail') {
             form.attr("action", "/sopmal/csc/selectSubPageListForm");
         }
         form.attr("method", "POST");
@@ -823,7 +824,9 @@
                             <i class="icon icon_lock"></i>
                         </c:if>
                     </h4>
+                    <c:if test="${bbsInfo.registDtYn eq 'Y'}">
                         <p class="eventDetail__date"><c:out value="${bbscttInfo.sumRegistDt}"/></p>
+                    </c:if>
                 </div>
                 <%-------------------------------%>
                 <%--첨부 파일 다운로드 영역--%>
@@ -938,106 +941,96 @@
                     </div>
                 </c:if>
                 <%-------------------------------%>
-                <c:if test="${bbsInfo.recomendGoodsExpsrAt eq 'Y' && not empty goodsList.relateInfoList}">
+                <c:if test="${bbsInfo.recomendGoodsExpsrAt eq 'Y' && not empty goodsList}">
                     <div class="cartOrder">
                         <div class="main-section__container">
                             <section class="main-section main-section__four-row">
                                 <div class="main-section-header">
                                     <div class="main-section-title">
                                         <h3 class="main-section-title__title">
-                                            추천 상품
+											<c:choose>
+												<c:when test = "${not empty bbscttInfo.relateGoodsWords}">
+													<c:out value="${bbscttInfo.relateGoodsWords}" escapeXml="false"/>
+												</c:when>
+												<c:otherwise>
+													이 글과 관련된 사케
+												</c:otherwise>
+											</c:choose>
                                         </h3>
                                     </div>
                                 </div>
                                 <div class="product-list-type1">
-                                    <div class="four-row-slick evtSlick">
+                                    <div class="${fn:length(goodsList) gt 4 ? 'four-row-slick relate-goods-slick evtSlick' : 'product-list-type1__list'}">
-                                        <c:forEach var = "item" items="${goodsList.relateInfoList}">
+                                        <c:forEach var = "item" items="${goodsList}">
                                             <c:if test = "${not empty item.goodsInnb}">
                                                 <div class="product-unit">
                                                     <div class="product-unit-image">
-                                                        <c:forEach var = "img" items = "${goodsList.relateImgList}">
+                                                        <c:if test="${item.goodsSttusCd eq '02'}">
-                                                            <c:if test = "${item.goodsInnb eq img.goodsInnb}">
+                                                            <div class="sold-out"><span>입고 대기중</span></div>
-                                                                <button type="button" onclick = "fn_move_goods_dtl(<c:out value="${item.goodsInnb}"/>)" value="${item.goodsInnb}">
+                                                        </c:if>
+                                                        <a class="product-detail" href="javascript:void(0);" onclick="fn_move_goods_dtl('<c:out value="${item.goodsInnb}"/>');">
                                                             <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
-                                                                    <img src="<c:out value = "${cdnurl}${img.img}"/>" style="width: 100%;
+                                                            <img src="<c:out value = "${cdnurl}${item.img}"/>"
-                                                                                                                            height: 304px; /* 원하는 고정 높이 설정 */
+                                                                 onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${item.goodsNm}"/>">
-                                                                                                                            object-fit: cover; /* 이미지 비율을 유지하면서 영역에 맞게 자름 */"
+                                                        </a>
-                                                                         onerror="this.src='/pc/images/image_placeholder.png'" alt="해당 이미지에 대한 설명">
+                                                    </div>
-                                                                </button>
+                                                    <div class="product-unit-info d-flex flex-column" style="flex-direction:column">
-                                                            </c:if>
+                                                        <c:if test="${not empty item.iconCdNmList && item.iconExpsrAt eq 'Y'}">
+                                                            <div class="product-badge-container col order-${item.iconExpsrOrdr-1}" style="order: ${item.iconExpsrOrdr-1}">
+                                                                <c:forEach items="${fn:split(item.iconCdNmList, ',')}" var="iconCdNm">
+                                                                    <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                                 </c:forEach>
                                                             </div>
-                                                    <div class="product-unit-info">
-                                                        <div class="product-badge-container">
-                                                            <c:if test = "${not empty item.goodsIconCd}">
-                                                                <c:forEach items="${fn:split(item.goodsIconCd, ',')}" var="icon">
-                                                                    <c:if test="${icon eq 'new'}">
-                                                                        <span class="product-badge new">NEW</span>
                                                         </c:if>
-                                                                    <c:if test="${icon eq 'hot'}">
+                                                        <c:if test="${item.goodsNmExpsrAt eq 'Y'}">
-                                                                        <span class="product-badge hot">HOT</span>
+                                                            <div class="product-unit-title col order-${item.goodsNmExpsrOrdr-1}" style="order: ${item.goodsNmExpsrOrdr-1}">
-                                                                    </c:if>
+                                                                <a href="javascript:void(0);" onclick="fn_move_goods_dtl('<c:out value="${item.goodsInnb}"/>');">
-                                                                    <c:if test="${icon eq 'best'}">
-                                                                        <span class="product-badge best">BEST</span>
-                                                                    </c:if>
-                                                                    <c:if test="${icon eq 'md-pick'}">
-                                                                        <span class="product-badge md-pick">MD PICK</span>
-                                                                    </c:if>
-                                                                    <c:if test="${icon eq 'hot-deal'}">
-                                                                        <span class="product-badge four-row">HOT DEAL</span>
-                                                                    </c:if>
-                                                                </c:forEach>
-                                                            </c:if>
-                                                        </div>
-                                                        <div class="product-unit-info__inner">
-                                                            <div class="product-unit-title">
-                                                                <button type="button" onclick = "fn_move_goods_dtl(<c:out value="${item.goodsInnb}"/>)">
                                                                     <c:out value = "${item.goodsNm}"/>
-                                                                </button>
+                                                                </a>
                                                             </div>
-                                                            <div class="product-unit-price">
+                                                        </c:if>
-                                                               <c:forEach var="goodsOpt" items="${goodsList.relateGoodsOptList}">
+                                                        <c:if test="${item.pricExpsrAt eq 'Y'}">
-                                                                    <c:if test="${item.goodsInnb eq goodsOpt.goodsInnb && goodsOpt.stdrDvAt eq 'Y'}">
+                                                            <div class="product-unit-price col order-${item.pricExpsrOrdr-1}" style="order: ${item.pricExpsrOrdr-1}">
                                                                         <div class="product-unit-price__price">
-                                                                            <span class="product-unit-price__original">
+                                                                            <span class="product-unit-price__original <c:if test="${item.slePercent eq 0}">visually-hidden</c:if>">
-                                                                                <fmt:formatNumber value="${goodsOpt.cnsmrpric}" pattern="#,###"/>
+                                                                                <fmt:formatNumber value="${item.cnsmrpric}"/> ${curUnit}
                                                                             </span>
                                                                             <span class="product-unit-price__current">
-                                                                                <fmt:formatNumber value="${goodsOpt.slepric}" pattern="#,###"/>
+                                                                                <fmt:formatNumber value="${item.slepric}"/> ${curUnit}
                                                                             </span>
                                                                         </div>
-                                                                        <div class="product-unit-price__sale">
+                                                                        <div class="product-unit-price__sale <c:if test="${item.slePercent eq 0}">visually-hidden</c:if>">
-                                                                            <span class="percent"><c:out value = "${goodsOpt.slePercent}"/>%</span>
+                                                                            <span class="percent"><c:out value = "${item.slePercent}"/> %</span>
+                                                                        </div>
                                                             </div>
                                                         </c:if>
-                                                                </c:forEach>
+                                                        <c:if test="${item.reprsntDcExpsrAt eq 'Y'}">
-                                                            </div>
+                                                            <div class="product-unit-price__monthly-payment col order-${item.reprsntDcExpsrOrdr-1}" style="order: ${item.reprsntDcExpsrOrdr-1}"><c:out value = "${item.reprsntDc}"/></div>
-                                                            <span class="product-unit-price__monthly-payment"><c:out value = "${item.srtDc}"/></span>
+                                                        </c:if>
-                                                        </div>
+                                                        <c:if test="${item.rvwEvlScreExpsrAt eq 'Y'}">
-                                                        <div class="product-unit-rating">
+                                                        <div class="product-unit-rating col order-${item.rvwEvlScreExpsrOrdr-1}" style="order: ${item.rvwEvlScreExpsrOrdr-1}">
                                                             <i class="icon icon_rating-star"></i>
-                                                            <c:forEach var = "evlInfo" items="${goodsList.goodsRvwEvlList}">
+                                                            <span class="product-unit-rating__score"><c:out value = "${item.avgEvlScore}"/></span>
-                                                                <c:if test = "${evlInfo.goodsInnb eq item.goodsInnb}">
+                                                            <span class="product-unit-rating__count">(<fmt:formatNumber value="${item.cntEvlScor}"/>)</span>
-                                                                    <span class="product-unit-rating__score"><c:out value = "${evlInfo.avgEvlScore}"/>${goodsOpt.goodInnb}</span>
-                                                                    <span class="product-unit-rating__count">(<fmt:formatNumber value="${evlInfo.cntBbsctt}" pattern="#,###"/>)</span>
-                                                                </c:if>
-                                                            </c:forEach>
                                                         </div>
+                                                        </c:if>
                                                     </div>
                                                 </div>
                                             </c:if>
                                         </c:forEach>
                                     </div>
+                                    <c:if test="${fn:length(goodsList) gt 4}">
                                     <div class="four-row-slick__btn-container">
-                                        <button class="four-row-slick__prev">
+                                        <button class="relate-goods-slick__prev">
                                             <i class="icon icon_prev02"></i>
                                             <span class="visually-hidden">이전</span>
                                         </button>
-                                        <button class="four-row-slick__next">
+                                        <button class="relate-goods-slick__next">
                                             <i class="icon icon_next02"></i>
                                             <span class="visually-hidden">다음</span>
                                         </button>
                                     </div>
+                                    </c:if>
                                 </div>
                             </section>
                         </div>

src/main/webapp/WEB-INF/views/sopmal/csc/CscAcordionTyR.jsp

@@ -260,7 +260,7 @@
        </c:choose>
         </tbody>
     </table>
-    <c:if test = "${bbsInfo.bbscttRegist eq 'Y'}">
+    <c:if test = "${bbsInfo.bbscttRegist eq 'Y' and resultMap.registAuthResult eq 'Y'}">
         <div class="sub-board__top-btn-container">
             <button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button>
         </div>

src/main/webapp/WEB-INF/views/sopmal/csc/CscListRForm.jsp

@@ -114,8 +114,8 @@
                 "crudDv": crudDv
             },
             success: function (data) {
-                data = JSON.parse(data.resBody.result);
+                const parsed = JSON.parse(data.resBody.result);
-                fn_branch_bbsctt_posble(data, idx);
+                fn_branch_bbsctt_posble(parsed, idx);
             }
         });
     }

src/main/webapp/WEB-INF/views/sopmal/csc/CscListTyR.jsp

@@ -292,7 +292,7 @@
             </c:choose>
             </tbody>
         </table>
-        <c:if test = "${bbsInfo.bbscttRegist eq 'Y'}">
+        <c:if test = "${bbsInfo.bbscttRegist eq 'Y' and resultMap.registAuthResult eq 'Y'}">
             <div class="sub-board__top-btn-container">
                 <button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button>
             </div>

src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp

@@ -3922,14 +3922,16 @@
                                 <c:if test="${not empty resultMap.goodsDtl.goodsIconCd}">
                                     <div class="product-badge-container">
                                         <c:forTokens var="iconNm" items="${resultMap.goodsDtl.goodsIconCd}" delims=",">
-                                            <c:choose>
+                                            <c:set var="badgeMatched" value="false"/>
-                                                <c:when test="${fn:contains(iconNm,'-')}">
+                                            <c:forEach items="${resultMap.goodsBadgeList}" var="badge">
-                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
+                                                <c:if test="${badge.cd eq iconNm}">
-                                                </c:when>
+                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}" style="color: ${badge.fontColor} !important; background-color: ${badge.bgColor} !important; border-color: ${badge.borderColor} !important;">${badge.cdNm}</span>
-                                                <c:otherwise>
+                                                    <c:set var="badgeMatched" value="true"/>
-                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(iconNm)}</span>
+                                                </c:if>
-                                                </c:otherwise>
+                                            </c:forEach>
-                                            </c:choose>
+                                            <c:if test="${not badgeMatched}">
+                                                <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}">${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
+                                            </c:if>
                                         </c:forTokens>
                                     </div>
                                 </c:if>

src/main/webapp/WEB-INF/views/sopmal/goods/GoodsListR.jsp

@@ -84,10 +84,10 @@
                                             <c:forEach items="${fn:split(list.iconCdNmList, ',')}" var="iconCdNm" varStatus="iconStatus">
                                                 <c:choose>
                                                     <c:when test="${fn:contains(iconCdNm, '-')}">
-                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                     </c:when>
                                                     <c:otherwise>
-                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:forEach>

src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchR.jsp

@@ -78,10 +78,10 @@
                                             <c:forEach items="${fn:split(list.iconCdNmList, ',')}" var="iconCdNm" varStatus="iconStatus">
                                                 <c:choose>
                                                     <c:when test="${fn:contains(iconCdNm, '-')}">
-                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                     </c:when>
                                                     <c:otherwise>
-                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+                                                        <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:forEach>

src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp

@@ -1002,10 +1002,10 @@
                                                                         <c:forEach items="${fn:split(case02.goodsIconCd, ',')}" var="iconCdNm" varStatus="iconStatus">
                                                                             <c:choose>
                                                                                 <c:when test="${fn:contains(iconCdNm, '-')}">
-                                                                                    <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+                                                                                    <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                                                 </c:when>
                                                                                 <c:otherwise>
-                                                                                    <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+                                                                                    <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
                                                                                 </c:otherwise>
                                                                             </c:choose>
                                                                         </c:forEach>

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp

@@ -28,6 +28,8 @@
         border: 1px solid #dee2e6 !important;
     }
 </style>
+<jsp:useBean id="nowDate" class="java.util.Date" />
+<fmt:formatDate var="currentTime" value="${nowDate}" pattern="yyyy-MM-dd HH:mm:ss" />
 <!-- 배송 조회 -->
 <div id="delivery-check-pop" class="modal default" style="max-width: 640px;">
 	<div class="modal-header">
@@ -56,7 +58,16 @@
 							</tr>
 							<tr>
 								<th>수령인</th>
-								<td><c:out value="${ podInfo.recipient }"/></td>
+								<td>
+									<c:choose>
+										<c:when test="${ podInfo.recipient eq 'null' }">
+											<c:out value="${ ordrInfo.shippingList[0].recpntNm }"/>
+										</c:when>
+										<c:otherwise>
+											<c:out value="${ podInfo.recipient }"/>
+										</c:otherwise>
+									</c:choose>
+								</td>
 							</tr>
 						</tbody>
 					</table>
@@ -85,8 +96,16 @@
 									<td><c:out value="${ podInfo.dateLocalwhin }"/></td>
 									<td></td>
 									<td>
+										<c:choose>
+											<c:when test="${ podInfo.dateLocalwhin > currentTime }">
+												발송물이 픽업(예정)되어, 공항출항 대기중입니다.
+												<p class="statusEn">Shipment pick up(expected) and waiting at the origin airport</p>
+											</c:when>
+											<c:otherwise>
 												발송물이 픽업되어, 공항출항 대기중입니다.
 												<p class="statusEn">Shipment pick up and waiting at the origin airport</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -95,8 +114,16 @@
 									<td><c:out value="${ podInfo.dateLocaldeparture }"/></td>
 									<td></td>
 									<td>
+										<c:choose>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												화물이 인천공항으로 출발(예정)하였습니다.
+												<p class="statusEn">Shipment departed(expected) to Incheon International Airport</p>
+											</c:when>
+											<c:otherwise>
 												화물이 인천공항으로 출발하였습니다.
 												<p class="statusEn">Shipment departed to Incheon International Airport</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -105,8 +132,16 @@
 									<td><c:out value="${ podInfo.dateIcnarrival }"/></td>
 									<td>인천공항</td>
 									<td>
+										<c:choose>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												화물이 인천공항에 도착(예정)하였습니다.
+												<p class="statusEn">Shipped the goods arrived(expected) at Incheon International Airport.</p>
+											</c:when>
+											<c:otherwise>
 												화물이 인천공항에 도착하였습니다.
 												<p class="statusEn">Shipped the goods arrived at Incheon International Airport.</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -115,8 +150,16 @@
 									<td><c:out value="${ podInfo.dateCustomes }"/></td>
 									<td>인천공항</td>
 									<td>
+										<c:choose>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												인천공항 세관에서 통관완료(예정)되었습니다.
+												<p class="statusEn">Customs clearance is completed(expected) in the Republic of Korea</p>
+											</c:when>
+											<c:otherwise>
 												인천공항 세관에서 통관완료되었습니다.
 												<p class="statusEn">Customs clearance is completed in the Republic of Korea</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>

src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp

@@ -641,6 +641,8 @@
                 // Npay CID 세팅
                 const kcpMid = '<c:out value="${data.payInfo.kcpMid}"/>';
                 const bpayMid = '<c:out value="${data.payInfo.bpayMid}"/>';
+                // 개발서버 네이버페이 CPID 구분 적용 취소
+                // $(form).find('#siteCdMid').val(kcpMid);
                 if('naverpay' === id) {
                     $(form).find('#siteCdMid').val(bpayMid);
                 } else {

src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp

@@ -1564,10 +1564,10 @@
                                                             <c:forEach var="iconNm" items="${fn:split(goodsInfo.iconCdNmList,',')}">
                                                                 <c:choose>
                                                                     <c:when test="${fn:contains(iconNm,'-')}">
-                                                                        <span class="product-badge ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
+                                                                        <span class="product-badge ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}"> ${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
                                                                     </c:when>
                                                                     <c:otherwise>
-                                                                        <span class="product-badge ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(iconNm)}</span>
+                                                                        <span class="product-badge ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}"> ${fn:toUpperCase(iconNm)}</span>
                                                                     </c:otherwise>
                                                                 </c:choose>
                                                             </c:forEach>

src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp

@@ -16,6 +16,7 @@
 --%>
 <!DOCTYPE html>
 <html lang="ko">
+<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 
 <head>
     <jsp:include page="/WEB-INF/views/comm/mobile/Include.jsp"/>
@@ -26,9 +27,15 @@
             history.scrollRestoration = 'manual';
         }
         $(window).scrollTop(0);
-        /*헤더에 타이틀 set*/
+        /* ABOUT 하위 화면은 게시판명이 아닌 대메뉴명을 표시 */
-        const title = '<c:out value="${resultMap.bbsInfo.bbsNm}"/>';
+        <c:choose>
-        fn_set_header_title(title);
+            <c:when test="${param.mobileAboutMenuAt eq 'Y'}">
+                fn_set_header_title('ABOUT');
+            </c:when>
+            <c:otherwise>
+                fn_set_header_title('<c:out value="${resultMap.bbsInfo.bbsNm}"/>');
+            </c:otherwise>
+        </c:choose>
         fn_select_cn();
         // data-micromodal-trigger 속성을 가진 버튼을 클릭하면 해당 ID의 모달이 열림
         // 모달 배경화면 스크롤 방지
@@ -278,7 +285,7 @@
         const reqUrl = $("#reqUrl").val();
         if (reqUrl === 'csc') {
             form.attr("action", "/sopmal/csc/selectCscListForm");
-        } else if (reqUrl === 'subPage') {
+        } else if (reqUrl === 'subPage' || reqUrl === 'detail') {
             form.attr("action", "/sopmal/csc/selectSubPageListForm");
         }
         form.attr("method", "POST");
@@ -1252,8 +1259,11 @@
                                         <i class="icon icon_lock"></i>
                                     </c:if>
                                 </h4>
+                                <c:if test="${param.mobileAboutMenuAt ne 'Y'}">
                                 <ul class="eventDetail__list">
+                                    <c:if test="${bbsInfo.registDtYn eq 'Y'}">
                                         <li><c:out value="${bbscttInfo.sumRegistDt}"/></li>
+                                    </c:if>
                                     <li>조회 <c:out value="${bbscttInfo.inqireCnt}"/></li>
                                     <li>
                                         <c:choose>
@@ -1291,6 +1301,7 @@
                                         </c:choose>
                                     </li>
                                 </ul>
+                                </c:if>
                             </div>
                             <%-------------------------------%>
                             <%--첨부 파일 다운로드 영역--%>
@@ -1413,7 +1424,7 @@
                             </c:if>
                             <%-------------------------------%>
                            <%--연관상품영역--%>
-                           <c:if test="${bbsInfo.recomendGoodsExpsrAt eq 'Y' && not empty goodsList.relateInfoList}">
+                           <c:if test="${bbsInfo.recomendGoodsExpsrAt eq 'Y' && not empty goodsList}">
                                <section class="main-section main-section__category-type">
                                    <div class="main-section-header">
                                        <div class="main-section-title">
@@ -1423,91 +1434,66 @@
                                        </div>
                                    </div>
                                    <div class="product-list-vertical-twoAndaHalf">
-                                       <div class="swiper product-list-vertical-twoAndaHalf__swiper">
+                                       <div class="${fn:length(goodsList) gt 4 ? 'swiper product-list-vertical-twoAndaHalf__swiper' : 'product-list-type-2cols'}">
-                                           <div class="swiper-wrapper">
+                                           <div class="${fn:length(goodsList) gt 4 ? 'swiper-wrapper' : 'product-list-type-2cols__list'}">
-                                               <c:forEach var = "item" items="${goodsList.relateInfoList}">
+                                               <c:forEach var = "item" items="${goodsList}">
                                                    <c:if test = "${not empty item.goodsInnb}">
-                                                       <div class="swiper-slide">
+                                                       <div class="${fn:length(goodsList) gt 4 ? 'swiper-slide' : ''}">
                                                            <div class="product-unit">
                                                                <div class="product-unit-image">
-                                                                   <c:if test = "item.goodsSttusCd ne '01'">
+                                                                   <c:if test="${item.goodsSttusCd eq '02'}">
                                                                        <div class="sold-out">
-                                                                           <c:choose>
-                                                                               <c:when test ="${item.goodsSttusCd eq '02'}">
                                                                            <span>입고 대기중</span>
-                                                                               </c:when>
-                                                                               <c:when test ="${item.goodsSttusCd eq '03'}">
-                                                                                   <span>판매중지</span>
-                                                                               </c:when>
-                                                                           </c:choose>
                                                                        </div>
                                                                    </c:if>
-                                                                   <c:forEach var="img" items="${goodsList.relateImgList}">
-                                                                       <c:if test="${item.goodsInnb eq img.goodsInnb}">
                                                                            <a style="cursor:pointer" loading="lazy"
                                                                               onclick = "fn_move_goods_dtl(<c:out value="${item.goodsInnb}"/>)">
                                                                                <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
-                                                                               <img src="<c:out value = "${cdnurl}${img.img}"/>"
+                                                                               <img src="<c:out value = "${cdnurl}${item.img}"/>"
                                                                                     onerror="this.src='/pc/images/image_placeholder.png'"
-                                                                                    alt="해당 이미지에 대한 설명">
+                                                                                    alt="<c:out value="${item.goodsNm}"/>">
                                                                            </a>
-                                                                       </c:if>
+                                                               </div>
+                                                               <div class="product-unit-info d-flex flex-column" style="flex-direction:column">
+                                                                   <c:if test="${not empty item.iconCdNmList && item.iconExpsrAt eq 'Y'}">
+                                                                       <div class="product-badge-container col order-${item.iconExpsrOrdr-1}" style="order: ${item.iconExpsrOrdr-1}">
+                                                                           <c:forEach items="${fn:split(item.iconCdNmList, ',')}" var="iconCdNm">
+                                                                               <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                                            </c:forEach>
                                                                        </div>
-                                                               <div class="product-unit-info">
-                                                                   <c:set var="iconString" value="${item.goodsIconCd}" />
-                                                                   <c:set var="iconCdList" value="${fn:split(iconString, ',')}" />
-                                                                   <c:forEach var = "iconCd" items="${iconCdList}">
-                                                                       <c:if test = "${iconCd eq 'new'}">
-                                                                           <span class="product-badge new">NEW</span>
                                                                    </c:if>
-                                                                       <c:if test = "${iconCd eq 'hot'}">
+                                                                   <c:if test="${item.goodsNmExpsrAt eq 'Y'}">
-                                                                           <span class="product-badge hot">HOT</span>
+                                                                       <div class="product-unit-title col order-${item.goodsNmExpsrOrdr-1}" style="order: ${item.goodsNmExpsrOrdr-1}">
-                                                                       </c:if>
-                                                                       <c:if test = "${iconCd eq 'best'}">
-                                                                           <span class="product-badge best">BEST</span>
-                                                                       </c:if>
-                                                                       <c:if test = "${iconCd eq 'md-pick'}">
-                                                                           <span class="product-badge md-pick">MD PICK</span>
-                                                                       </c:if>
-                                                                       <c:if test = "${iconCd eq 'hot-deal'}">
-                                                                           <span class="product-badge four-row">HOT DEAL</span>
-                                                                       </c:if>
-                                                                   </c:forEach>
-                                                                   <div class="product-unit-info__inner">
-                                                                       <div class="product-unit-title">
                                                                            <a style="cursor:pointer" onclick = "fn_move_goods_dtl(<c:out value="${item.goodsInnb}"/>)">
                                                                                <c:out value = "${item.goodsNm}"/>
                                                                             </a>
                                                                        </div>
-                                                                       <div class="product-unit-price">
+                                                                   </c:if>
-                                                                           <c:forEach var="goodsOpt" items="${goodsList.relateGoodsOptList}">
+                                                                   <c:if test="${item.pricExpsrAt eq 'Y'}">
-                                                                               <c:if test="${item.goodsInnb eq goodsOpt.goodsInnb && goodsOpt.stdrDvAt eq 'Y'}">
+                                                                       <div class="product-unit-price col order-${item.pricExpsrOrdr-1}" style="order: ${item.pricExpsrOrdr-1}">
                                                                                    <div class="product-unit-price__price">
-                                                                                       <span class="product-unit-price__original">
+                                                                                       <span class="product-unit-price__original <c:if test="${item.slePercent eq 0}">visually-hidden</c:if>">
-                                                                                           <fmt:formatNumber value="${goodsOpt.cnsmrpric}" pattern="#,###"/>
+                                                                                           <fmt:formatNumber value="${item.cnsmrpric}"/> ${curUnit}
                                                                                        </span>
                                                                                        <span class="product-unit-price__current">
-                                                                                           <fmt:formatNumber value="${goodsOpt.slepric}" pattern="#,###"/>
+                                                                                           <fmt:formatNumber value="${item.slepric}"/> ${curUnit}
                                                                                        </span>
                                                                                    </div>
-                                                                                   <div class="product-unit-price__sale">
+                                                                                   <div class="product-unit-price__sale <c:if test="${item.slePercent eq 0}">visually-hidden</c:if>">
-                                                                                       <span class="percent"><c:out value = "${goodsOpt.slePercent}"/>%</span>
+                                                                                       <span class="percent"><c:out value = "${item.slePercent}"/> %</span>
+                                                                                   </div>
                                                                        </div>
                                                                    </c:if>
-                                                                            </c:forEach>
+                                                                   <c:if test="${item.reprsntDcExpsrAt eq 'Y'}">
-                                                                       </div>
+                                                                       <div class="product-unit-price__monthly-payment col order-${item.reprsntDcExpsrOrdr-1}" style="order: ${item.reprsntDcExpsrOrdr-1}"><c:out value = "${item.reprsntDc}"/></div>
-                                                                       <span class="product-unit-price__monthly-payment"><c:out value = "${item.srtDc}"/></span>
+                                                                   </c:if>
-                                                                   </div>
+                                                                   <c:if test="${item.rvwEvlScreExpsrAt eq 'Y'}">
-                                                                   <div class="product-unit-rating">
+                                                                   <div class="product-unit-rating col order-${item.rvwEvlScreExpsrOrdr-1}" style="order: ${item.rvwEvlScreExpsrOrdr-1}">
                                                                        <i class="icon icon_rating-star"></i>
-                                                                       <c:forEach var = "evlInfo" items="${goodsList.goodsRvwEvlList}">
+                                                                       <span class="product-unit-rating__score"><c:out value = "${item.avgEvlScore}"/></span>
-                                                                           <c:if test = "${evlInfo.goodsInnb eq item.goodsInnb}">
+                                                                       <span class="product-unit-rating__count">(<fmt:formatNumber value="${item.cntEvlScor}"/>)</span>
-                                                                               <span class="product-unit-rating__score"><c:out value = "${evlInfo.avgEvlScore}"/>${goodsOpt.goodInnb}</span>
-                                                                               <span class="product-unit-rating__count">(<fmt:formatNumber value="${evlInfo.cntBbsctt}" pattern="#,###"/>)</span>
-                                                                           </c:if>
-                                                                       </c:forEach>
                                                                    </div>
+                                                                   </c:if>
                                                                </div>
                                                            </div>
                                                        </div>
@@ -1775,6 +1761,9 @@
         </div>
        </div>
 <form id="hiddenForm">
+	<input type="hidden" name="mobileParentCtgryId" value="<c:out value="${param.mobileParentCtgryId}"/>"/>
+	<input type="hidden" name="mobileAboutMenuAt" value="<c:out value="${param.mobileAboutMenuAt}"/>"/>
+	<input type="hidden" name="mobileCurrentCtgryId" value="<c:out value="${param.mobileCurrentCtgryId}"/>"/>
     <%--목록 관련--%>
     <input type="hidden" name="pageIndex" value="<c:out value="${bbscttVO.pageIndex}"/>"/>
     <input type="hidden" name="bbsTyCd" value="<c:out value="${bbscttVO.bbsTyCd}"/>"/>

src/main/webapp/WEB-INF/views/sopmal_m/csc/CscListRForm.jsp

@@ -314,6 +314,9 @@
                                    </div>
                                </form>
                                <form id = "dtlForm" action="/sopmal/csc/selectBbscttDtlInqire" method="get">
+							   <input type="hidden" name="mobileParentCtgryId" value="<c:out value="${param.mobileParentCtgryId}"/>"/>
+							   <input type="hidden" name="mobileAboutMenuAt" value="<c:out value="${param.mobileAboutMenuAt}"/>"/>
+							   <input type="hidden" name="mobileCurrentCtgryId" value="<c:out value="${param.mobileCurrentCtgryId}"/>"/>
                                    <input type="hidden" name="bbscttInnb" id="bbscttInnb"><%--게시글 고유번호--%>
                                    <input type="hidden" name="bbsId" value="<c:out value = "${bbsInfo.bbsId}"/>"/><%--게시판아이디--%>
                                    <input type="hidden" name="bbsTyCd" value="<c:out value = "${bbsInfo.bbsTyCd}"/>"/><%--게시판타입--%>

src/main/webapp/WEB-INF/views/sopmal_m/csc/SubPageListRForm.jsp

@@ -39,9 +39,15 @@
                 awaitCloseAnimation: true,
             });
 
-        /*헤더에 타이틀 set*/
+        /* ABOUT 하위 화면은 게시판명이 아닌 대메뉴명을 표시 */
-        const title = '<c:out value="${resultMap.bbsInfo.bbsNm}"/>';/*게시판이름*/
+        <c:choose>
-        fn_set_header_title(title);
+            <c:when test="${param.mobileAboutMenuAt eq 'Y'}">
+                fn_set_header_title('ABOUT');
+            </c:when>
+            <c:otherwise>
+                fn_set_header_title('<c:out value="${resultMap.bbsInfo.bbsNm}"/>');
+            </c:otherwise>
+        </c:choose>
 
         /*box_tab 클릭 이벤트*/
         $(".headerTab__item").on("click", function () {
@@ -347,6 +353,11 @@
         fn_create_input("reqUrl","subPage", form);
         fn_create_input("bbsId", $("#bbsId").val(), form);
         fn_create_input("cscAt", $("#cscAt").val(), form);
+        <c:if test="${param.mobileAboutMenuAt eq 'Y'}">
+            fn_create_input("mobileParentCtgryId", '<c:out value="${param.mobileParentCtgryId}"/>', form);
+            fn_create_input("mobileAboutMenuAt", 'Y', form);
+            fn_create_input("mobileCurrentCtgryId", '<c:out value="${param.mobileCurrentCtgryId}"/>', form);
+        </c:if>
         /*let pageUnit = '';
         //페이지 유닛 계산
         const pgeVtcCnt = $("#pgeVtcCnt").val();//ROW
@@ -570,7 +581,7 @@
                 let regusrNm;
                 if (resultList.regusrDvCd === '99') {
                     regusrNm = `\${ resultList.maskingRegusrNm}[비회원]`;
-                } else if (resultList.regusrDvCd === '03' && resultList.npayBbscttSnb !== null) {
+                } else if (resultList.regusrDvCd === '03' && resultList.npayBbscttSnb != null) {
                     regusrNm = `naverpay`;
                 } else if (resultList.regusrDvCd === '02') {
                     regusrNm = `\${ resultList.mngrNm}`;
@@ -631,7 +642,7 @@
                         // 비밀글 여부
                         if (resultList.secretBbscttAt === 'Y') {
                             if (resultList.regusrDvCd !== '02') {
-                                if (resultList.answCn !== null) {
+                                if (resultList.answCn != null) {
                                     list += `[\${resultList.answCn}] `;
                                 }
                                 list += `<span>\${resultList.maskingRegusrNm}</span>님의 \${bbsInfo.bbsNm}`;
@@ -639,7 +650,7 @@
                                 list += `비밀글입니다.`;
                             }
                         } else {
-                            if (resultList.answCn !== null) {
+                            if (resultList.answCn != null) {
                                 list += `[\${resultList.answCn}] `;
                             }
                             list += sj;
@@ -649,7 +660,7 @@
                                  <ul class="eventList__list">`;
                         // 답변 여부 표시
                         if (bbsInfo.answRegist === 'Y') {
-                            if (resultList.answBbscttInnb !== null) {
+                            if (resultList.answBbscttInnb != null) {
                                 list += `<li>답변완료</li>`;
                             } else {
                                 list += `<li>답변대기</li>`;
@@ -680,7 +691,7 @@
                         list += `        </ul>
                                 </a>`;
                         if(bbsInfo.answRegist === 'Y') {
-                            if(resultList.answBbscttInnb !== null){
+                            if(resultList.answBbscttInnb != null){
                                 list += `<a class="eventList__item dtlBtn item" style="cursor:pointer" >
                                             <input type="hidden" class="bbscttInnb" value="\${ resultList.bbscttInnb}">
                                             <div class="eventList__top">
@@ -718,7 +729,7 @@
                                             <ul class="eventList__list">`;
                                                 // 답변 여부 표시
                                                 if (bbsInfo.answRegist === 'Y') {
-                                                    if (resultList.answBbscttInnb !== null) {
+                                                    if (resultList.answBbscttInnb != null) {
                                                         list += `<li>답변완료</li>`;
                                                     } else {
                                                         list += `<li>답변대기</li>`;
@@ -760,7 +771,7 @@
                                                 // 비밀글 여부
                                                 if (resultList.secretBbscttAt === 'Y') {
                                                     if (resultList.regusrDvCd !== '02') {
-                                                        if (resultList.answCn !== null) {
+                                                        if (resultList.answCn != null) {
                                                             list += `[\${resultList.answCn}] `;
                                                         }
                                                         list += `<span>\${resultList.maskingRegusrNm}</span>님의 \${bbsInfo.bbsNm}`;
@@ -768,7 +779,7 @@
                                                         list += `비밀글입니다.`;
                                                     }
                                                 } else {
-                                                    if (resultList.answCn !== null) {
+                                                    if (resultList.answCn != null) {
                                                         list += `[\${resultList.answCn}] `;
                                                     }
                                                     list += `\${sj}`;
@@ -779,7 +790,7 @@
 
                                                 // 답변 여부 표시
                                                 if (bbsInfo.answRegist === 'Y') {
-                                                    if (resultList.answBbscttInnb !== null) {
+                                                    if (resultList.answBbscttInnb != null) {
                                                         list += `<span class="myQnaList__info__date">답변완료</span>`;
                                                     } else {
                                                         list += `<span class="myQnaList__info__date">답변대기</span>`;
@@ -1059,7 +1070,7 @@
                     </form>
                 </div>
                 <%--게시판 등록 사용여부--%>
-                <c:if test = "${bbsInfo.bbscttRegist eq 'Y' && (bbsInfo.bbsTyCd eq '01' || bbsInfo.bbsTyCd eq '08') && bbsInfo.sknTyCd ne '02'}"><%--갤러리타입 등록 x--%>
+                <c:if test = "${bbsInfo.bbscttRegist eq 'Y' && resultMap.registAuthResult eq 'Y' && (bbsInfo.bbsTyCd eq '01' || bbsInfo.bbsTyCd eq '08') && bbsInfo.sknTyCd ne '02'}"><%--갤러리타입 등록 x--%>
                     <div class="infoSection">
                         <a style="cursor:pointer" class="btn md full theme" id = "regBtn"><spring:message code="button.insert"/>하기</a>
                     </div>

src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp

@@ -1938,7 +1938,7 @@
             success: function (data) {
                 $("#modalDiv").html(data);
                 MicroModal.init();
-                closeModal("authPop");
+                try {closeModal("authPop");} catch (e) {};
                 openModal2("authPop");
             }
         });
@@ -3708,14 +3708,16 @@ const fn_move_goodsDtl_login = () => {
                                 <c:if test="${not empty resultMap.goodsDtl.goodsIconCd}">
                                     <div class="product-badge-container">
                                         <c:forTokens var="iconNm" items="${resultMap.goodsDtl.goodsIconCd}" delims=",">
-                                            <c:choose>
+                                            <c:set var="badgeMatched" value="false"/>
-                                                <c:when test="${fn:contains(iconNm,'-')}">
+                                            <c:forEach items="${resultMap.goodsBadgeList}" var="badge">
-                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
+                                                <c:if test="${badge.cd eq iconNm}">
-                                                </c:when>
+                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}" style="color: ${badge.fontColor} !important; background-color: ${badge.bgColor} !important; border-color: ${badge.borderColor} !important;">${badge.cdNm}</span>
-                                                <c:otherwise>
+                                                    <c:set var="badgeMatched" value="true"/>
-                                                    <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}"> ${fn:toUpperCase(iconNm)}</span>
+                                                </c:if>
-                                                </c:otherwise>
+                                            </c:forEach>
-                                            </c:choose>
+                                            <c:if test="${not badgeMatched}">
+                                                <span class="product-badge product-badge--lg ${fn:toLowerCase(iconNm)}" data-badge-cd="${iconNm}">${fn:toUpperCase(fn:replace(iconNm, '-', ' '))}</span>
+                                            </c:if>
                                         </c:forTokens>
                                     </div>
                                 </c:if>

src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsListR.jsp

@@ -94,10 +94,10 @@
                                                 <c:forEach items="${fn:split(list.iconCdNmList, ',')}" var="iconCdNm" varStatus="iconStatus">
                                                     <c:choose>
                                                         <c:when test="${fn:contains(iconCdNm, '-')}">
-                                                            <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+                                                            <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                         </c:when>
                                                         <c:otherwise>
-                                                            <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+                                                            <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
                                                         </c:otherwise>
                                                     </c:choose>
                                                 </c:forEach>

src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsListRForm.jsp

@@ -29,6 +29,16 @@
         const title = '상품 목록';
         fn_set_header_title(title);
 
+        const $categoryList = $('.header--sub > .home-category .home-category__list');
+        const $activeCategory = $categoryList.find('.home-category__item.active');
+        if ($activeCategory.length) {
+            const listElement = $categoryList.get(0);
+            const activeRect = $activeCategory.get(0).getBoundingClientRect();
+            const listRect = listElement.getBoundingClientRect();
+            const activeCenter = activeRect.left - listRect.left + listElement.scrollLeft + (activeRect.width / 2);
+            $categoryList.scrollLeft(Math.max(0, activeCenter - (listElement.clientWidth / 2)));
+        }
+
         let pageIndex = '<c:out value="${ resultMap.BOGoodsVO.pageIndex }"/>';
 
         fn_select_list(pageIndex);
@@ -205,9 +215,9 @@
                                 list += `                <div class="product-badge-container col order-${'${item.iconExpsrOrdr-1}'}" style="order: ${'${item.iconExpsrOrdr-1}'} ">`;
                                 for (const iconCdNm of item.iconCdNmList.split(',')){
                                     if(iconCdNm.indexOf('-') > -1){
-                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}">${'${iconCdNm.toUpperCase().replace("-", " ")}'}</span>`;
+                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}" data-badge-cd="${'${iconCdNm}'}">${'${iconCdNm.toUpperCase().replace("-", " ")}'}</span>`;
                                     }else{
-                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}">${'${iconCdNm.toUpperCase()}'}</span>`;
+                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}" data-badge-cd="${'${iconCdNm}'}">${'${iconCdNm.toUpperCase()}'}</span>`;
                                     }
                                 }
                             }
@@ -1116,12 +1126,12 @@
         <nav class="home-category">
             <div class="home-category__content">
                 <ul class="home-category__list">
-                    <li class="home-category__item active">
+                    <li class="home-category__item<c:if test="${resultMap.BOGoodsVO.ctgryId eq resultMap.BOGoodsVO.upperCtgryId}"> active</c:if>">
                         <a href="javascript:void(0);" data-text="${resultMap.goodsCategoryList[0].baseCtgryNm}"  data-value="${resultMap.goodsCategoryList[0].baseCtgryId}">전체</a>
                     </li>
                     <c:forEach items="${resultMap.goodsCategoryList}" var="goodsCategory"  varStatus="status">
-                        <c:if test="${goodsCategory.ctgryId ne resultMap.BOGoodsVO.ctgryId}">
+                        <c:if test="${goodsCategory.upperCtgryId eq resultMap.BOGoodsVO.upperCtgryId}">
-                            <li class="home-category__item ">
+                            <li class="home-category__item<c:if test="${goodsCategory.ctgryId eq resultMap.BOGoodsVO.ctgryId}"> active</c:if>">
                                 <a href="javascript:void(0);" data-value="${goodsCategory.ctgryId}"> ${goodsCategory.ctgryNm}</a>
                             </li>
                         </c:if>

src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsSrchR.jsp

@@ -90,10 +90,10 @@
                                                     <c:forEach items="${fn:split(list.iconCdNmList, ',')}" var="iconCdNm" varStatus="iconStatus">
                                                         <c:choose>
                                                             <c:when test="${fn:contains(iconCdNm, '-')}">
-                                                                <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
+                                                                <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:replace(fn:toUpperCase(iconCdNm), '-', ' ')}</span>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <span class="product-badge ${fn:toLowerCase(iconCdNm)}">${fn:toUpperCase(iconCdNm)}</span>
+                                                                <span class="product-badge ${fn:toLowerCase(iconCdNm)}" data-badge-cd="${iconCdNm}">${fn:toUpperCase(iconCdNm)}</span>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:forEach>

src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsSrchRForm.jsp

@@ -195,9 +195,9 @@
                                 list += `                <div class="product-badge-container col order-${'${item.iconExpsrOrdr-1}'}" style="order: ${'${item.iconExpsrOrdr-1}'} ">`;
                                 for (const iconCdNm of item.iconCdNmList.split(',')){
                                     if(iconCdNm.indexOf('-') > -1){
-                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}">${'${iconCdNm.toUpperCase().replace("-", " ")}'}</span>`;
+                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}" data-badge-cd="${'${iconCdNm}'}">${'${iconCdNm.toUpperCase().replace("-", " ")}'}</span>`;
                                     }else{
-                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}">${'${iconCdNm.toUpperCase()}'}</span>`;
+                                        list += `        <span class="product-badge ${'${iconCdNm.toLowerCase()}'}" data-badge-cd="${'${iconCdNm}'}">${'${iconCdNm.toUpperCase()}'}</span>`;
                                     }
                                 }
                             }

src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp

@@ -201,10 +201,11 @@
                     </c:if>
                     <div class="sub-box">
                         <div class="mainNotice__wrapper">
-                            <div class="mainNotice__customerContact">
+							<%--<div class="mainNotice__customerContact"
-                                <i class="icon icon_notice03"></i>
+								 onclick="window.open('http://pf.kakao.com/_xjxjHxnX', '_blank');">
+								<i class="icon icon_kakao-customer-service"></i>
 								<div class="mainNotice__customerContact__right">
-                                    <h4 class="notice__title customer-service">고객센터</h4>
+									<h4 class="notice__title customer-service">문의는 카톡으로</h4>
 									<span class="notice__number"><c:out value="${sopmallInfo.shopInfo.cscTelnb }"/></span>
 									<p class="notice__paragraph">
 										<span class="notice__text01"><c:out value="${ sopmallInfo.shopInfo.cscWkdayWorkTme }"/></span>
@@ -213,7 +214,7 @@
 										<span class="notice__text03"><c:out value="${ sopmallInfo.shopInfo.cscRstde }"/></span>
 									</p>
 								</div>
-                            </div>
+							</div>--%>
                             <a class="myPageMain__logout" href="/sopmal/logout">
                                 <i class="icon icon_myLogout"></i>
                                 로그아웃

src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp

@@ -21,6 +21,7 @@
 
 <head>
     <jsp:include page="/WEB-INF/views/comm/mobile/Include.jsp"/>
+    <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 </head>
 
 <script>
@@ -388,7 +389,7 @@
                                                                                 </c:if>
                                                                                 <p class="orderDetailProduct__info__quantity"><c:out value="${goods.ordrQy}"/>개<span
                                                                                         class="orderDetailProduct__info__dot">·</span><span
-                                                                                        class="comma"><c:out value="${goods.applyDscntAmt}"/></span>원
+                                                                                        class="comma"><c:out value="${goods.applyDscntAmt}"/></span>${curUnit}
                                                                                 </p>
                                                                                 <div class="orderDetailProduct__cancel">
                                                                                     <input type="hidden" class="sopmalCd" value="${goods.sopmalCd}"/>
@@ -459,7 +460,7 @@
                                                                             </c:if>
                                                                             <p class="orderDetailProduct__info__quantity"><c:out value="${goods.ordrQy}"/>개<span
                                                                                     class="orderDetailProduct__info__dot">·</span><span
-                                                                                    class="comma"><c:out value="${goods.applyDscntAmt}"/></span>원
+                                                                                    class="comma"><c:out value="${goods.applyDscntAmt}"/></span>${curUnit}
                                                                             </p>
                                                                             <div class="orderDetailProduct__cancel">
                                                                                 <input type="hidden" class="sopmalCd" value="${goods.sopmalCd}"/>