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..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 @@ -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,15 @@ 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()); + uvo.setPassword(vo.getPassword()); + + Integer result = jobUserService.selectBOJobUserPasswordInqire(uvo);; if(result == 0){ throw new WnbtRestException("현재 비밀번호가 일치하지 않습니다"); } 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"%> +