merge: develop 게시판 등록 버튼 권한 노출 반영

This commit is contained in:
이주일
2026-07-18 15:55:11 +09:00
16 changed files with 238 additions and 361 deletions

View File

@@ -232,6 +232,9 @@ public class BOGnrlbbscttService {
BOGnrlbbscttVO resultCnt = new BOGnrlbbscttVO(); BOGnrlbbscttVO resultCnt = new BOGnrlbbscttVO();
switch (bbsTyCd) { switch (bbsTyCd) {
case "01": //일반게시글 조회 case "01": //일반게시글 조회
log.debug("일반게시글 getServerDv : {}",bbsctt.getServerDv());
log.debug("일반게시글 getMbrDvCd : {}",bbsctt.getMbrDvCd());
log.debug("일반게시글 getSopmalCd : {}",bbsctt.getSopmalCd());
resultCnt = mapper.selectBOGnrlBbscttListCnt(bbsctt); resultCnt = mapper.selectBOGnrlBbscttListCnt(bbsctt);
totCnt = resultCnt.getTotCnt(); totCnt = resultCnt.getTotCnt();
if (StringUtil.isEmpty(bbsctt.getNtcAt())) {/*공지 제외 검색 조건*/ if (StringUtil.isEmpty(bbsctt.getNtcAt())) {/*공지 제외 검색 조건*/

View File

@@ -101,6 +101,11 @@ public class BOMbrService {
List<DataMap> resultList = null; List<DataMap> resultList = null;
Map<String, Object> resultMap = new HashMap<>(); 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); Integer totCnt = mapper.selectBOMbrListTotCnt(bOMbrSrchVO);
// 건수 갯수 페이징vo에 set // 건수 갯수 페이징vo에 set

View File

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

View File

@@ -1569,10 +1569,11 @@ public class BOPayService{
//요청코드 //요청코드
String authKey = resultMap.get("kcpSecretKey").toString(); String authKey = resultMap.get("kcpSecretKey").toString();
String cpId = resultMap.get("kcpMid").toString(); String cpId = resultMap.get("kcpMid").toString();
if ("naverpay".equals(payVO.getModGubun())) { // 개발서버 네이버페이 CPID 관련 적용 취소
authKey = resultMap.get("bpaySecretKey").toString(); // if ("naverpay".equals(payVO.getModGubun())) {
cpId = resultMap.get("bpayMid").toString(); // authKey = resultMap.get("bpaySecretKey").toString();
} // cpId = resultMap.get("bpayMid").toString();
// }
String amount = payVO.getCancelAmount(); //취소금액 String amount = payVO.getCancelAmount(); //취소금액
String trxId = payVO.getTno(); //거래번호 String trxId = payVO.getTno(); //거래번호

View File

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

View File

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

View File

@@ -1573,9 +1573,24 @@ public class CscController {
bbsVO.setBbsTyCd(bbsctt.getBbsTyCd()); bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
DataMap bbsInfo = new DataMap(); DataMap bbsInfo = new DataMap();
bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO); 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(); DataMap content = new DataMap();
content.put("bbsInfo", bbsInfo); content.put("bbsInfo", bbsInfo);
content.put("registAuthResult", registAuth.get("resultAuth"));
content.put("bbsctt", bbsctt); content.put("bbsctt", bbsctt);
content.put("resultList", resultList); content.put("resultList", resultList);
content.put("paginationInfo", bbsctt.getPaginationInfo()); content.put("paginationInfo", bbsctt.getPaginationInfo());

View File

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

View File

@@ -11,24 +11,44 @@
AND FM.USE_AT = 'Y' AND FM.USE_AT = 'Y'
]]> ]]>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchMbrNm)"> <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} AND FM.MBR_NM = #{srchMbrNm}
]]> </when>
</choose>
</if> </if>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordID)"> <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} AND FM.MBR_ID = #{srchKywordID}
]]> </when>
</choose>
</if> </if>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordEmail)"> <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}))) AND FM.EMAIL = (select HEX(AES_ENCRYPT(#{srchKywordEmail} , #{secretKey})))
]]> </when>
</choose>
</if> </if>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordMb)"> <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}))) AND FM.MBTLNB = (select HEX(AES_ENCRYPT(REPLACE(#{srchKywordMb},'-',''), #{secretKey})))
]]> </when>
</choose>
</if> </if>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(actionDv)"> <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(actionDv)">
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(eventYn)"> <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(eventYn)">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@@ -260,7 +260,7 @@
</c:choose> </c:choose>
</tbody> </tbody>
</table> </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"> <div class="sub-board__top-btn-container">
<button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button> <button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button>
</div> </div>

View File

@@ -114,8 +114,8 @@
"crudDv": crudDv "crudDv": crudDv
}, },
success: function (data) { 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);
} }
}); });
} }

View File

@@ -292,7 +292,7 @@
</c:choose> </c:choose>
</tbody> </tbody>
</table> </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"> <div class="sub-board__top-btn-container">
<button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button> <button type = "button" class="btn outline theme" id = "regBtn"><spring:message code="button.insert"/></button>
</div> </div>

View File

@@ -641,11 +641,13 @@
// Npay CID 세팅 // Npay CID 세팅
const kcpMid = '<c:out value="${data.payInfo.kcpMid}"/>'; const kcpMid = '<c:out value="${data.payInfo.kcpMid}"/>';
const bpayMid = '<c:out value="${data.payInfo.bpayMid}"/>'; const bpayMid = '<c:out value="${data.payInfo.bpayMid}"/>';
if('naverpay' === id) { // 개발서버 네이버페이 CPID 구분 적용 취소
$(form).find('#siteCdMid').val(bpayMid);
} else {
$(form).find('#siteCdMid').val(kcpMid); $(form).find('#siteCdMid').val(kcpMid);
} // if('naverpay' === id) {
// $(form).find('#siteCdMid').val(bpayMid);
// } else {
// $(form).find('#siteCdMid').val(kcpMid);
// }
}); });
/* 결제예정금액 > 약관 전체동의 선택 이벤트 */ /* 결제예정금액 > 약관 전체동의 선택 이벤트 */