diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java index 6693b403..315b9b9c 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java @@ -9,7 +9,6 @@ import org.springframework.stereotype.Repository; import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; import com.wb.domainserver.domain.admin.store.sopmal.vo.BOShopSetupVO; -import com.wb.domainserver.domain.admin.sys.menu.vo.BOMaMenuVO; import com.wb.domainserver.util.dataaccess.DataMap; /** @@ -81,6 +80,10 @@ public interface BOMaSopmalMapper { public int updateBOSopmalUpdt(BOMaSopmalVO vo); + public int updateBOExchngrtSetup(BOMaSopmalVO vo); + + public int updateBOGuidanceSetup(BOMaSopmalVO vo); + public int deteteBOShopFamilySite(BOMaSopmalVO vo); public int deteteBOShopClause(BOMaSopmalVO vo); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java index df4b8deb..07866c3e 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java @@ -193,4 +193,7 @@ public class BOMbrSrchVO extends AbstractVO { /*회원구분코드*/ private String mbrDvCd; + /*마케팅 동의 팝업 읽기모드 여부*/ + private String readonlyAt; + } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java index 89209b00..9576b7b1 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java @@ -309,22 +309,8 @@ public class BOPurchsEvtService { } } - // 사은품 이벤트 + // 사은품 이벤트 } else if ("02".equals(purchsEvtVO.getEvtDv())) { - - -/* - if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteGiftList()))) { - log.debug(" 삭제 리스트 확인 purchsEvtVO . get getDeleteGiftList : {}", purchsEvtVO.getDeleteGiftList()); - for (String deleteGiftInnb : purchsEvtVO.getDeleteGiftList()) { - log.debug("deleteGiftInnb : {}", deleteGiftInnb); - purchsEvtVO.setDeleteGiftInnb(Integer.parseInt(deleteGiftInnb)); - mapper.deleteBOPurchsEvtGiftDel(purchsEvtVO); - } - } -*/ - - if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteBnefList()))) { log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", (Object) purchsEvtVO.getDeleteBnefList()); for (String deleteBnefInnb : purchsEvtVO.getDeleteBnefList()) { @@ -334,7 +320,6 @@ public class BOPurchsEvtService { } } - if (purchsEvtVO.getDiscountBnefVOList() != null && !purchsEvtVO.getDiscountBnefVOList().isEmpty()) { log.debug("사은품 혜택 진입"); for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) { diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/service/BOExchngrtService.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/service/BOExchngrtService.java new file mode 100644 index 00000000..04aa3c68 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/service/BOExchngrtService.java @@ -0,0 +1,56 @@ +package com.wb.domainserver.domain.gcone.setup.exchngrt.service; + +import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.exception.code.ErrorCode; +import com.wb.domainserver.util.dataaccess.DataMap; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 환율 설정 BO Serivce + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Slf4j +@Service +public class BOExchngrtService { + @Autowired + private BOMaComncdService bOMaComncdService; + @Autowired + private BOMaSopmalMapper mapper; + + /** + * 환율 설정 수정 + * @param boMaSopmalVO + */ + @Transactional + public DataMap updateBOExchngrtSetup(BOMaSopmalVO boMaSopmalVO) { + DataMap message = new DataMap(); + + try { + mapper.updateBOExchngrtSetup(boMaSopmalVO); + message.put("result", "success"); + } catch (WnbtRestException wre) { + throw new WnbtRestException(wre.getMessage()); + } catch (Exception e) { + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + return message; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/vo/BOExchngrtVO.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/vo/BOExchngrtVO.java new file mode 100644 index 00000000..2392f9f6 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/vo/BOExchngrtVO.java @@ -0,0 +1,32 @@ +package com.wb.domainserver.domain.gcone.setup.exchngrt.vo; + +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.comm.vo.AbstractVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper=false) +public class BOExchngrtVO extends AbstractVO { + + /** 쇼핑몰 코드 */ + private String sopmalCd; + + /** 1엔 환율(살때) */ + private String buyRate; + + /** 1엔 환율(팔때) */ + private String sellRate; + + /** BOMaSopmalVO로 변환 */ + public BOMaSopmalVO setBOMaSopmalVO() { + BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO(); + boMaSopmalVO.setSopmalCd(this.getSopmalCd()); + boMaSopmalVO.setBuyRate(this.getBuyRate()); + boMaSopmalVO.setSellRate(this.getSellRate()); + boMaSopmalVO.setRegusr(this.getRegusr()); + boMaSopmalVO.setUpdusr(this.getUpdusr()); + + return boMaSopmalVO; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/family/service/BOFamilyService.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/family/service/BOFamilyService.java new file mode 100644 index 00000000..e304a75d --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/family/service/BOFamilyService.java @@ -0,0 +1,76 @@ +package com.wb.domainserver.domain.gcone.setup.family.service; + +import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.exception.code.ErrorCode; +import com.wb.domainserver.util.dataaccess.DataMap; +import com.wb.domainserver.util.string.StringUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +/** + * 패밀리사이트 설정 BO Serivce + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Slf4j +@Service +public class BOFamilyService { + @Autowired + private BOMaComncdService bOMaComncdService; + @Autowired + private BOMaSopmalMapper mapper; + + /** + * 패밀리사이트 설정 수정 + * @param boMaSopmalVO + */ + @Transactional + public DataMap updateBOFamilySetup(BOMaSopmalVO boMaSopmalVO) { + DataMap message = new DataMap(); + + try { + mapper.deteteBOShopFamilySite(boMaSopmalVO); + + DataMap paramMap = new DataMap(); + paramMap.put("sopmalCd", boMaSopmalVO.getSopmalCd()); + paramMap.put("regusr", boMaSopmalVO.getRegusr()); + + if (!ObjectUtils.isEmpty(boMaSopmalVO.getFamilySiteNmArr())) { + String[] siteNm = boMaSopmalVO.getFamilySiteNmArr(); + String[] siteUrl = boMaSopmalVO.getFamilySiteUrlArr(); + + for (int i = 0; i < siteNm.length; i++) { + if (!StringUtil.isEmpty(siteNm[i])) { + paramMap.put("familySiteNm", siteNm[i]); + paramMap.put("familySiteUrl", siteUrl[i]); + mapper.insertBOShopFamilySite(paramMap); + } + } + } + + message.put("result", "success"); + } catch (WnbtRestException wre) { + throw new WnbtRestException(wre.getMessage()); + } catch (Exception e) { + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + return message; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/family/vo/BOFamilyVO.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/family/vo/BOFamilyVO.java new file mode 100644 index 00000000..d7535ae0 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/family/vo/BOFamilyVO.java @@ -0,0 +1,32 @@ +package com.wb.domainserver.domain.gcone.setup.family.vo; + +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.comm.vo.AbstractVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper=false) +public class BOFamilyVO extends AbstractVO { + + /** 쇼핑몰 코드 */ + private String sopmalCd; + + /** 패밀리사이트명 */ + private String[] familySiteNmArr; + + /** 패밀리사이트URL */ + private String[] familySiteUrlArr; + + /** BOMaSopmalVO로 변환 */ + public BOMaSopmalVO setBOMaSopmalVO() { + BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO(); + boMaSopmalVO.setSopmalCd(this.getSopmalCd()); + boMaSopmalVO.setFamilySiteNmArr(this.getFamilySiteNmArr()); + boMaSopmalVO.setFamilySiteUrlArr(this.getFamilySiteUrlArr()); + boMaSopmalVO.setRegusr(this.getRegusr()); + boMaSopmalVO.setUpdusr(this.getUpdusr()); + + return boMaSopmalVO; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/service/BOGuidanceService.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/service/BOGuidanceService.java new file mode 100644 index 00000000..ede1922b --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/service/BOGuidanceService.java @@ -0,0 +1,56 @@ +package com.wb.domainserver.domain.gcone.setup.guidance.service; + +import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.exception.code.ErrorCode; +import com.wb.domainserver.util.dataaccess.DataMap; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 안내문구 설정 BO Serivce + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Slf4j +@Service +public class BOGuidanceService { + @Autowired + private BOMaComncdService bOMaComncdService; + @Autowired + private BOMaSopmalMapper mapper; + + /** + * 안내문구 설정 수정 + * @param boMaSopmalVO + */ + @Transactional + public DataMap updateBOGuidanceSetup(BOMaSopmalVO boMaSopmalVO) { + DataMap message = new DataMap(); + + try { + mapper.updateBOGuidanceSetup(boMaSopmalVO); + message.put("result", "success"); + } catch (WnbtRestException wre) { + throw new WnbtRestException(wre.getMessage()); + } catch (Exception e) { + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + return message; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/vo/BOGuidanceVO.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/vo/BOGuidanceVO.java new file mode 100644 index 00000000..404d2e77 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/vo/BOGuidanceVO.java @@ -0,0 +1,44 @@ +package com.wb.domainserver.domain.gcone.setup.guidance.vo; + +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.comm.vo.AbstractVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper=false) +public class BOGuidanceVO extends AbstractVO { + + /** 쇼핑몰 코드 */ + private String sopmalCd; + + /** 회원가입 안내 타이틀 */ + private String joinGuidanceSj; + + /** 회원가입 안내문구 */ + private String joinGuidanceWords; + + /** 회원가입 주요혜택 */ + private String joinBnef; + + /** 회원가입 주요문구 */ + private String joinComptWords; + + /** 구독서비스 안내문구 */ + private String subsvcGuidanceWords; + + /** BOMaSopmalVO로 변환 */ + public BOMaSopmalVO setBOMaSopmalVO() { + BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO(); + boMaSopmalVO.setSopmalCd(this.getSopmalCd()); + boMaSopmalVO.setJoinGuidanceSj(this.getJoinGuidanceSj()); + boMaSopmalVO.setJoinGuidanceWords(this.getJoinGuidanceWords()); + boMaSopmalVO.setJoinBnef(this.getJoinBnef()); + boMaSopmalVO.setJoinComptWords(this.getJoinComptWords()); + boMaSopmalVO.setSubsvcGuidanceWords(this.getSubsvcGuidanceWords()); + boMaSopmalVO.setRegusr(this.getRegusr()); + boMaSopmalVO.setUpdusr(this.getUpdusr()); + + return boMaSopmalVO; + } +} diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java index 15d1aa61..3aced8f0 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java @@ -28,28 +28,48 @@ import lombok.EqualsAndHashCode; public class BOSetupOrdrVO extends AbstractVO { /** 쇼핑몰 코드 */ private String sopmalCd; - /**마일리지 지급 사용여부*/ - private String mlgPymntAt; - /**마일리지 지급 구분코드*/ - private String mlgPymntDvCd; - /**마일리지 지급 비율*/ - private String mlgPymntRt; - /**마일리지 최대 지급 금액*/ - private String mlgMxmmPymntAmt; - /**마일리지 최대 지급 금액 사용여부*/ - private String mlgMxmmPymntAmtAt; - /**마일리지 유효기간*/ - private String mlgValidPd; - /**마일리지 유효기간 사용여부*/ - private String mlgValidPdAt; - /**여러곳배송여부*/ + +// 여러 곳 배송 + /** 여러곳배송여부 */ private String multiDlvyAt; - /**정기배송여부*/ + /** 정기배송여부 */ private String fdrmDlvyAt; - /**선물하기여부*/ + +// 선물하기 + /** 선물하기여부 */ private String giftDlvyAt; - /**선물하기자동취소기간*/ + /** 선물하기자동취소기간 */ private String giftDlvyAtmcCanclPd; - /*충전형마일리지 사용여부*/ + +// GC 머니 + /** 충전형마일리지 사용여부 */ private String cashAt; + +// 마일리지 지급 + /** 마일리지 지급 사용여부 */ + private String mlgPymntAt; + /** 마일리지 지급 구분코드 */ + private String mlgPymntDvCd; + /** 마일리지 지급 비율 */ + private String mlgPymntRt; + /** 마일리지 최대 지급 금액 */ + private String mlgMxmmPymntAmt; + /** 마일리지 최대 지급 금액 사용여부 */ + private String mlgMxmmPymntAmtAt; + /** 마일리지 유효기간 */ + private String mlgValidPd; + /** 마일리지 유효기간 사용여부 */ + private String mlgValidPdAt; + +// 마일리지 사용 조건 + /** 마일리지 보유 사용 금액 */ + private String mlgHoldUseAmt; + /** 마일리지 결제금액 사용 금액 */ + private String mlgSetleAmtUseAmt; + /** 마일리지 최소 사용 금액 */ + private String mlgMummUseAmt; + /** 마일리지 최대 사용 구분(MLG_MXMM_USE_DV) */ + private String mlgMxmmUseDv; + /** 마일리지 최대 사용 금액 */ + private String mlgMxmmUseAmt; } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java b/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java index 23bf53e7..eb9fa69b 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java @@ -76,16 +76,26 @@ public class MngrMainController { // public String selectMngrMainInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, ModelMap model, HttpServletRequest request) { public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request, HttpServletResponse response ) { BOBbsVO vo = new BOBbsVO(); - vo.setSopmalCd(authSopmalCd); // 작성자 정보 할당 AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ vo.setSopmalCd(user.getSopmalCd()); } - // 쇼핑몰코드 vo.setRegusr(user.getUserInnb()); // 등록자 vo.setUpdusr(user.getUserInnb()); // 수정자 + // 쇼핑몰코드 + if(StringUtil.isEmpty(authSopmalCd)) { + if(request.getCookies()!=null) { + for(Cookie cookie : request.getCookies()){ + if("authSopmalCd".equals(cookie.getName())){ + authSopmalCd = cookie.getValue(); + break; + } + } + } + } + vo.setSopmalCd(authSopmalCd); DataMap resultMap = new DataMap(); resultMap = bbsService.selectBOBbscttDshboardInqireForm(vo); diff --git a/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java b/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java index 222ac8ff..03b3cf4e 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java @@ -393,14 +393,6 @@ public class PurchsEvtController { tempVO.setEndAmt(null); } - if ("01".equals(purchsEvtVO.getDscntBnefDvCd())) { - tempVO.setBgnAmt("0"); - tempVO.setEndAmt("0"); - } else if ("02".equals(purchsEvtVO.getDscntBnefDvCd())) { - tempVO.setBgnCnt("0"); - tempVO.setEndCnt("0"); - } - } for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) { diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/exchngrt/ExchngrtController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/exchngrt/ExchngrtController.java new file mode 100644 index 00000000..86b814e8 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/exchngrt/ExchngrtController.java @@ -0,0 +1,116 @@ +package com.wb.domainserver.domain.mngr.setup.exchngrt; + +import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.gcone.setup.exchngrt.service.BOExchngrtService; +import com.wb.domainserver.domain.gcone.setup.exchngrt.vo.BOExchngrtVO; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.response.WnbtResponse; +import com.wb.domainserver.response.WnbtResponseBody; +import com.wb.domainserver.response.WnbtWebClientResponseHandler; +import com.wb.domainserver.security.authentication.AnonymousUser; +import com.wb.domainserver.security.authentication.MemberJwtContextHolder; +import com.wb.domainserver.security.authorization.annotation.AuthPolicy; +import com.wb.domainserver.security.authorization.annotation.Policy; +import com.wb.domainserver.util.communicate.SendToResrc; +import com.wb.domainserver.util.communicate.ValidateResultConverter; +import com.wb.domainserver.util.dataaccess.DataMap; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * 환율 설정 Controller + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Controller +@RequestMapping("/mngr/setup/exchngrt") +@Slf4j +public class ExchngrtController { + + /** WebClient 호출을 위한 wrapper */ + @Autowired + WnbtWebClientResponseHandler responseHandler; + + @Autowired + private SendToResrc sendToResrc; + + /** 공통 메시지 처리를 위한 메시지 객체 */ + @Autowired + private GconeMessageSource gconeMessageSource; + + @Autowired + private BOExchngrtService service; + + @Autowired + private BOMaSopmalService bOMaSopmalService; + + /** + * 환율 설정 페이지 이동 + * + * @param boMaSopmalVO + * @return NbkkSetupListR.jsp + */ + @Policy(AuthPolicy.RESTRICTED) + @RequestMapping(value = "/selectExchngrtSetup") + public String selectExchngrtSetup(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + DataMap content = new DataMap(); + + boMaSopmalVO.setSopmalCd(authSopmalCd); + content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO)); + + model.addAttribute("resultMap", content); + + return "mngr/setup/exchngrt/ExchngrtUpdtU"; + } + + + /** + * 환율 설정 수정 + * + * @param boExchngrtVO + * @return ResponseEntity + */ + @Policy(AuthPolicy.RESTRICTED) + @PostMapping(value = "/updateExchngrtSetup", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity updateExchngrtSetup(@Validated BOExchngrtVO boExchngrtVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + //등록자 수정자 set + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + boExchngrtVO.setRegusr(user.getUserInnb()); + boExchngrtVO.setUpdusr(user.getUserInnb()); + boExchngrtVO.setSopmalCd(authSopmalCd); + + if (bindingResult.hasErrors()) { + throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); + } + + DataMap message = service.updateBOExchngrtSetup(boExchngrtVO.setBOMaSopmalVO()); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() + ); + } + +} diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/family/FamilyController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/family/FamilyController.java new file mode 100644 index 00000000..a7350041 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/family/FamilyController.java @@ -0,0 +1,115 @@ +package com.wb.domainserver.domain.mngr.setup.family; + +import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.gcone.setup.family.service.BOFamilyService; +import com.wb.domainserver.domain.gcone.setup.family.vo.BOFamilyVO; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.response.WnbtResponse; +import com.wb.domainserver.response.WnbtResponseBody; +import com.wb.domainserver.response.WnbtWebClientResponseHandler; +import com.wb.domainserver.security.authentication.AnonymousUser; +import com.wb.domainserver.security.authentication.MemberJwtContextHolder; +import com.wb.domainserver.security.authorization.annotation.AuthPolicy; +import com.wb.domainserver.security.authorization.annotation.Policy; +import com.wb.domainserver.util.communicate.SendToResrc; +import com.wb.domainserver.util.communicate.ValidateResultConverter; +import com.wb.domainserver.util.dataaccess.DataMap; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * 패밀리사이트 설정 Controller + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Controller +@RequestMapping("/mngr/setup/family") +@Slf4j +public class FamilyController { + + /** WebClient 호출을 위한 wrapper */ + @Autowired + WnbtWebClientResponseHandler responseHandler; + + @Autowired + private SendToResrc sendToResrc; + + /** 공통 메시지 처리를 위한 메시지 객체 */ + @Autowired + private GconeMessageSource gconeMessageSource; + + @Autowired + private BOFamilyService service; + + @Autowired + private BOMaSopmalService bOMaSopmalService; + + /** + * 패밀리사이트 설정 페이지 이동 + * + * @param boMaSopmalVO + * @return NbkkSetupListR.jsp + */ + @Policy(AuthPolicy.RESTRICTED) + @RequestMapping(value = "/selectFamilySiteSetup") + public String selectFamilySiteSetup(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + DataMap content = new DataMap(); + + boMaSopmalVO.setSopmalCd(authSopmalCd); + content.put("siteList", bOMaSopmalService.selectBOSopmalUpdtFormSitelList(boMaSopmalVO)); + + model.addAttribute("resultMap", content); + + return "mngr/setup/family/FamilySiteUpdtU"; + } + + + /** + * 패밀리사이트 설정 수정 + * + * @param boFamilyVO + * @return ResponseEntity + */ + @Policy(AuthPolicy.RESTRICTED) + @PostMapping(value = "/updateFamilySiteSetup", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity updateNbkkSetup(@Validated BOFamilyVO boFamilyVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + //등록자 수정자 set + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + boFamilyVO.setRegusr(user.getUserInnb()); + boFamilyVO.setUpdusr(user.getUserInnb()); + boFamilyVO.setSopmalCd(authSopmalCd); + + if (bindingResult.hasErrors()) { + throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); + } + + DataMap message = service.updateBOFamilySetup(boFamilyVO.setBOMaSopmalVO()); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() + ); + } +} diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/guidance/GuidanceController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/guidance/GuidanceController.java new file mode 100644 index 00000000..385d3f54 --- /dev/null +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/guidance/GuidanceController.java @@ -0,0 +1,117 @@ +package com.wb.domainserver.domain.mngr.setup.guidance; + +import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.gcone.setup.guidance.service.BOGuidanceService; +import com.wb.domainserver.domain.gcone.setup.guidance.vo.BOGuidanceVO; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.response.WnbtResponse; +import com.wb.domainserver.response.WnbtResponseBody; +import com.wb.domainserver.response.WnbtWebClientResponseHandler; +import com.wb.domainserver.security.authentication.AnonymousUser; +import com.wb.domainserver.security.authentication.MemberJwtContextHolder; +import com.wb.domainserver.security.authorization.annotation.AuthPolicy; +import com.wb.domainserver.security.authorization.annotation.Policy; +import com.wb.domainserver.util.communicate.SendToResrc; +import com.wb.domainserver.util.communicate.ValidateResultConverter; +import com.wb.domainserver.util.dataaccess.DataMap; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * 안내문구 설정 Controller + * + * @author 이대환 + * @version 1.0 + * @see 
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ *
+ * @since 2026-04-27 + */ +@Controller +@RequestMapping("/mngr/setup/guidance") +@Slf4j +public class GuidanceController { + + /** WebClient 호출을 위한 wrapper */ + @Autowired + WnbtWebClientResponseHandler responseHandler; + + @Autowired + private SendToResrc sendToResrc; + + /** 공통 메시지 처리를 위한 메시지 객체 */ + @Autowired + private GconeMessageSource gconeMessageSource; + + @Autowired + private BOGuidanceService service; + + @Autowired + private BOMaSopmalService bOMaSopmalService; + + /** + * 안내문구 설정 페이지 이동 + * + * @param boMaSopmalVO + * @return NbkkSetupListR.jsp + */ + @Policy(AuthPolicy.RESTRICTED) + @RequestMapping(value = "/selectGuidanceSetup") + public String selectNbkkSetupList(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + DataMap content = new DataMap(); + + boMaSopmalVO.setSopmalCd(authSopmalCd); + content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO)); + + model.addAttribute("resultMap", content); + model.addAttribute("sopmalCd", authSopmalCd); + + return "mngr/setup/guidance/GuidanceUpdtU"; + } + + + /** + * 안내문구 설정 수정 + * + * @param boGuidanceVO + * @return ResponseEntity + */ + @Policy(AuthPolicy.RESTRICTED) + @PostMapping(value = "/updateGuidanceSetup", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity updateGuidanceSetup(@Validated BOGuidanceVO boGuidanceVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + //등록자 수정자 set + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + boGuidanceVO.setRegusr(user.getUserInnb()); + boGuidanceVO.setUpdusr(user.getUserInnb()); + boGuidanceVO.setSopmalCd(authSopmalCd); + + if (bindingResult.hasErrors()) { + throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); + } + + DataMap message = service.updateBOGuidanceSetup(boGuidanceVO.setBOMaSopmalVO()); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() + ); + } + +} diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/ordr/controller/SetupOrdrController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/ordr/controller/SetupOrdrController.java index c0176ce0..f8b8cc78 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/setup/ordr/controller/SetupOrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/ordr/controller/SetupOrdrController.java @@ -1,6 +1,8 @@ package com.wb.domainserver.domain.mngr.setup.ordr.controller; import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; +import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; import com.wb.domainserver.domain.gcone.setup.ordrmngr.service.BOOrdrMngrService; import com.wb.domainserver.domain.gcone.setup.ordrmngr.vo.BOSetupOrdrVO; import com.wb.domainserver.exception.WnbtRestException; @@ -13,6 +15,7 @@ import com.wb.domainserver.security.authorization.annotation.AuthPolicy; import com.wb.domainserver.security.authorization.annotation.Policy; import com.wb.domainserver.util.communicate.SendToResrc; import com.wb.domainserver.util.communicate.ValidateResultConverter; +import com.wb.domainserver.util.dataaccess.DataMap; import com.wb.domainserver.util.string.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -63,6 +66,8 @@ public class SetupOrdrController { @Autowired private BOOrdrMngrService service; + @Autowired + private BOMaSopmalService bOMaSopmalService; /** @@ -73,15 +78,14 @@ public class SetupOrdrController { @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectOrdrSetupList") public String selectOrdrSetupList(ModelMap model, BOSetupOrdrVO boOrdrVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + DataMap content = new DataMap(); boOrdrVO.setSopmalCd(authSopmalCd); + content.put("ordrSetupList", service.selectBOOrdrSetupList(boOrdrVO)); - AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); - if("01".equals(user.getSysDvCd())){ - boOrdrVO.setSopmalCd(user.getSopmalCd()); - } - - Map content = service.selectBOOrdrSetupList(boOrdrVO); + BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO(); + boMaSopmalVO.setSopmalCd(authSopmalCd); + content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO)); model.addAttribute("resultMap", content); // responseHandler.handleResponse( @@ -154,6 +158,19 @@ public class SetupOrdrController { vo.setMlgMxmmPymntAmt(null); } + //마일리지 사용 조건 파라미터 정제 + if(!StringUtil.isEmpty(vo.getMlgHoldUseAmt())) + vo.setMlgHoldUseAmt(StringUtil.removeCommaChar(vo.getMlgHoldUseAmt())); + + if(!StringUtil.isEmpty(vo.getMlgSetleAmtUseAmt())) + vo.setMlgSetleAmtUseAmt(StringUtil.removeCommaChar(vo.getMlgSetleAmtUseAmt())); + + if(!StringUtil.isEmpty(vo.getMlgMummUseAmt())) + vo.setMlgMummUseAmt(StringUtil.removeCommaChar(vo.getMlgMummUseAmt())); + + if(!StringUtil.isEmpty(vo.getMlgMxmmUseAmt())) + vo.setMlgMxmmUseAmt(StringUtil.removeCommaChar(vo.getMlgMxmmUseAmt())); + //등록자 수정자 set AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java index 9df7bf53..aa2022d6 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java @@ -1015,4 +1015,14 @@ public class MainController { ); } + /** + * 연령확인 팝업 + * @return + */ + @Policy(AuthPolicy.PUBLIC) + @RequestMapping(value="/sopmal/main/selectAgeChkPopup", produces = MediaType.APPLICATION_JSON_VALUE) + public String selectAgeChkPopup(HttpServletRequest request) { + return Util.getDeviceType(request)+"/main/AgeChkPopupR"; + } + } \ No newline at end of file diff --git a/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml b/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml index aec5724c..c0f572f4 100644 --- a/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml @@ -947,6 +947,37 @@ SOPMAL_CD = #{sopmalCd} + + + UPDATE + GC_SHOP + SET BUY_RATE = #{buyRate}, + SELL_RATE = #{sellRate}, + UPDUSR = #{updusr}, + UPDT_DT = SYSDATE() + WHERE + 1=1 + AND + SOPMAL_CD = #{sopmalCd} + + + + + UPDATE + GC_SHOP + SET JOIN_GUIDANCE_SJ = #{joinGuidanceSj}, + JOIN_GUIDANCE_WORDS = #{joinGuidanceWords}, + JOIN_BNEF = #{joinBnef}, + JOIN_COMPT_WORDS = #{joinComptWords}, + SUBSVC_GUIDANCE_WORDS = #{subsvcGuidanceWords}, + UPDUSR = #{updusr}, + UPDT_DT = SYSDATE() + WHERE + 1=1 + AND + SOPMAL_CD = #{sopmalCd} + + diff --git a/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml index 3f6240d1..a9963bce 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml @@ -374,106 +374,103 @@ SOPMAL_CD, EVT_INNB, ]]> - - BGN_CNT, - - - END_CNT, - - - BGN_AMT, - - - END_AMT, - - - PROVD_CNT, - - - ADIT_DSCNT_CD, - - - ADIT_DSCNT_AMT, - - - DSCNT_MXMM_AMT, - - - MLG_ACCML_CD, - - - MLG_ACCML_AMT, - - - MLG_VALID_MT_CNT, - - + BGN_CNT, + + + END_CNT, + + + BGN_AMT, + + + END_AMT, + + + PROVD_CNT, + + + ADIT_DSCNT_CD, + + + ADIT_DSCNT_AMT, + + + DSCNT_MXMM_AMT, + + + MLG_ACCML_CD, + + + MLG_ACCML_AMT, + + + MLG_VALID_MT_CNT, + + - - REPLACE(#{bgnCnt}, ',', ''), - - - REPLACE(#{endCnt}, ',', ''), - - - REPLACE(#{bgnAmt}, ',', ''), - - - REPLACE(#{endAmt}, ',', ''), - - - #{provdCnt}, - - - #{aditDscntCd}, - - - REPLACE(#{aditDscntAmt}, ',', ''), - - - REPLACE(#{dscntMxmmAmt}, ',', ''), - - - #{mlgAccmlCd}, - - - REPLACE(#{mlgAccmlAmt}, ',', ''), - - - REPLACE(#{mlgValidMtCnt}, ',', ''), - + REPLACE(#{bgnCnt}, ',', ''), + + REPLACE(#{endCnt}, ',', ''), + + + REPLACE(#{bgnAmt}, ',', ''), + + + REPLACE(#{endAmt}, ',', ''), + + + #{provdCnt}, + + + #{aditDscntCd}, + + + REPLACE(#{aditDscntAmt}, ',', ''), + + + REPLACE(#{dscntMxmmAmt}, ',', ''), + + + #{mlgAccmlCd}, + + + REPLACE(#{mlgAccmlAmt}, ',', ''), + + + REPLACE(#{mlgValidMtCnt}, ',', ''), + diff --git a/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml index fe37615d..c6669dad 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml @@ -42,7 +42,12 @@ UPDATE GC_SHOP - SET MLG_PYMNT_AT = #{mlgPymntAt}, + SET CASH_AT = IFNULL(#{cashAt},'N'), + MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'), + FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'), + GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'), + GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd}, + MLG_PYMNT_AT = #{mlgPymntAt}, MLG_PYMNT_DV_CD = #{mlgPymntDvCd}, MLG_PYMNT_RT = REPLACE(#{mlgPymntRt},',',''), MLG_MXMM_PYMNT_AMT = REPLACE(#{mlgMxmmPymntAmt},',',''), @@ -63,11 +68,13 @@ MLG_VALID_PD_AT = 'Y', - CASH_AT = IFNULL(#{cashAt},'N'), - MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'), - FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'), - GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'), - GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd} + MLG_HOLD_USE_AMT = #{mlgHoldUseAmt}, + MLG_SETLE_AMT_USE_AMT = #{mlgSetleAmtUseAmt}, + MLG_MUMM_USE_AMT = #{mlgMummUseAmt}, + MLG_MXMM_USE_DV = #{mlgMxmmUseDv}, + MLG_MXMM_USE_AMT = #{mlgMxmmUseAmt}, + UPDUSR = #{updusr}, + UPDT_DT = SYSDATE() WHERE SOPMAL_CD = #{sopmalCd} diff --git a/src/main/resources/static/js/mngr/gcone.js b/src/main/resources/static/js/mngr/gcone.js index a2c8ba08..17efa4bb 100644 --- a/src/main/resources/static/js/mngr/gcone.js +++ b/src/main/resources/static/js/mngr/gcone.js @@ -1850,6 +1850,47 @@ function validateInput(input, opts = {}) { }); } +/************************************************************ + form데이터 sealize 후 json 스트링 형태로 전환 + ************************************************************ */ +function queryToJson(queryString) { + let jsonObj = {}; + let pairs = queryString.split("&"); + + $.each(pairs, function (index, pair) { + let [key, value] = pair.split("="); + if(!fn_is_empty(value)){ + jsonObj[key] = value ? decodeURIComponent(value) : ""; + } + }); + const jsonStr = JSON.stringify(jsonObj); + return jsonStr; +} + +/************************************************************ + 치환코드 입력 + * @param eventObj : 클릭객체 + * @param closestSelector : 가까운 객체 + * @param targetTextAreaSelector : textarea타겟대상 + * @property obj : 클릭한 객체 + * @property existingVal : 기존 텍스트 아리아 값 + * @property addStr : 추가할 치환 코드 + * @description 치환 문자 td 클래스에 subst 클래스 부여 + ************************************************************ */ +function fn_set_substituon_in_texatarea(eventObj, closestSelector, targetTextAreaSelector) { + const obj = $(eventObj); + let existingVal = $("#"+targetTextAreaSelector).val(); + let addStr; + const addStrT = obj.closest(closestSelector).find(".subst").text(); + const addStrV = obj.closest(closestSelector).find(".subst").val(); + if(!fn_is_empty(addStrT)){ + addStr = addStrT; + }else{ + addStr = addStrV; + } + existingVal = existingVal + " " +addStr; + $("#"+targetTextAreaSelector).val(existingVal); +} /* ************************************************************ * 인피니티 스크롤 공통 처리 (footer가 보이면 callback함수 호출) diff --git a/src/main/webapp/WEB-INF/views/admin/use/mngr/maJobUserC.jsp b/src/main/webapp/WEB-INF/views/admin/use/mngr/maJobUserC.jsp index ffad4bae..639e1b48 100644 --- a/src/main/webapp/WEB-INF/views/admin/use/mngr/maJobUserC.jsp +++ b/src/main/webapp/WEB-INF/views/admin/use/mngr/maJobUserC.jsp @@ -381,7 +381,7 @@ since : 2023.12.19 김세엽 최초 생성 url : '', data : params, success:function(result) { - let mngrInnb = JSON.parse(result.resBody.result); + let mngrInnb = JSON.parse(result.resBody.result).mngrInnb; $('#backupForm').find('[name=mngrInnb]').val(mngrInnb); $('#backupForm').find('[name=pageDv]').val('I'); diff --git a/src/main/webapp/WEB-INF/views/comm/Include.jsp b/src/main/webapp/WEB-INF/views/comm/Include.jsp index 54fd566a..bde31ad9 100644 --- a/src/main/webapp/WEB-INF/views/comm/Include.jsp +++ b/src/main/webapp/WEB-INF/views/comm/Include.jsp @@ -372,9 +372,8 @@ fn_reflesh_cart_cnt() - /*비밀번호 변경 알림 여부 확인*/ $(document).ready(function () { - + /*비밀번호 변경 알림 여부 확인*/ const url = ''; const originalUrl = window.location.href; let passwordAt = '<%=(String)session.getAttribute("passwordChngDeAt")%>' @@ -383,6 +382,15 @@ location.href = url + '?originalUrl=' + encodeURIComponent(originalUrl); } + /*연령확인 여부 확인*/ + let ageChked = getCookieValue("ageChk"); + if(!ageChked) { + fn_open_modal( + '#ageChkPopupDiv', + '#ageChkPopup', + '/sopmal/main/selectAgeChkPopup' + ); + } }) @@ -398,6 +406,7 @@ }%>
+
diff --git a/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp b/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp index 8c77ec92..dd170bff 100644 --- a/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp +++ b/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp @@ -90,6 +90,9 @@ <%--theme적용--%> "> +<%--font적용--%> + + <%--Web-App연동 스크립트--%> @@ -361,6 +364,8 @@ loadRecentSearches(); passwordChngDeAt(); + + ageChkAt(); fn_save_mbrdvc_info(${isAuthenticated}); }); @@ -470,6 +475,31 @@ } } + /*연령확인 여부 확인 */ + function ageChkAt() { + let ageChked = getCookieValue("ageChk"); + if(!ageChked) { + openModal('confirm_ageChk_alert'); + } + } + + const fn_ageChk_yes = function() { + closeModal('confirm_ageChk_alert') + document.cookie = "ageChk=true; path=/; max-age=86400"; + } + + const fn_ageChk_no = function() { + window.location.href = "https://m.search.naver.com/search.naver?query=사케일잔"; + } + + //쿠키 값 가져오기 + const getCookieValue = function(name) { + let matches = document.cookie.match( + new RegExp('(?:^|; )' + name + '=([^;]*)') + ); + return matches ? matches[1] : null; + } + // 최근 검색어 저장 function saveSearch(param) { let searches = JSON.parse(localStorage.getItem('recentSearches')) || []; @@ -755,6 +785,32 @@ +<%--연령확인 모달--%> + + <%--cutom 확인 모달--%> -