|
|
@@ -107,32 +107,22 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
mainLayout.setContentsList(displayService.getContentsList(contents));
|
|
|
} else {
|
|
|
log.info("nullpoint contentsLoc::::{}", contentsLoc);
|
|
|
- GoodsSearch goodsSearch = new GoodsSearch();
|
|
|
- goodsSearch.setCateType("G031_20");
|
|
|
- goodsSearch.setSoldoutGoodsDisplayYn("N");
|
|
|
- //goodsSearch.setSoldoutGoodsDisplayYn(envsetService.getSoldoutGoodsDisplayYn(TscConstants.Site.STYLE24.value()));
|
|
|
- goodsSearch.setCateNo(cate4Srch.getLeafCateNo());
|
|
|
- goodsSearch.setFrontGb(getSession().getFrontGb());
|
|
|
- //int floorUnit = envsetService.getPayUnit(TscConstants.Site.STYLE24.value()); // 가격 원단위 관리
|
|
|
- //goodsSearch.setFloorUnit(floorUnit);
|
|
|
- if (TsfSession.getInfo() != null) {
|
|
|
- goodsSearch.setCustGb(TsfSession.getInfo().getCustGb());
|
|
|
- goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
|
|
|
- goodsSearch.setCustGrade(TsfSession.getInfo().getCustGrade());
|
|
|
- } else {
|
|
|
- goodsSearch.setCustGb("00");
|
|
|
+ if("SMM001".equals(contentsLoc)){
|
|
|
+ cate4Srch.setMaxRow(3);
|
|
|
+ }else{
|
|
|
+ cate4Srch.setMaxRow(20);
|
|
|
}
|
|
|
|
|
|
- /*if("SMM001".equals(contentsLoc)){
|
|
|
- goodsSearch.setMaxRownum(3);
|
|
|
- }else{
|
|
|
- goodsSearch.setMaxRownum(24);
|
|
|
- }*/
|
|
|
- //mainLayout.setGoodsList(displayService.getCategoryGoodsList(goodsSearch));
|
|
|
+ Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch);
|
|
|
+ mainLayout.setGoodsList(goodsList);
|
|
|
+
|
|
|
+ if("A".equals(mainLayout.getContentsYn())){
|
|
|
+ mainLayout.setContentsList(displayService.getContentsList(contents));
|
|
|
+ }
|
|
|
}
|
|
|
mainLayoutList.add(mainLayout);
|
|
|
}
|
|
|
- log.info("mainLayoutList::{}", mainLayoutList);
|
|
|
+ //log.info("mainLayoutList::{}", mainLayoutList);
|
|
|
mav.addObject("mainLayoutList", mainLayoutList);
|
|
|
mav.setViewName(super.getDeviceViewName("display/MallMainForm"));
|
|
|
|