diff --git a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java index a7df56b8..910fcead 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java @@ -291,6 +291,11 @@ public interface BOMbrMapper { */ public Integer selectBOMbrMbtlnbCompare(BOMbrVO mbrVO); + /** + * 회원 이메일 비교 + * @param mbrVO + */ + public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO); /** * 회원 이메일 수정 diff --git a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java index 65da58b0..e8ff29cc 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java @@ -500,6 +500,18 @@ public class BOMbrService { return changeAt; } + /** + * 회원 정보 수정 전 이메일 변경 여부 체크 + * + * @param mbrVO + * @return + * @author + */ + public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO) { + Integer changeAt = mapper.selectBOMbrMbtlnbCompare(mbrVO); + return changeAt; + } + /** * 회원 아이디 수정 * 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 fc2111d7..6e90cd83 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 @@ -793,6 +793,18 @@ public class MainController { return url; } + + /** + * 구독서비스 폼 이동 + * + * @return + */ + @Policy(AuthPolicy.PUBLIC) + @RequestMapping(value = "/sopmal/main/selectSubscribeForm") + public String selectSubscribeForm(HttpServletRequest request) { + return Util.getDeviceType(request) + "/main/SubscribeR"; + } + /** * 자담유 > 네가지약속 (모바일) * diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java index a6eecdf2..b2ecab2f 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java @@ -62,6 +62,8 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.wb.domainserver.util.string.StringUtil.isEmpty; + /** * * 마이페이지 회원 @@ -746,7 +748,10 @@ public class MyMbrController { throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); } - vo.setMbtlnb(vo.getMbtlnb().replace("-","")); + if(!isEmpty(vo.getMbtlnb())){ + vo.setMbtlnb(vo.getMbtlnb().replace("-","")); + } + //모바일일 시 진행 if("mobile".equals(mymbrVO.getUtilDv())){ if("01".equals(user.getSysDvCd())){ @@ -762,11 +767,15 @@ public class MyMbrController { // Map resultMap = responseHandler.handleResponseAsMap( // sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMbrMbtlnbCompare", mymbrVO) // ); - int result = service.selectBOMbrMbtlnbCompare(vo); +// int result = service.selectBOMbrMbtlnbCompare(vo); + int result = service.selectBOMbrEmailCompare(vo); if(result == 0){ - if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){ - throw new WnbtRestException("휴대폰 인증이 필요합니다."); + if(!"Y".equals(mymbrVO.getEmailChngAt())){ + throw new WnbtRestException("이메일 인증이 필요합니다."); } +// if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){ +// throw new WnbtRestException("휴대폰 인증이 필요합니다."); +// } } } @@ -854,7 +863,7 @@ public class MyMbrController { bowithdrawalVO.setRegistIp(ip); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); - if (StringUtil.isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자 + if (isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자 bowithdrawalVO.setSopmalCd(user.getSopmalCd()); } bowithdrawalVO.setRegusr(user.getUserInnb()); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java index 95d87127..d2275302 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java @@ -61,6 +61,9 @@ public class MyMbrVO extends AbstractVO { /** 휴대폰 번호 변경 여부*/ private String mbtlnbChngAt; + /** 이메일 변경 여부*/ + private String emailChngAt; + /** SMS수신여부 */ private String smsRecptnAt; @@ -68,7 +71,7 @@ public class MyMbrVO extends AbstractVO { private String telnb; /** 우편번호 */ - @NotBlank(message = "우편번호") +// @NotBlank(message = "우편번호") private String zip; /** 도로명; 지번 */ @@ -82,7 +85,7 @@ public class MyMbrVO extends AbstractVO { private String rnmAdres; /** 상세주소 */ - @NotBlank(message = "상세주소") +// @NotBlank(message = "상세주소") private String dtlAdres; /** 성별 */ diff --git a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml index 41feb603..e53a57f2 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml @@ -726,6 +726,15 @@ AND MBTLNB = HEX(AES_ENCRYPT(#{mbtlnb}, #{secretKey})) + + + UPDATE GC_MEMBER SET diff --git a/src/main/resources/static/login/sopmall/pc/css/default.css b/src/main/resources/static/login/sopmall/pc/css/default.css index 5883ccfd..88c6bcfa 100644 --- a/src/main/resources/static/login/sopmall/pc/css/default.css +++ b/src/main/resources/static/login/sopmall/pc/css/default.css @@ -14084,7 +14084,7 @@ main { background-color: #ffffff; overflow: hidden; height: 44px; - padding-right: 16px; + padding-right: 32px; border: 1px solid #dee2e6; border-radius: 4px; text-align: right; diff --git a/src/main/resources/static/pc/css/default.css b/src/main/resources/static/pc/css/default.css index c7230747..eff1d6e9 100644 --- a/src/main/resources/static/pc/css/default.css +++ b/src/main/resources/static/pc/css/default.css @@ -14175,7 +14175,7 @@ main { background-color: #ffffff; overflow: hidden; height: 44px; - padding-right: 16px; + padding-right: 35px; border: 1px solid #dee2e6; border-radius: 4px; text-align: right; diff --git a/src/main/resources/static/sopmall/pc/css/default.css b/src/main/resources/static/sopmall/pc/css/default.css index 0025f20e..a0ec7f3f 100644 --- a/src/main/resources/static/sopmall/pc/css/default.css +++ b/src/main/resources/static/sopmall/pc/css/default.css @@ -14083,7 +14083,7 @@ main { background-color: #ffffff; overflow: hidden; height: 44px; - padding-right: 16px; + padding-right: 35px; border: 1px solid #dee2e6; border-radius: 4px; text-align: right; diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp index f891ba53..eb65a570 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp @@ -2671,14 +2671,14 @@ 판매정보 - + - + 판매 상태 - +
diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp index 5d3c2357..63d01d68 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp @@ -2843,9 +2843,9 @@ 판매정보 - + - + diff --git a/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtRegistC.jsp b/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtRegistC.jsp index 6a79cdfd..23576f3b 100644 --- a/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtRegistC.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtRegistC.jsp @@ -1507,7 +1507,7 @@ since : 2024-01-30 추지훈 최초 생성 - + diff --git a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp index 7bf185aa..ea36aff0 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp @@ -3949,10 +3949,10 @@ active"> - +<%-- --%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchRForm.jsp index 9c13e1b8..6b360da0 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchRForm.jsp @@ -71,12 +71,8 @@ startPric = 5000; endPric = 15000; break; - case '15000 ~ 30000' + curUnit: + case '15000' + curUnit + ' 이상': startPric = 15000; - endPric = 30000; - break; - case '30000' + curUnit + ' 이상': - startPric = 30000; endPric = null; break; default: @@ -1077,8 +1073,7 @@ - - +
diff --git a/src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp b/src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp new file mode 100644 index 00000000..b864d2a9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp @@ -0,0 +1,124 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%-- + Class Name : SubscribeR.jsp + Description : 구독 목록 폼 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2025-12-31 이대환 최초 생성 +--%> + + + + + + + + + + +<%-- 공통 Header --%> + + + +
+
+
+
+

구독 서비스

+
+
+ 구독서비스 +
+ +
+
+
+ 구독서비스 내역 +
    +
  • 구독기간 : 12개월
    • +
  • 배송횟수 : 12회
    • +
  • 배송주기 : 매달 1회
    • +
  • 상품금액 : 99,000${curUnit} 58%
    • +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp index f874ac4c..7aab9ffa 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp @@ -50,7 +50,7 @@ fn_alert_hide($("#email"), $("#emailAlert")); fn_alert_hide($("#mbtlCert"), $("#mbtlCertAlert")); // fn_alert_hide($("#id"), $("#emailAlert")); - fn_alert_hide($("#dtlAdres"), $("#postcodeAlert")); + // fn_alert_hide($("#dtlAdres"), $("#postcodeAlert")); // fn_alert_hide_selected(); //휴대폰번호 포매팅 @@ -765,16 +765,16 @@ /* ******************************************************** * 우편번호 찾기 ******************************************************** */ - const fn_set_postcode = function(data) { - $('#postcode').val(data.postcode); - if (data.addressType == '02') { - $('#adresDv').val(data.addressType); - $('#address').val(data.jibunAddress); - } else if (data.addressType == '01') { - $('#adresDv').val(data.addressType); - $('#address').val(data.roadAddress+data.extraAddress); - } - } + // const fn_set_postcode = function(data) { + // $('#postcode').val(data.postcode); + // if (data.addressType == '02') { + // $('#adresDv').val(data.addressType); + // $('#address').val(data.jibunAddress); + // } else if (data.addressType == '01') { + // $('#adresDv').val(data.addressType); + // $('#address').val(data.roadAddress+data.extraAddress); + // } + // } /* ******************************************************** * 외부연동 로그인 ( 네이버, 카카오 ) @@ -826,18 +826,18 @@ // return; // } - if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') { - alert('우편번호를 선택해 주세요.'); - $("#postcodeAlert").show(); - document.getElementById('postcodeBtn').scrollIntoView(); - return; - } + // if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') { + // alert('우편번호를 선택해 주세요.'); + // $("#postcodeAlert").show(); + // document.getElementById('postcodeBtn').scrollIntoView(); + // return; + // } - if ($('#dtlAdres').val().trim() == '') { - alert('상세주소를 입력해 주세요.'); - $('#dtlAdres').focus(); - return; - } + // if ($('#dtlAdres').val().trim() == '') { + // alert('상세주소를 입력해 주세요.'); + // $('#dtlAdres').focus(); + // return; + // } const data = $("#mbrInfoUpdtForm").serialize(); if (confirm('회원 정보를 ')) { @@ -1265,34 +1265,34 @@ - - - 주소* - - -
-
- " readonly> - -
- - - value="" - - - value="" - - - readonly> - "> - -
- - - +<%-- --%> +<%-- --%> +<%-- 주소*--%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--
--%> +<%-- +<%-- value="" readonly>--%> +<%-- --%> +<%--
--%> +<%-- +<%-- --%> +<%-- --%> +<%-- value=""--%> +<%-- --%> +<%-- --%> +<%-- value=""--%> +<%-- --%> +<%-- --%> +<%-- readonly>--%> +<%-- +<%-- value="">--%> +<%-- --%> +<%--
--%> +<%-- --%> +<%-- --%> +<%-- --%> 마케팅 수신동의 diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/GoodsSlcPopupR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/GoodsSlcPopupR.jsp index c117bb8d..11697dae 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/GoodsSlcPopupR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/GoodsSlcPopupR.jsp @@ -16,7 +16,7 @@ ------- -------- --------------------------- 2024-02-27 추지훈 최초 생성 --%> - + - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> -
+<%-- --%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp index 1e968c45..50c892a1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp @@ -3733,11 +3733,11 @@ const fn_move_goodsDtl_login = () => { active"> - +<%-- --%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp index 4871f092..e35424b1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp @@ -48,7 +48,7 @@ fn_alert_hide($("#email"), $("#emailAlert")); fn_alert_hide($("#mbtlCert"), $("#mbtlCertAlert")); // fn_alert_hide($("#id"), $("#emailAlert")); - fn_alert_hide($("#dtlAdres"), $("#postcodeAlert")); + // fn_alert_hide($("#dtlAdres"), $("#postcodeAlert")); // fn_alert_hide_selected(); $('button').on('click', function(e) { @@ -849,17 +849,17 @@ /* ******************************************************** * 우편번호 찾기 ******************************************************** */ - const fn_set_postcode = function(data) { - $('#postcode').val(data.postcode); - if (data.addressType == '02') { - $('#adresDv').val(data.addressType); - $('#address').val(data.jibunAddress); - } else if (data.addressType == '01') { - $('#adresDv').val(data.addressType); - $('#address').val(data.roadAddress+data.extraAddress); - } - closeModal("postModal"); - } + // const fn_set_postcode = function(data) { + // $('#postcode').val(data.postcode); + // if (data.addressType == '02') { + // $('#adresDv').val(data.addressType); + // $('#address').val(data.jibunAddress); + // } else if (data.addressType == '01') { + // $('#adresDv').val(data.addressType); + // $('#address').val(data.roadAddress+data.extraAddress); + // } + // closeModal("postModal"); + // } /* ******************************************************** * 외부연동 로그인 ( 네이버, 카카오 ) @@ -911,18 +911,18 @@ // return; // } - if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') { - fn_alert_show('우편번호를 선택해 주세요.'); - $("#postcodeAlert").show(); - document.getElementById('postcodeBtn').scrollIntoView(); - return; - } + // if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') { + // fn_alert_show('우편번호를 선택해 주세요.'); + // $("#postcodeAlert").show(); + // document.getElementById('postcodeBtn').scrollIntoView(); + // return; + // } - if ($('#dtlAdres').val().trim() == '') { - fn_alert_show('상세주소를 입력해 주세요.'); - $('#dtlAdres').focus(); - return; - } + // if ($('#dtlAdres').val().trim() == '') { + // fn_alert_show('상세주소를 입력해 주세요.'); + // $('#dtlAdres').focus(); + // return; + // } const data = $("#mbrInfoUpdtForm").serialize(); if (confirm('회원 정보를 ')) { @@ -1312,30 +1312,30 @@
-
-
주소*
-
-
- " readonly> - -
- - - value="" - - - value="" - - - readonly> - "> - -
- -
+<%--
--%> +<%--
주소*
--%> +<%--
--%> +<%--
--%> +<%-- +<%-- value="" readonly>--%> +<%-- --%> +<%--
--%> +<%-- +<%-- --%> +<%-- --%> +<%-- value=""--%> +<%-- --%> +<%-- --%> +<%-- value=""--%> +<%-- --%> +<%-- --%> +<%-- readonly>--%> +<%-- +<%-- value="">--%> +<%-- --%> +<%--
--%> +<%-- --%> +<%--
--%>
마케팅 수신 동의
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GoodsSlcPopupR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GoodsSlcPopupR.jsp index 4444edd2..ae890eae 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GoodsSlcPopupR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GoodsSlcPopupR.jsp @@ -16,7 +16,7 @@ ------- -------- --------------------------- 2024-02-27 추지훈 최초 생성 --%> - + - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%>