From 6902ac8ef4e7a62b3d606a45c5b761f56aa225f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=9A=B1?= Date: Wed, 24 Dec 2025 15:19:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/user/mngr/service/BOJobUserService.java | 4 +++- .../mngr/controller/SetupMngrInfoController.java | 13 +++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/admin/user/mngr/service/BOJobUserService.java b/src/main/java/com/wb/domainserver/domain/admin/user/mngr/service/BOJobUserService.java index e9189bdd..97a61136 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/user/mngr/service/BOJobUserService.java +++ b/src/main/java/com/wb/domainserver/domain/admin/user/mngr/service/BOJobUserService.java @@ -322,13 +322,15 @@ public class BOJobUserService { // 일치하면 1, 불일치하면 0 반환 + log.debug("encodedPwd:{}", encodedPwd); + log.debug("newPwd:{}", newPwd); if (encodedPwd.equals(newPwd)) { result = 1; } else { result = 0; } - + log.debug("result:{}", result); } catch (WnbtRestException wre){ throw new WnbtRestException(wre.getMessage()); } catch (Exception e) { diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java index 2d7c1192..0d6c1bc9 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java @@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.math.BigInteger; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -150,10 +151,14 @@ public class SetupMngrInfoController { /*비밀번호 체크*/ if("Y".equals(vo.getPwChngAt())){ /*1 비밀번호 변경 시 현재 비밀번호 확인*/ - Map resultMap = responseHandler.handleResponseAsMap( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo) - ); - int result = (int) resultMap.get("result"); +// Map resultMap = responseHandler.handleResponseAsMap( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo) +// ); + + BOJobUserVO uvo = new BOJobUserVO(); + uvo.setMngrInnb(vo.getMngrInnb()); + + Integer result = jobUserService.selectBOJobUserPasswordInqire(uvo);; if(result == 0){ throw new WnbtRestException("현재 비밀번호가 일치하지 않습니다"); } From 827c76c1af9b60735114ee6e1211f0ec5b9621ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 24 Dec 2025 15:52:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95(1)=20-=20?= =?UTF-8?q?=ED=8C=A8=EC=8A=A4=EC=9B=8C=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mngr/setup/mngr/controller/SetupMngrInfoController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java b/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java index 0d6c1bc9..ce7cb59b 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java @@ -157,6 +157,7 @@ public class SetupMngrInfoController { BOJobUserVO uvo = new BOJobUserVO(); uvo.setMngrInnb(vo.getMngrInnb()); + uvo.setPassword(vo.getPassword()); Integer result = jobUserService.selectBOJobUserPasswordInqire(uvo);; if(result == 0){ From bc45eb31ce5c12dc1fa65b24859d5dd8c07bf00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 24 Dec 2025 16:37:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=ED=99=94=ED=8F=90=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=20=EB=B3=80=EA=B2=BD=20(=EC=9B=90=20=E2=86=92=20?= =?UTF-8?q?=E5=86=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp | 13 +++++++------ .../mngr/ordr/dlivy/DlivyListInqireRForm.jsp | 6 ++++-- .../mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp | 2 +- .../mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp | 13 +++++++------ .../mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp | 19 ++++++++++--------- .../views/mngr/setup/mbr/GradBnefListR.jsp | 3 ++- .../views/mngr/setup/mbr/GradBnefRegistU.jsp | 3 ++- 7 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp index 9429e963..31790a40 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp @@ -944,6 +944,7 @@
+

주문상품

@@ -1137,11 +1138,11 @@
-
총 상품금액 원
+
총 상품금액 ${curUnit}
+
-
+
    @@ -1149,7 +1150,7 @@ -
  • ${dscnt.dscntDvNm} : 원
    • +
  • ${dscnt.dscntDvNm} : ${curUnit}
    •      @@ -1159,7 +1160,7 @@
-
-
+
    @@ -1167,7 +1168,7 @@ -
  • ${dscnt.dscntDvNm} : 원
    • +
  • ${dscnt.dscntDvNm} : ${curUnit}
    •      @@ -1177,7 +1178,7 @@
=
-
총 결제금액 원
+
총 결제금액 ${curUnit}
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp index a65517db..9e851dc7 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp @@ -9,6 +9,7 @@ <%@ include file="/WEB-INF/views/comm/mngr/Include.jsp"%> +