|
|
@@ -22,6 +22,7 @@ import com.style24.core.biz.service.TscEnvsetService;
|
|
|
import com.style24.core.support.env.TscConstants;
|
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
|
import com.style24.persistence.domain.Aflink;
|
|
|
+import com.style24.persistence.domain.Bizday;
|
|
|
import com.style24.persistence.domain.Brand;
|
|
|
import com.style24.persistence.domain.BrandGroup;
|
|
|
import com.style24.persistence.domain.BrandMd;
|
|
|
@@ -166,8 +167,10 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
@ResponseBody
|
|
|
public Collection<SupplyCompany> getSupplyCompanyList(@RequestBody SupplyCompany supplyComp) {
|
|
|
// multi row 검색관련 처리
|
|
|
- if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompCd())) supplyComp.setMultiSupplyCompCd(supplyComp.getSearchSupplyCompCd().replaceAll("\r", "").split("\n"));
|
|
|
- if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompNm())) supplyComp.setMultiSupplyCompNm(supplyComp.getSearchSupplyCompNm().replaceAll("\r", "").split("\n"));
|
|
|
+ if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompCd()))
|
|
|
+ supplyComp.setMultiSupplyCompCd(supplyComp.getSearchSupplyCompCd().replaceAll("\r", "").split("\n"));
|
|
|
+ if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompNm()))
|
|
|
+ supplyComp.setMultiSupplyCompNm(supplyComp.getSearchSupplyCompNm().replaceAll("\r", "").split("\n"));
|
|
|
//log.info("supplyComp {}", supplyComp);
|
|
|
return businessService.getSupplyCompanyList(supplyComp);
|
|
|
}
|
|
|
@@ -315,8 +318,10 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
public Collection<Brand> getBrandList(@RequestBody Brand brand) {
|
|
|
|
|
|
// multi row 검색관련 처리
|
|
|
- if (!StringUtils.isBlank(brand.getSearchBrandCd())) brand.setMultiBrandCd(brand.getSearchBrandCd().replaceAll("\r", "").split("\n"));
|
|
|
- if (!StringUtils.isBlank(brand.getSearchBrandNm())) brand.setMultiBrandNm(brand.getSearchBrandNm().replaceAll("\r", "").split("\n"));
|
|
|
+ if (!StringUtils.isBlank(brand.getSearchBrandCd()))
|
|
|
+ brand.setMultiBrandCd(brand.getSearchBrandCd().replaceAll("\r", "").split("\n"));
|
|
|
+ if (!StringUtils.isBlank(brand.getSearchBrandNm()))
|
|
|
+ brand.setMultiBrandNm(brand.getSearchBrandNm().replaceAll("\r", "").split("\n"));
|
|
|
|
|
|
return businessService.getBrandList(brand);
|
|
|
}
|
|
|
@@ -726,7 +731,7 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
mav.setViewName("business/SupplyCompanyPopupForm");
|
|
|
return mav;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 브랜드 그룹 목록 화면(팝업)
|
|
|
* @param
|
|
|
@@ -738,11 +743,11 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
@ResponseBody
|
|
|
public ModelAndView brandGroupForm(BrandGroup brandGroup) {
|
|
|
ModelAndView mav = new ModelAndView();
|
|
|
- mav.addObject("params", brandGroup);
|
|
|
+ mav.addObject("params", brandGroup);
|
|
|
mav.setViewName("business/BrandGroupPopupForm");
|
|
|
return mav;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 브랜드 그룹 목록
|
|
|
* @return
|
|
|
@@ -753,9 +758,11 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
@ResponseBody
|
|
|
public Collection<BrandGroup> getBrandGroupList(@RequestBody BrandGroup brandGroup) {
|
|
|
// multi row 검색관련 처리
|
|
|
- if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNo())) brandGroup.setMultiBrandGroupNo(brandGroup.getSearchBrandGroupNo().replaceAll("\r", "").split("\n"));
|
|
|
- if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNm())) brandGroup.setMultiBrandGroupNm(brandGroup.getSearchBrandGroupNm().replaceAll("\r", "").split("\n"));
|
|
|
- return businessService.getBrandGroupList(brandGroup);
|
|
|
+ if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNo()))
|
|
|
+ brandGroup.setMultiBrandGroupNo(brandGroup.getSearchBrandGroupNo().replaceAll("\r", "").split("\n"));
|
|
|
+ if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNm()))
|
|
|
+ brandGroup.setMultiBrandGroupNm(brandGroup.getSearchBrandGroupNm().replaceAll("\r", "").split("\n"));
|
|
|
+ return businessService.getBrandGroupList(brandGroup);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -777,8 +784,7 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
businessService.saveBrandGroup(brandGroup);
|
|
|
return super.ok(message.getMessage("SUCC_0001"));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 제휴채널 조회팝업
|
|
|
* @param afChannel
|
|
|
@@ -796,5 +802,47 @@ public class TsaBusinessController extends TsaBaseController {
|
|
|
|
|
|
return mav;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 영업일관리 화면
|
|
|
+ * @return
|
|
|
+ * @author gagamel
|
|
|
+ * @since 2021. 3. 16
|
|
|
+ */
|
|
|
+ @GetMapping("/bizday/form")
|
|
|
+ public ModelAndView bizdayForm() {
|
|
|
+ ModelAndView mav = new ModelAndView();
|
|
|
+
|
|
|
+ mav.setViewName("business/BizdayForm");
|
|
|
+
|
|
|
+ return mav;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 영업일 목록
|
|
|
+ * @param bizday - 영업일 정보
|
|
|
+ * @return
|
|
|
+ * @author gagamel
|
|
|
+ * @since 2021. 3. 16
|
|
|
+ */
|
|
|
+ @GetMapping("/bizday/list")
|
|
|
+ @ResponseBody
|
|
|
+ public Collection<Bizday> getBizdayList(Bizday bizday) {
|
|
|
+ return businessService.getBizdayList(bizday);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 영업일 저장
|
|
|
+ * @param bizday - 영업일 정보
|
|
|
+ * @return
|
|
|
+ * @author gagamel
|
|
|
+ * @since 2021. 3. 16
|
|
|
+ */
|
|
|
+ @PostMapping("/bizday/save")
|
|
|
+ @ResponseBody
|
|
|
+ public GagaResponse saveBizday(@RequestBody Bizday bizday) {
|
|
|
+ businessService.saveBizday(bizday);
|
|
|
+ return super.ok(message.getMessage("SUCC_0001"));
|
|
|
+ }
|
|
|
+
|
|
|
}
|