fo bo 머지작업

This commit is contained in:
jazz
2025-11-12 11:31:25 +09:00
parent db4a88b74a
commit 7c2b0162f5
55 changed files with 5362 additions and 1149 deletions

View File

@@ -2,6 +2,7 @@ package com.wb.domainserver.domain.gcone.bbs.bbs.mapper;
import java.util.List;
import com.wb.domainserver.domain.mngr.bbs.bbsmngr.vo.BbsmngrVO;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

View File

@@ -8,6 +8,7 @@ import java.util.List;
import com.wb.domainserver.domain.gcone.setup.gradbnef.mapper.BOGradbnefMapper;
import com.wb.domainserver.domain.gcone.setup.gradbnef.vo.BOGradbnefVO;
import com.wb.domainserver.domain.mngr.bbs.bbsmngr.vo.BbsmngrVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

View File

@@ -7,8 +7,10 @@ import java.util.List;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import com.wb.domainserver.util.dataaccess.DataMap;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
@Data
@EqualsAndHashCode(callSuper = false)
@@ -49,6 +51,8 @@ public class BOCmVO extends AbstractVO {
/**
* 내용
*/
@NotBlank(message = "내용")
@Length(min = 0, max = 100, message = "내용")
private String cn;
/**
* 비밀번호

View File

@@ -409,7 +409,7 @@ public class BOGnrlbbscttController {
//상품 관련
if (delInfo.getGoodsInnb() != null) {
BOGoodsVO goodsVO = new BOGoodsVO();
goodsVO.setGoodsInnb(delInfo.getGoodsInnb());
goodsVO.setGoodsInnb(String.valueOf(delInfo.getGoodsInnb()));
goodsVO.setSopmalCd(bbsctt.getSopmalCd());
/*상품정보 > 상품후기건수 차감*/
goodsService.updateRvwRelateSm(goodsVO);
@@ -421,7 +421,7 @@ public class BOGnrlbbscttController {
if (!CollectionUtils.isEmpty(bbsctt.getGoodsInnbArr())) {
for (String goodsInnb : bbsctt.getGoodsInnbArr()) {
BOGoodsVO goodsVO = new BOGoodsVO();
goodsVO.setGoodsInnb(Integer.valueOf(goodsInnb));
goodsVO.setGoodsInnb(goodsInnb);
goodsVO.setSopmalCd(bbsctt.getSopmalCd());
/*상품정보 > 상품후기건수 차감*/
@@ -840,7 +840,7 @@ public class BOGnrlbbscttController {
for (String goodsInnb : bbsctt.getGoodsInnbArr()) {
bbsctt.setGoodsInnb(goodsInnb);
}
goodsVO.setGoodsInnb(Integer.valueOf(bbsctt.getGoodsInnb()));
goodsVO.setGoodsInnb(bbsctt.getGoodsInnb());
goodsVO.setSopmalCd(bbsctt.getSopmalCd());
if ("sopmal".equals(bbsctt.getServerDv())) {
if ("rvw".equals(bbsctt.getRvwBbscttDv())) {

View File

@@ -1,8 +1,10 @@
package com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.vo;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigInteger;
import java.util.Date;
@@ -48,9 +50,14 @@ public class BOGnrlbbscttVO extends AbstractVO {
/*관리자 명*/
private String mngrNm;
/** 비밀번호 */
@Length(min = 0, max = 20, message = "비밀번호")
private String password;
/** 제목 */
@NotBlank(message = "제목")
@Length(min = 0, max = 100, message = "제목")
private String sj;
@NotBlank(message = "내용")
@Length(max = 16777215, message = "내용")
/** 내용 */
private String cn;
/** 조회건수 */
@@ -65,6 +72,8 @@ public class BOGnrlbbscttVO extends AbstractVO {
private Integer nonrecomendCnt;
/** 정렬순서 */
private Integer sortOrdr;
/** 정렬순서여부 */
private String sortOrdrAt;
/*대표이미지 원본파일명*/
private String reprsntImgOrginlFilNm;
/*대표이미지 시스템파일명*/
@@ -190,6 +199,8 @@ public class BOGnrlbbscttVO extends AbstractVO {
private String[] itmInnbArr;
/** 답변내용(배열) */
private String[] answCnArr;
/** 답변 여부(배열) */
private String[] qesitmAtArr;
/**
* 첨부파일 정보
*/
@@ -219,6 +230,16 @@ public class BOGnrlbbscttVO extends AbstractVO {
private String represntFilAt;
/*파일 수정여부*/
private String filChangeAt;
/*파일 수정여부*/
private String represntFilChangeAt;
/*파일 설정 여부*/
private String filAtch;
/*파일 확장자*/
private String AcceptFileExtensions;
/*파일 첨부 허용 확장자*/
private String filPermFilExtsn;
/*드롭존 존재 여부*/
private String dropzoneAt;
/*기존 파일 변화 여부*/
private String extFilChangeAt;
/*파일 구분*/
@@ -273,6 +294,8 @@ public class BOGnrlbbscttVO extends AbstractVO {
private List<String> ordrGoodsOptnInnbArr;
/*추천상품고유번호*/
private Integer recomendGoodsInnb;
/** 상세조회와 페이지 구분처리 */
private String dtlPop;
/*재구매여부*/
private List<String> reOrderAtArr;
/*

View File

@@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,6 +20,7 @@ public class BOBannerVO extends AbstractVO {
/** 쇼핑몰 코드 */
private String sopmalCd;
/** 배너 명 */
@NotBlank(message = "배너명")
private String bannerNm;
/** 노출위치구분 */
private String expsrlcDv;

View File

@@ -115,7 +115,7 @@ public class BOGoodsService {
//선택한 카테고리 상품의 순서 수정
int goodsOrdr = 1;
for(String goodsInnb :vo.getGoodsOrdrList()){
vo.setGoodsInnb(Long.parseLong(goodsInnb));
vo.setGoodsInnb(goodsInnb);
vo.setGoodsOrdr(goodsOrdr);
mapper.updateBOCtgryGoodsList(vo);
goodsOrdr ++;
@@ -142,8 +142,8 @@ public class BOGoodsService {
mapper.insertBOGoods(vo);
// 방금 등록한 상품 번호 조회
long goodsInnb = mapper.selectBOGoodsInnb(vo);
long lGoodsInnb = mapper.selectBOGoodsInnb(vo);
String goodsInnb = String.valueOf(lGoodsInnb);
// 상품 추가 정보
if(!CollectionUtils.isEmpty(vo.getGoodsAdditionVOList())){
@@ -373,7 +373,7 @@ public class BOGoodsService {
if(!beforeCtgryList.isEmpty()){
// 상품 전체 카테고리 delete
BOCategoryLinkVO boCtgryLinkVO = new BOCategoryLinkVO();
boCtgryLinkVO.setGoodsInnb(Long.valueOf(vo.getGoodsInnb()));
boCtgryLinkVO.setGoodsInnb(vo.getGoodsInnb());
boCtgryLinkVO.setSopmalCd(vo.getSopmalCd());
mapper.deleteBOGoodsCategoryLink(boCtgryLinkVO);
@@ -383,7 +383,7 @@ public class BOGoodsService {
// 상품 카테고리 insert
for(BOCategoryLinkVO tempVO : vo.getGoodsCategoryLinkVOList()) {
tempVO.setGoodsInnb(Long.valueOf(vo.getGoodsInnb()));
tempVO.setGoodsInnb(vo.getGoodsInnb());
tempVO.setSopmalCd(vo.getSopmalCd());
tempVO.setRegusr(vo.getRegusr());
@@ -632,7 +632,7 @@ public class BOGoodsService {
//등급별 구매대상자 제한 정보 삭제
if(!CollectionUtils.isEmpty(gradList)){
mapper.deleteBOGoodsTrgterLmtt(vo.getGoodsInnb(),vo.getSopmalCd(), gradList);
mapper.deleteBOGoodsTrgterLmtt(Long.valueOf(vo.getGoodsInnb()),vo.getSopmalCd(), gradList);
}
}
@@ -653,7 +653,7 @@ public class BOGoodsService {
//모든등급 구매대상자 제한 정보 삭제
if(!CollectionUtils.isEmpty(allList)){
mapper.deleteBOGoodsTrgterLmtt(vo.getGoodsInnb(),vo.getSopmalCd(), allList);
mapper.deleteBOGoodsTrgterLmtt(Long.valueOf(vo.getGoodsInnb()),vo.getSopmalCd(), allList);
}
}
}
@@ -886,7 +886,7 @@ public class BOGoodsService {
for (DataMap dataMap : regImgList) {
BOGoodsVO tmpVO = new BOGoodsVO();
tmpVO.setGoodsInnb(Integer.parseInt(dataMap.get("goodsInnb").toString()));
tmpVO.setGoodsInnb(dataMap.get("goodsInnb").toString());
tmpVO.setSopmalCd(dataMap.get("sopmalCd").toString());
tmpVO.setImgKnd(dataMap.get("imgKnd").toString());
tmpVO.setCutNb(String.valueOf(cutNb));
@@ -1077,7 +1077,7 @@ public class BOGoodsService {
//공용정보 변경여부
insertBOGoodslog(vo,"08",logVO);
}else if(dlvyGroupInnb.longValue() != vo.getDlvyGroupInnb()
}else if(dlvyGroupInnb.longValue() != Long.valueOf(vo.getDlvyGroupInnb())
|| !StringUtil.nullConvert(goodsDtl.get("dlvyGuidanceWordsCn")).equals(vo.getDlvyGuidanceWordsCn())){
// 배송그룹 변경여부
insertBOGoodslog(vo,"09",logVO);
@@ -1317,8 +1317,8 @@ public class BOGoodsService {
DataMap resultList = new DataMap();
//상품번호가 no로 들어올 경우 goodsInnb에 넣기
if(vo.getNo() > 0 && vo.getGoodsInnb() == 0){
vo.setGoodsInnb(vo.getNo());
if(vo.getNo() > 0 && (vo.getGoodsInnb() == null || "0".equals(vo.getGoodsInnb()))){
vo.setGoodsInnb(String.valueOf(vo.getNo()));
}
resultList = mapper.selectBOGoodsDtlInfo(vo);
@@ -1386,7 +1386,7 @@ public class BOGoodsService {
List<BOGoodsVO> infoVoList = new ArrayList<>();
for(DataMap temp : relateGoodsInnbList){
BOGoodsVO tmpvo = new BOGoodsVO();
tmpvo.setGoodsInnb(Integer.parseInt(temp.get("goodsInnb").toString()));
tmpvo.setGoodsInnb(temp.get("goodsInnb").toString());
tmpvo.setSopmalCd(relateGoodsInnbList.get(0).get("sopmalCd").toString());
tmpvo.setImgKnd("02"); // 상품 이미지 구분 리스트
infoVoList.add(tmpvo);
@@ -1561,7 +1561,7 @@ public class BOGoodsService {
//추가정보 삭제
for(String goodsInnb :vo.getGoodsInnbs()){
tempVO.setGoodsInnb(Long.parseLong(goodsInnb));
tempVO.setGoodsInnb(goodsInnb);
mapper.deleteBOGoodsAddition(tempVO);
}
@@ -1572,7 +1572,7 @@ public class BOGoodsService {
additionVO.setRegusr(vo.getRegusr());
additionVO.setUpdusr(vo.getUpdusr());
additionVO.setSopmalCd(vo.getSopmalCd());
additionVO.setGoodsInnb(Long.parseLong(goodsInnb.get("goodsInnb").toString()));
additionVO.setGoodsInnb(goodsInnb.get("goodsInnb").toString());
mapper.insertBOGoodsAddition(additionVO);
}
}
@@ -1713,7 +1713,7 @@ public class BOGoodsService {
for (Object item : vo.getDelInnbArr()) {
Map<String, Object> values = (Map<String, Object>) item;
int goodsInnb = Integer.parseInt(String.valueOf(values.get("goodsInnb")));
String goodsInnb = String.valueOf(values.get("goodsInnb"));
String sopmalCd = (String) values.get("sopmalCd");
vo.setGoodsInnb(goodsInnb);
@@ -1822,7 +1822,7 @@ public class BOGoodsService {
for(DataMap tmp : list){
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Integer.parseInt(tmp.get("goodsInnb").toString()));
vo.setGoodsInnb(tmp.get("goodsInnb").toString());
vo.setSopmalCd(tmp.get("sopmalCd").toString());
rvwEvlInfoList.add(mapper.selectBOGoodsRvwEvlInfo(vo));
}
@@ -1970,7 +1970,7 @@ public class BOGoodsService {
//상품 상태 수정
for(DataMap tmp : ordrList){
boGoodsOptionVO.setGoodsInnb(Long.parseLong(tmp.get("goodsInnb").toString()));
boGoodsOptionVO.setGoodsInnb(tmp.get("goodsInnb").toString());
mapper.updateInvntryPolicyGoodsSttusChng(boGoodsOptionVO);
}
@@ -1995,7 +1995,7 @@ public class BOGoodsService {
//상품 상태 수정
for(DataMap tmp : refundList){
boGoodsOptionVO.setGoodsInnb(Long.parseLong(tmp.get("goodsInnb").toString()));
boGoodsOptionVO.setGoodsInnb(tmp.get("goodsInnb").toString());
mapper.updateInvntryPolicyGoodsSttusChng(boGoodsOptionVO);
}
@@ -2028,7 +2028,7 @@ public class BOGoodsService {
//상품 상태 수정
for(DataMap tmp : refundList){
boGoodsOptionVO.setGoodsInnb(Long.parseLong(tmp.get("goodsInnb").toString()));
boGoodsOptionVO.setGoodsInnb(tmp.get("goodsInnb").toString());
mapper.updateInvntryPolicyGoodsSttusChng(boGoodsOptionVO);
}

View File

@@ -11,7 +11,7 @@ public class BOCategoryLinkVO extends AbstractVO {
/** 카테고리연결상품고유번호 */
private long ctgryGoodsEsntlNb;
/** 상품고유번호 */
private long goodsInnb;
private String goodsInnb;
/** 쇼핑몰코드 */
private String sopmalCd;
/** 카테고리ID */

View File

@@ -13,7 +13,7 @@ public class BOGoodsAdditionVO extends AbstractVO {
/** 상품추가정보 고유번호 */
private long goodsAditInfoInnb;
/** 상품고유번호 */
private long goodsInnb;
private String goodsInnb;
/** 쇼핑몰코드 */
private String sopmalCd;
/** 추가정보제목 */

View File

@@ -18,7 +18,7 @@ public class BOGoodsOptionVO extends AbstractVO {
/** 쇼핑몰코드 */
private String sopmalCd;
/** 상품고유번호 */
private long goodsInnb;
private String goodsInnb;
/** 상품옵션그룹번호 */
private Integer optnGroupNb;
/** 옵션명 1 */

View File

@@ -12,7 +12,7 @@ public class BOGoodsRelateVO extends AbstractVO {
/** 관련상품 고유번호 */
private long relateGoodsInnb;
/** 상품 고유번호 */
private long goodsInnb;
private String goodsInnb;
/** 쇼핑몰코드 */
private String sopmalCd;
/** 관련 판매상품 고유번호 */

View File

@@ -12,7 +12,7 @@ public class BOGoodsTrgterLmttVO extends AbstractVO {
/** 구매대상자제한 고유번호 */
private long goodsTrgterLmttInnb;
/** 상품고유번호 */
private long goodsInnb;
private String goodsInnb;
/** 쇼핑몰코드 */
private String sopmalCd;
/** 구매대상자제한 구분코드 */

View File

@@ -1,6 +1,7 @@
package com.wb.domainserver.domain.gcone.goods.goods.vo;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,13 +17,13 @@ public class BOGoodsVO extends AbstractVO {
* 상품 GOODS START
* **********************************/
/** 상품고유번호 */
private long goodsInnb;
private String goodsInnb;
/** as-is 상품고유번호 */
private long no;
/** 쇼핑몰코드 */
private String sopmalCd;
/** 배송그룹 고유번호 */
private long dlvyGroupInnb;
private String dlvyGroupInnb;
/** 공용정보 고유번호 */
private long cmnuseInfoInnb;
/** 버전번호 */
@@ -36,6 +37,7 @@ public class BOGoodsVO extends AbstractVO {
/** 대표상품코드 */
private String reprsntGoodsCd;
/** 상품명 */
@NotBlank(message = "상품명")
private String goodsNm;
/** ? */
private String textMarktGoodsNm;

View File

@@ -2,6 +2,8 @@ package com.wb.domainserver.domain.gcone.goods.goodsinfo.vo;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,6 +37,7 @@ public class BOGoodsInfoVO extends AbstractVO {
/** 쇼핑몰코드 */
private String sopmalCd;
/** 상품정보설정 제목 */
@NotBlank(message = "상품 정보명")
private String goodsInfoSetupSj;
/** 상품명노출여부 */
private String goodsNmExpsrAt;

View File

@@ -219,6 +219,8 @@ public class LoginService {
//회원정보 조회
LoginRequest req = new LoginRequest();
req.setUserInnb(userInnb);
req.setAccessUrl(request.getParameter("accessUrl"));
req.setSopmalCd(request.getParameter("authSopmalCd"));
LoginUser loginUser = null;
if(realm.equals("sopmal")){

View File

@@ -1949,7 +1949,7 @@ public class BOMbrController {
DataMap message = service.insertWslistGoods(wishVO);
BOGoodsVO boGoodsVO = new BOGoodsVO();
boGoodsVO.setGoodsInnb(wishVO.getGoodsInnb());
boGoodsVO.setGoodsInnb(String.valueOf(wishVO.getGoodsInnb()));
boGoodsVO.setSopmalCd(wishVO.getSopmalCd());
boGoodsService.updateWslistCnt(boGoodsVO);

View File

@@ -204,7 +204,7 @@ public class BONpayController {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(goodsCd)); // request 변수 세팅해야함.
vo.setGoodsInnb(goodsCd); // request 변수 세팅해야함.
vo.setSopmalCd(sopmalCd); // request 변수 세팅해야함.
DataMap goodsInfo = goodsService.selectBOGoodsDtl(vo);

View File

@@ -198,7 +198,7 @@ public class BoCommonXmlService {
log.debug("본상품 코드기준의 하위 옵션 상품 리스트 개수 " + optionProductlist.size());
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(productMap.get("goodsInnb").toString())); // 변수 세팅해야함.
vo.setGoodsInnb(productMap.get("goodsInnb").toString()); // 변수 세팅해야함.
vo.setSopmalCd(sopmalCd); // Front에서 넘어온 sopmalCd로 세팅
// main 상품 정보
@@ -300,7 +300,7 @@ public class BoCommonXmlService {
public String createSupplement(DataMap mainProduct, Map<String, Object> goods, String sopmalCd) {
// 상품 상세 정보 getting
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(mainProduct.get("goodsInnb").toString()));
vo.setGoodsInnb(mainProduct.get("goodsInnb").toString());
vo.setSopmalCd(sopmalCd);
// 추가상품은 이것으로 처리
vo.setOptnTy("03");

View File

@@ -152,7 +152,7 @@ public class BoOrderXmlService {
// 주문정보를 넘겨 받아야 함.
// 상품 상세 정보 getting
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(65); // 변수 세팅해야함.
vo.setGoodsInnb("65"); // 변수 세팅해야함.
vo.setSopmalCd("AF"); // 변수 세팅해야함.
DataMap goodsInfo = goodsService.selectBOGoodsDtl(vo);

View File

@@ -116,7 +116,7 @@ public class BoProductXmlService {
StringBuffer productXml = new StringBuffer();
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(goodsCd)); // request 변수 세팅해야함.
vo.setGoodsInnb(goodsCd); // request 변수 세팅해야함.
vo.setSopmalCd(sopmalCd); // request 변수 세팅해야함.
DataMap goodsInfo = goodsService.selectBOGoodsDtl(vo);
@@ -563,7 +563,7 @@ public class BoProductXmlService {
// 상품 상세 정보 getting
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(product.get("goodsCd").toString())); // request 변수 세팅해야함.
vo.setGoodsInnb(product.get("goodsCd").toString()); // request 변수 세팅해야함.
vo.setSopmalCd(sopmalCd); // request 변수 세팅해야함.
@@ -652,7 +652,7 @@ public class BoProductXmlService {
StringBuffer shippingPolicyXml = new StringBuffer();
BOGoodsVO vo = new BOGoodsVO();
vo.setGoodsInnb(Long.parseLong(goodsCd)); // request 변수 세팅해야함.
vo.setGoodsInnb(goodsCd); // request 변수 세팅해야함.
vo.setSopmalCd(sopmalCd); // request 변수 세팅해야함.
DataMap goodsInfo = goodsService.selectBOGoodsDtl(vo);

View File

@@ -3767,7 +3767,7 @@ public class BOOrdrController {
com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO goodsVO = new com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO();
goodsVO.setGoodsInnb(Long.parseLong(tempVo.getGoodsInnb()));
goodsVO.setGoodsInnb(tempVo.getGoodsInnb());
goodsVO.setCartCnt(tempVo.getQy());
goodsVO.setSopmalCd(user.getSopmalCd());
boGoodsService.updateCartCnt(goodsVO);