merge master into develop - CscListRForm.jsp FAQ 아코디언 버그 수정

2026-05-28 23:34:06 +09:00
parent e293ffe451 de463cbb8f
commit 3668cc89b2
7250 changed files with 570509 additions and 25 deletions
--- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java
@@ -466,7 +466,7 @@ public class BOOrderService {

                        dlvylcListMulti.add(dlvyMap);

-                    } else { // if ("02".equals(itemDlvyGroupDvCd)) { // 무료 배송일 경우
+                    } else { //if ("02".equals(itemDlvyGroupDvCd)) { // 무료 배송일 경우

                        // 추가배송비 계산 (MUL)
                        if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) {
--- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java
+++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java
@@ -398,6 +398,143 @@ public class MyActController {

 		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQnaDtlUpdtU";
 	}
+
+	/**
+	 * 일반문의 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectNormalQnaInqire")
+	public String selectNormalQnaInqire(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setBbsTyCd("01");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+
+		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";
+	}
+
+	/**
+	 * 일반문의 수정 폼 이동
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectNormalQnaDtlUpdtForm")
+	public String selectNormalQnaDtlUpdtForm(HttpServletRequest request, ModelMap model,BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setBbsTyCd("01");
+		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/MyNormalQnaDtlUpdtU";
+	}
+
+	/**
+	 * 일반문의 ajax 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectNormalQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectNormalQnaInqireAjax(BOGnrlbbscttVO bbsctt){
+		bbsctt.setBbsTyCd("01");
+		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
+//		);
+	}
+
 	/**
 	 * 1:1 문의 조회
 	 * @param bbsctt
--- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
@@ -3691,9 +3691,11 @@
            AND GMP.SOPMAL_CD = #{sopmalCd}
                 LEFT JOIN GC_MEMBER_GRAD MG ON GMP.MBR_GRAD_INNB = MG.MBR_GRAD_INNB
            AND GMP.SOPMAL_CD = MG.SOPMAL_CD
+            AND MG.USE_AT = 'Y'
                 LEFT JOIN GC_MEMBER_GRAD MG_NEXT
                           ON MG.MBR_GRAD_ORDR + 1 = MG_NEXT.MBR_GRAD_ORDR
                               AND MG.SOPMAL_CD = MG_NEXT.SOPMAL_CD
+                               AND MG_NEXT.USE_AT = 'Y'
                 LEFT JOIN GC_ORDER O ON MBR.MBR_DV_CD = O.MBR_DV_CD
            AND MBR.MBR_INNB = O.MBR_INNB
            AND O.USE_AT = 'Y'
--- a/src/main/resources/static/mngr/images/logo_default.png
+++ b/src/main/resources/static/mngr/images/logo_default.png
--- a/src/main/webapp/WEB-INF/views/mngr/setup/dlvygrp/FreeDlvy.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/setup/dlvygrp/FreeDlvy.jsp
@@ -173,30 +173,30 @@
 		</colgroup>
 		<tbody>
 		<tr>
-		<th>개별배송조건(JP)</th>
-		<td>
-			<div class="td-inner">
-				<div class="td-inner vertical">
-					<div class="b-checkbox-container">
-						<label class="b-checkbox checkbox">
-							<input type="checkbox" id="cntCndUseAt2" name="cntCndUseAt2"
-							<c:choose>
-							<c:when test="${ resultMap.dlvyGroup.cntCndUseAt2 eq 'Y' }"> value="Y" </c:when>
-							<c:otherwise> value="N" </c:otherwise>
-							</c:choose>
-								   <c:if test="${ resultMap.dlvyGroup.cntCndUseAt2 eq 'Y' }">checked="checked"</c:if>>
-							<span style="margin-right: 5px;" class="check"></span>
-							<input type="text" class="input-text sm right number" <c:if test="${ resultMap.dlvyGroup.cntCndUseAt2 ne 'Y' }">disabled="disabled"</c:if> value="<fmt:formatNumber value='${resultMap.dlvyGroup.cntCndAditAmt2}' pattern="#,###" />" title="구매 개수 조건" id="cntCndAditAmt2" name="cntCndAditAmt2" maxlength="13">
-						</label>
-						<span class="control-label">개 단위로 개별배송</span>
-					</div>
-					<div class="gray-7">
-						<p class="fyi">값을 1개 이상 입력 하신 경우 설정이 가능 합니다.</p>
-						<p class="fyi">설정한 개수의 배수로 배송이 분리됩니다.</p>
+			<th>개별배송조건(JP)</th>
+			<td>
+				<div class="td-inner">
+					<div class="td-inner vertical">
+						<div class="b-checkbox-container">
+							<label class="b-checkbox checkbox">
+								<input type="checkbox" id="cntCndUseAt2" name="cntCndUseAt2"
+								<c:choose>
+								<c:when test="${ resultMap.dlvyGroup.cntCndUseAt2 eq 'Y' }"> value="Y" </c:when>
+								<c:otherwise> value="N" </c:otherwise>
+								</c:choose>
+									   <c:if test="${ resultMap.dlvyGroup.cntCndUseAt2 eq 'Y' }">checked="checked"</c:if>>
+								<span style="margin-right: 5px;" class="check"></span>
+								<input type="text" class="input-text sm right number" <c:if test="${ resultMap.dlvyGroup.cntCndUseAt2 ne 'Y' }">disabled="disabled"</c:if> value="<fmt:formatNumber value='${resultMap.dlvyGroup.cntCndAditAmt2}' pattern="#,###" />" title="구매 개수 조건" id="cntCndAditAmt2" name="cntCndAditAmt2" maxlength="13">
+							</label>
+							<span class="control-label">개 단위로 개별배송</span>
+						</div>
+						<div class="gray-7">
+							<p class="fyi">값을 1개 이상 입력 하신 경우 설정이 가능 합니다.</p>
+							<p class="fyi">설정한 개수의 배수로 배송이 분리됩니다.</p>
+						</div>
 					</div>
 				</div>
-			</div>
-		</td>
+			</td>
 		</tr>
 		<tr>
 			<th rowspan="2">배송 권역(JP)</th>
--- a/src/main/webapp/WEB-INF/views/sopmal/csc/CscListRForm.jsp
+++ b/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);
-                fn_branch_bbsctt_posble(data, idx);
+                const parsed = JSON.parse(data.resBody.result);
+                fn_branch_bbsctt_posble(parsed, idx);
            }
        });
    }