|
|
@@ -75,13 +75,13 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private TsfCouponService couponService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private TsfReviewService reviewService;
|
|
|
|
|
|
@Autowired
|
|
|
private TsfRendererService rendererService;
|
|
|
-
|
|
|
+
|
|
|
@Value("${has-ssl}")
|
|
|
private String hasSsl;
|
|
|
|
|
|
@@ -130,7 +130,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
paramsGoods.setColorCd(goods.getMainColorCd());
|
|
|
}
|
|
|
paramsGoods.setSelfGoodsYn(goods.getSelfGoodsYn());
|
|
|
-
|
|
|
+
|
|
|
// 상품 상세
|
|
|
goods = goodsService.getGoodsDesc(goods);
|
|
|
|
|
|
@@ -207,7 +207,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
review.setRownum(1);
|
|
|
review.setGoodsType(goods.getGoodsType());
|
|
|
mav.addObject("bestReviewList", reviewService.getReviewList(review));
|
|
|
-
|
|
|
+
|
|
|
// 카드 혜택안내
|
|
|
CardPromotion cardPromotion = new CardPromotion();
|
|
|
cardPromotion.setRownum(1); // 혜택유형별로 1건씩
|
|
|
@@ -241,7 +241,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
mav.setViewName(super.getDeviceViewName("goods/GoodsDetailForm"));
|
|
|
}
|
|
|
}
|
|
|
- log.info("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
|
|
|
+
|
|
|
return mav;
|
|
|
}
|
|
|
|
|
|
@@ -615,18 +615,14 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
|
|
|
// 상품 기본정보
|
|
|
mav.addObject("goodsInfo", goods);
|
|
|
-
|
|
|
- // 사이즈 정보
|
|
|
- // 입점은 옵션1 노출
|
|
|
- // 자사는 옵션2 노출
|
|
|
-
|
|
|
+
|
|
|
// 상품평 포인트
|
|
|
GagaMap reviewPoint = new GagaMap();
|
|
|
reviewPoint.set("textReviewPoint", envsetService.getTextReviewPoint(TscConstants.Site.STYLE24.value())); //텍스트상품평포인트
|
|
|
reviewPoint.set("photoReviewPoint", envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value())); //포토상품평포인트
|
|
|
reviewPoint.set("bestReviewPoint", envsetService.getBestReviewPoint(TscConstants.Site.STYLE24.value())); //베스트상품평포인트
|
|
|
mav.addObject("reviewPoint", reviewPoint);
|
|
|
-
|
|
|
+
|
|
|
Review review = new Review();
|
|
|
review.setGoodsCd(goods.getGoodsCd());
|
|
|
mav.addObject("reviewCount", reviewService.getReviewTotalCount(review)); // 전체상품평 건수
|
|
|
@@ -640,43 +636,43 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
review.setBestYn("");
|
|
|
review.setRownum(0); // 전체 조회
|
|
|
mav.addObject("photoReviewList", reviewService.getReviewList(review)); //포토상품평
|
|
|
-
|
|
|
+
|
|
|
// 상품평에 등록된 사이즈 정보
|
|
|
- mav.addObject("reviewOptionList", reviewService.getReviewOptionList(goods.getGoodsCd()));
|
|
|
-
|
|
|
+ mav.addObject("reviewOptionList", reviewService.getReviewOptionList(goods.getGoodsCd()));
|
|
|
+
|
|
|
// 유야동: 베이비(07), 키즈여아(08), 키즈남아(09), 키즈공통(10), 주니어여야(11), 주니어남아(12), 주니어공통(13), 성인G: 유아동 제외 전체
|
|
|
// 유야동 키 공통코드 G091, 성인 키 공통코드 G090
|
|
|
- String[] arrItem = {"07","08","09","10","11","12","13"};
|
|
|
- ArrayList<String> itemList = new ArrayList<>(Arrays.asList(arrItem));
|
|
|
-
|
|
|
+ String[] arrItem = {"07", "08", "09", "10", "11", "12", "13"};
|
|
|
+ ArrayList<String> itemList = new ArrayList<>(Arrays.asList(arrItem));
|
|
|
+
|
|
|
// 키전체
|
|
|
Collection<CommonCode> reviewHeightList = new ArrayList<CommonCode>();
|
|
|
- log.info("goods.getItemkindCd().substring(0, 2) => {} ",goods.getItemkindCd().substring(0, 2) );
|
|
|
+ log.info("goods.getItemkindCd().substring(0, 2) => {} ", goods.getItemkindCd().substring(0, 2));
|
|
|
if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
|
|
|
reviewHeightList = rendererService.getAvailCommonCodeList("G091");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
reviewHeightList = rendererService.getAvailCommonCodeList("G090");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 상품평 키
|
|
|
mav.addObject("reviewHeightList", reviewHeightList);
|
|
|
-
|
|
|
+
|
|
|
// 유야동 몸무게 공통코드 G093, 성인 몸무게 공통코드 G092
|
|
|
// 몸무게
|
|
|
Collection<CommonCode> reviewWeightList = new ArrayList<CommonCode>();
|
|
|
if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
|
|
|
reviewWeightList = rendererService.getAvailCommonCodeList("G093");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
reviewWeightList = rendererService.getAvailCommonCodeList("G092");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 상품평 몸무게
|
|
|
mav.addObject("reviewWeightList", reviewWeightList);
|
|
|
-
|
|
|
+
|
|
|
mav.setViewName(super.getDeviceViewName("goods/GoodsReviewForm"));
|
|
|
return mav;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 상품평 목록
|
|
|
* @param review
|
|
|
@@ -699,7 +695,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
review.setReviewHeightSt(Integer.parseInt(arrHeight[0]));
|
|
|
review.setReviewHeightEd(Integer.parseInt(arrHeight[1]));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
review.setReviewWeightSt(0);
|
|
|
review.setReviewWeightEd(0);
|
|
|
if (StringUtils.isNotBlank(review.getReviewWeight())) {
|
|
|
@@ -707,7 +703,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
review.setReviewWeightSt(Integer.parseInt(arrWeight[0]));
|
|
|
review.setReviewWeightEd(Integer.parseInt(arrWeight[1]));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
TscPageRequest pageable = new TscPageRequest((review.getPageNo() > 0 ? review.getPageNo() - 1 : 0), review.getPageSize(), review.getPageUnit());
|
|
|
pageable.setTotalCount(reviewService.getReviewTotalCount(review));
|
|
|
review.setPageable(pageable);
|
|
|
@@ -715,7 +711,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
if (TsfSession.isLogin()) {
|
|
|
review.setCustNo(TsfSession.getInfo().getCustNo());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
result.set("paging", review);
|
|
|
result.set("dataList", reviewService.getReviewList(review));
|
|
|
|
|
|
@@ -735,10 +731,10 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
Goods paramsGoods = new Goods();
|
|
|
paramsGoods.setGoodsCd(goodsCd);
|
|
|
setGoods(paramsGoods);
|
|
|
- Goods goods = goodsService.getGoodsInfo(paramsGoods);
|
|
|
+ //Goods goods = goodsService.getGoodsInfo(paramsGoods);
|
|
|
|
|
|
// 상품 기본정보
|
|
|
- mav.addObject("goodsInfo", goods);
|
|
|
+ mav.addObject("params", paramsGoods);
|
|
|
|
|
|
mav.setViewName(super.getDeviceViewName("goods/GoodsReviewPhotoForm"));
|
|
|
return mav;
|
|
|
@@ -751,7 +747,7 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
* @since 2021. 3. 8
|
|
|
*/
|
|
|
@PostMapping("/review/detail/layer")
|
|
|
- public ModelAndView goodsReviewDetailForm(Review review) {
|
|
|
+ public ModelAndView goodsReviewDetailForm(Review review) {
|
|
|
//log.info("goodsReviewDetailForm {}", review);
|
|
|
ModelAndView mav = new ModelAndView();
|
|
|
// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
|
|
|
@@ -762,9 +758,9 @@ public class TsfGoodsController extends TsfBaseController {
|
|
|
|
|
|
// 상품 기본정보
|
|
|
mav.addObject("params", paramsGoods);
|
|
|
-
|
|
|
+
|
|
|
mav.addObject("review", review);
|
|
|
-
|
|
|
+
|
|
|
mav.addObject("reviewList", reviewService.getReviewList(review));
|
|
|
|
|
|
mav.setViewName(super.getDeviceViewName("goods/GoodsReviewDetailForm"));
|