From ab61c06b71901136a7a81cd20f936908af043918 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 21 Jun 2023 14:56:26 +0900 Subject: [PATCH 01/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=20=ED=83=88=ED=87=B4=EC=82=AC?= =?UTF-8?q?=EC=9C=A0=20=ED=86=B5=EA=B3=84=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EgovMberManageServiceImpl.java | 5 ++++ .../uat/uia/service/impl/MberManageDAO.java | 5 ++++ .../umt/service/EgovMberManageService.java | 2 ++ .../itn/let/uss/umt/service/MberManageVO.java | 16 ++++++++++++- .../uss/umt/web/EgovUserManageController.java | 3 +++ .../let/uss/umt/EgovMberManage_SQL_Mysql.xml | 24 +++++++++++++++++++ 6 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index c46e0466..09066cb7 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -122,6 +122,11 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement return mberManageDAO.selectMberList(userSearchVO); } + @Override + public List selectMberDelTypeGrpList(UserDefaultVO userSearchVO) throws Exception { + return mberManageDAO.selectMberDelTypeGrpList(userSearchVO); + } + @Override public List selectMberLoginAddList(UserDefaultVO userSearchVO) throws Exception { return mberManageDAO.selectMberLoginAddList(userSearchVO); diff --git a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java index 2b4ef5c7..217a13cf 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java @@ -75,6 +75,11 @@ public class MberManageDAO extends EgovComAbstractDAO{ return (List) list("mberManageDAO.selectMberList", userSearchVO); } + @SuppressWarnings("unchecked") + public List selectMberDelTypeGrpList(UserDefaultVO userSearchVO){ + return (List) list("mberManageDAO.selectMberDelTypeGrpList", userSearchVO); + } + @SuppressWarnings("unchecked") public List selectMberLoginAddList(UserDefaultVO userSearchVO){ return (List) list("mberManageDAO.selectMberLoginAddList", userSearchVO); diff --git a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java index ab1082a2..bae73931 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java @@ -52,6 +52,8 @@ public interface EgovMberManageService { */ public List selectMberList(UserDefaultVO userSearchVO) throws Exception; + public List selectMberDelTypeGrpList(UserDefaultVO userSearchVO) throws Exception; + public List selectMberLoginAddList(UserDefaultVO userSearchVO) throws Exception; public List selectMberListNewUser(UserDefaultVO userSearchVO) throws Exception; diff --git a/src/main/java/itn/let/uss/umt/service/MberManageVO.java b/src/main/java/itn/let/uss/umt/service/MberManageVO.java index bba5f3c9..86243c45 100644 --- a/src/main/java/itn/let/uss/umt/service/MberManageVO.java +++ b/src/main/java/itn/let/uss/umt/service/MberManageVO.java @@ -488,10 +488,24 @@ public class MberManageVO extends UserDefaultVO{ private String spamKeyword; //스팸 필터링 문자단어들 private String spamRegistPnttm; //스팸 문자 발송 내용 등록일자 private String exceptSpamYn; //스팸 필터링 예외 처리 여부 - private String hotlineAgentCode; //회원 전용 전송사 코드 정보 private String hotlineAgentName; //회원 전용 전송사 명 private String admUserId; //관리자아이디 + private String deleteTypeName; // 탈퇴 사유 명 + private String deleteTypeCnt; // 탈퇴 사유 인원수 + + public String getDeleteTypeName() { + return deleteTypeName; + } + public void setDeleteTypeName(String deleteTypeName) { + this.deleteTypeName = deleteTypeName; + } + public String getDeleteTypeCnt() { + return deleteTypeCnt; + } + public void setDeleteTypeCnt(String deleteTypeCnt) { + this.deleteTypeCnt = deleteTypeCnt; + } public String getAdmUserId() { return admUserId; diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 3d402815..0408ace3 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -563,6 +563,9 @@ public class EgovUserManageController { paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); model.addAttribute("paginationInfo", paginationInfo); + // 탈퇴사유별 인원수 + List resultMberDelTypeGrpList = mberManageService.selectMberDelTypeGrpList(userSearchVO); + model.addAttribute("resultMberDelTypeGrpList", resultMberDelTypeGrpList); return "cmm/uss/umt/EgovDelUserManage"; } diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml index 83e0fa4e..4a6d2eb5 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml @@ -633,6 +633,30 @@ + + + + UPDATE diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index fee9b153..bb923bd1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -11,6 +11,7 @@ @@ -36,56 +41,53 @@ $(document).ready(function(){ 아래의 예제를 참고하시면 보다 쉽게 문자온 RESTful API의 구현이 가능합니다.
-

Example

- -
    -
  • -
    -
    - JSP Example -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    jsp_example_send_msg.jsp문자보내기(여러명에게 동일한문자)
    jsp_example_send_msgs.jsp문자보내기(여러명에게 다른문자)
    jsp_example_list.jsp전송내역조회
    jsp_example_detail_list.jsp상세전송내역조회
    jsp_example_remain.jsp발송가능건수
    -
    -
    • -
+

Example

+ +
    +
  • +
    +
    + JSP Example +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    jsp_example_send_msg_r1.jsp문자보내기(여러명에게 동일한문자)
    jsp_example_send_msgs_r1.jsp문자보내기(여러명에게 다른문자)
    jsp_example_hstry_r1.jsp전송내역조회
    jsp_example_hstry_detail_r1.jsp상세전송내역조회
    jsp_example_select_price_r1.jsp발송가능건수
    +
    +
    • +
- -
- -
- + +
+ +
+ diff --git a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp index b9df0fdb..22bbefe3 100644 --- a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp @@ -24,8 +24,8 @@ //회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용해주세요 //실제서비스용 -// final String mberId = "goodgkdus"; //문자온 로그인 아이디 -// final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key +// final String mberId = ""; //문자온 로그인 아이디 +// final String apiKey = ""; //발급받은 api key //테스트용 String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디 @@ -33,8 +33,8 @@ /******************** 전송요청 URL ********************/ - //final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstryDetail"; - final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail"; + final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstryDetail"; +// final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail"; // String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail"; /**************** 발송가능건수 예제 ******************/ diff --git a/src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp index e3ed4c7c..e1ec9fe5 100644 --- a/src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp @@ -33,10 +33,9 @@ /******************** 전송요청 URL ********************/ - //final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstry"; + final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstry"; // final String apiUrl = "http://localhost:8088/api/inqry/hstry"; - String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstry"; // 전송요청 URL /**************** 발송가능건수 예제 ******************/ System.out.println("전체발송이력"); diff --git a/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp index 201d5082..a8d37cdf 100644 --- a/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp @@ -34,6 +34,7 @@ data : searchWebParam, success: function (returnData, status) { + console.log('returnData : ', returnData) //alert(returnData.shortPrice); //alert(returnData.resultCode); //alert(returnData.message); diff --git a/src/main/webapp/sample_mjon/jsp_example_select_price_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_select_price_r1.jsp index ace39c3b..2382b93f 100644 --- a/src/main/webapp/sample_mjon/jsp_example_select_price_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_select_price_r1.jsp @@ -33,8 +33,8 @@ /******************** 전송요청 URL ********************/ - final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/selectPrice"; -// final String apiUrl = "http://localhost:8088/api/inqry/selectPrice"; + final String apiUrl = "https://api.munjaon.co.kr/api/inqry/price"; +// final String apiUrl = "http://localhost:8088/api/inqry/price"; /**************** 발송가능건수 예제 ******************/ System.out.println("잔액|단가|발송가능건수"); diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp index 93960ad6..18fc6115 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp @@ -24,7 +24,7 @@ /******************** 전송 요청 URL ********************/ //final String apiUrl = "http://localhost:8088/api/send/sendMsg"; - final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg"; //개발테스트용 URL + final String apiUrl = "https://api.munjaon.co.kr/api/send/sendMsg"; //개발테스트용 URL //final String apiUrl = "https://api.munjaon.co.kr:9998/api/send/sendMsg"; //실제 서비스 URL //회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용 diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp index 992e73c3..9959b428 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp @@ -25,7 +25,7 @@ /******************** 전송 요청 URL ********************/ //String apiUrl = "http://localhost:8088/api/send/sendMsgs"; //final String apiUrl = "https://api.munjaon.co.kr:9998/api/send/sendMsg"; //실제 서비스 URL - String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; //개발테스트용 URL + String apiUrl = "https://api.munjaon.co.kr/api/send/sendMsgs"; //개발테스트용 URL //회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용 //실제서비스용 diff --git a/src/main/webapp/sample_mjon/jsp_샘플_예제.zip b/src/main/webapp/sample_mjon/jsp_샘플_예제.zip new file mode 100644 index 0000000000000000000000000000000000000000..e73d1c1fdb83f38d2105906d2a8ffd4249a8ba44 GIT binary patch literal 22003 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/sendRESTAPI_test_r1_send.jsp b/src/main/webapp/sendRESTAPI_test_r1_send.jsp index 59dcbafe..904c1c18 100644 --- a/src/main/webapp/sendRESTAPI_test_r1_send.jsp +++ b/src/main/webapp/sendRESTAPI_test_r1_send.jsp @@ -187,7 +187,7 @@ case "MYDATA": System.out.println("잔액|단가|발송가능건수"); sms_url = "http://localhost:8088/api/accessKey/myData"; // 전송요청 URL - sms_url = "http://localhost:8088/api/inqry/selectPrice"; // 전송요청 URL + sms_url = "http://localhost:8088/api/inqry/price"; // 전송요청 URL break; default: From 8a6e426c0b3d87c2cea7ad2e439f87d8bc79d1b8 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 22 Jun 2023 15:59:57 +0900 Subject: [PATCH 10/39] =?UTF-8?q?feat=20:=20REST=20API=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/sendRESTAPI_infoPage3_r1_tab1.jsp | 4 ++-- .../user/sendRESTAPI_infoPage3_r1_tab5.jsp | 23 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab1.jsp b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab1.jsp index b342746b..9168f0ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab1.jsp @@ -235,7 +235,7 @@ {

"resultCode":"0"

-

, "data":[

+

, "data":{

"msgGroupId":"MSGGID_0000000000000"

, "msgType":"SMS"

@@ -245,7 +245,7 @@

, "successCnt":"3"

, "test_yn":null

-

]

+

}

} diff --git a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab5.jsp b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab5.jsp index ff0d6c8c..e8a9728e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab5.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab5.jsp @@ -206,18 +206,17 @@ {

 "resultCode":"0"

-

 , "data":[

-

  {

-

   "longPrice":"50"

-

   , "longSendPsbltEa": "19651"

-

   , "mberMoney": "982586.7"

-

   , "message": null

-

   , "picturePrice": "90"

-

   , "pictureSendPsbltEa": "10917"

-

   , "shortPrice": "18"

-

   , "shortSendPsbltEa": "54588"

-

  }

-

 ]

+

 , "data":{

+

  "longPrice":"50"

+

  , "longSendPsbltEa": "19651"

+

  , "mberMoney": "982586.7"

+

  , "message": null

+

  , "picturePrice": "90"

+

  , "pictureSendPsbltEa": "10917"

+

  , "shortPrice": "18"

+

  , "shortSendPsbltEa": "54588"

+

  

+

 }

} From e5866d89c95f987379dc075fe5a118f3e98df769 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 22 Jun 2023 17:15:38 +0900 Subject: [PATCH 11/39] 2023-06-22 17:15 --- .../let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml | 2 ++ .../sample_mjon/jsp_example_hstry_detail_form_r1.jsp | 2 ++ .../sample_mjon/jsp_example_hstry_detail_r1.jsp | 12 ++++++------ .../webapp/sample_mjon/jsp_example_hstry_form_r1.jsp | 4 +++- src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp | 10 +++++----- .../sample_mjon/jsp_example_select_price_form_r1.jsp | 4 +++- .../sample_mjon/jsp_example_select_price_r1.jsp | 10 +++++++--- .../sample_mjon/jsp_example_send_msg_form_r1.jsp | 4 +++- .../webapp/sample_mjon/jsp_example_send_msg_r1.jsp | 10 +++++----- .../sample_mjon/jsp_example_send_msgs_form_r1.jsp | 4 +++- .../webapp/sample_mjon/jsp_example_send_msgs_r1.jsp | 10 +++++----- 11 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml index 255dfc21..a12b6a7f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml @@ -229,6 +229,7 @@ +
    +
    • +
    • +
    • +
    • +
+
+
    +
  • 타임아웃 아이콘 +

    로그인 세션 타임아웃 시간 : 30분

    +
    • +
  • 타임 아이콘 +

    최종접속일시 : 2020-06-01 11:00

    +
    • +
+
+
개인이미지
+
    +
  • Soobin Jung
    • +
  • 최고관리자
    • +
+
+
+ + + +
+
+
+

사용자관리

+
+
+
+
+
~ +
+


+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분문자 단가 높음사용할 일이 없어서다른 사이트 이용개인정보 유출 우려사이트 이용 불만기업회원 전환기타(직접입력)계
인원6050403020105300
+
+ +
+

총 182건

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디사용자명회원구분전화번호법인폰문자할인이벤트상태후보자상세가입일자최근로그인
182 +
euiseung82
+ 		이의승개인 01048268258오프 일반 일반 06-08 14:41 06-11 10:48
+
+
+
+
    +
    • +
    • +
  • 1
    • +
  • 2
    • +
  • 3
    • +
  • 4
    • +
  • 5
    • +
  • 6
    • +
  • 7
    • +
  • 8
    • +
  • 9
    • +
  • 10
    • +
    • +
    • +
+
+
+
+ + + \ No newline at end of file From 48d78bf3edaecf8ac5a08c820d770c2e339f7527 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 16:33:43 +0900 Subject: [PATCH 18/39] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=99=98?= =?UTF-8?q?=EB=B6=88=EB=93=B1=EB=A1=9D=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/pay/web/RefundController.java | 99 ++++++++++++++++++- .../WEB-INF/jsp/uss/ion/pay/RefundList.jsp | 11 +++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/mjo/pay/web/RefundController.java b/src/main/java/itn/let/mjo/pay/web/RefundController.java index 91603163..03d17a92 100644 --- a/src/main/java/itn/let/mjo/pay/web/RefundController.java +++ b/src/main/java/itn/let/mjo/pay/web/RefundController.java @@ -929,13 +929,25 @@ public class RefundController { * 결제취소 등록 * @param RefundVO * @param model - * @return "/uss/ion/pay/RefundRegist" + * @return "/uss/ion/pay/cancelRegist" * @throws Exception */ @RequestMapping(value="/uss/ion/pay/cancelRegist.do") public String cancelRegist(@ModelAttribute("refundVO") RefundVO refundVO) throws Exception{ return "/uss/ion/pay/cancelRegist"; } + + /** + * 환불 등록 + * @param RefundVO + * @param model + * @return "/uss/ion/pay/RefundRegist" + * @throws Exception + */ + @RequestMapping(value="/uss/ion/pay/refundRegist.do") + public String refundRegist(@ModelAttribute("refundVO") RefundVO refundVO) throws Exception{ + return "/uss/ion/pay/RefundRegist"; + } /** * 결제취소 페이지 @@ -1000,6 +1012,91 @@ public class RefundController { return ResponseEntity.ok().body(refundService.insertPayCanAjax(userInfoAdd(refundVO))); } + /** + * 환불요청 등록 Ajax + * @param RefundVO + * @param model + * @return modelAndView + * @throws Exception + */ + @RequestMapping(value = {"/uss/ion/pay/refMonInsAjax.do"}) + public ModelAndView refMonInsAjax(final MultipartHttpServletRequest multiRequest + , RefundVO refundVO , HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + try { + String atchFileId = ""; + final Map files = multiRequest.getFileMap(); + if (!files.isEmpty()) { + if(files.containsKey("bank")){ + Map tmpMap = new LinkedHashMap<>(); + tmpMap.put("bank", files.get("bank")); + List result = fileUtil.parseFileInf(tmpMap, "REFUND_", 0, "", "", ""); + atchFileId = fileMngService.insertFileInfs(result); + refundVO.setBankAtchFileId(atchFileId); + } + if(files.containsKey("docu")){ + Map tmpMap = new LinkedHashMap<>(); + tmpMap.put("docu", files.get("docu")); + List result = fileUtil.parseFileInf(tmpMap, "REFUND_", 0, "", "", ""); + atchFileId = fileMngService.insertFileInfs(result); + refundVO.setDocuAtchFileId(atchFileId); + } + } + + refundVO.setFrstRegisterId(refundVO.getMberId()); + refundVO.setRefundStatus("1"); + refundService.insertRefund(refundVO); + + modelAndView.addObject("status", "success"); + }catch (Exception e) { + System.out.println("REFUND ERROR : " + e.getMessage()); + + modelAndView.addObject("status", "fail"); + } + + return modelAndView; + } + + /** + * 환불신청금액(환불요청 상태) Ajax + * @param RefundVO + * @param model + * @return modelAndView + * @throws Exception + */ + @RequestMapping(value = {"/uss/ion/pay/refMonSumAjax.do"}) + public ModelAndView refMonSumAjax(RefundVO refundVO, HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + int refundMoneySum = 0; + int userMoney = 0; + + try { + refundVO = refundService.selectRefundMberInfo(refundVO); + userMoney = (int)Double.parseDouble(refundVO.getMberMoney()); // 보유Cash + + refundMoneySum = refundService.selectRefundMoneySum(refundVO); // 환불신청금액(환불요청 상태) + + } catch (Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + modelAndView.addObject("userMoney", userMoney); + modelAndView.addObject("refundMoneySum", refundMoneySum); + + return modelAndView; + } + /** * 캐쉬 환불 처리 * @param refundVO diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp index 39a43343..05dd3e2d 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp @@ -64,6 +64,14 @@ function fn_insert(){ frm.submit(); } +// 환불 등록 +function fn_refundRegist(){ + frm = document.listForm; + frm.action = ""; + frm.submit(); +} + + /* 수정 화면*/ function fn_modify(moid){ var frm = document.modiForm ; @@ -314,6 +322,9 @@ function fnSelectMber(mberId) {
+ <%-- + + --%>
From d45585029adeb7d6dc36d6f9fda18057f9dcac63 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 16:34:28 +0900 Subject: [PATCH 19/39] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=99=98?= =?UTF-8?q?=EB=B6=88=EB=93=B1=EB=A1=9D=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp | 560 ++++++++++++++++++ 1 file changed, 560 insertions(+) create mode 100644 src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp new file mode 100644 index 00000000..828ba654 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp @@ -0,0 +1,560 @@ +<%-- + Class Name : RefundRegist.jsp + Description : Refund 상세 페이지 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2023.06.26 박진순 최초 생성 + + author : 박진순 + since : 2023.06.26 + +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> + + + +환불 등록 + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+
+

결제취소 등록

+

결제취소 등록 페이지 입니다.

+
+
+

환불 금액 입력

+ + + + + + + + + + + + + + + + + + + + + + + +
+ 회원 아이디 + + + +
회원 이름 +
환불 가능 금액 +
환불 신청 금액 + + + + + 전액환불(10,000원 이하 환불 불가) +
+ +

+

환불 사유 및 연락처

+ + + + + + + + + + + + + + + +
환불사유 +
+ + +
+
연락처 + + +
+ +

+ + + + + + + + + + + + + + +
통장사본 + + + +
+ + + + ※ 파일첨부가 안되시는 경우, 메일 help@iten.co.kr로 보내주세요 +
+ +
증빙서류 + +
+ + + + ※이체확인증 또는 휴대폰 납부 영수증을 첨부해주세요 +
+
+ +
+ + +
+ +
+
+
+ + +
+
+
+
+ + 회원 아이디 검색 +
+
+ 검색할 아이디 +
+
+ 아이디를 검색하세요 +
+
+
+ + + From 4c381b8b1fd789a68246ad235cd8f99a5757bc9a Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 17:22:33 +0900 Subject: [PATCH 20/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=EC=9E=90=20=EA=B4=80=EB=A6=AC=20=ED=86=B5=EA=B3=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uss/umt/service/UserDefaultVO.java | 10 +++++ .../let/uss/umt/EgovMberManage_SQL_Mysql.xml | 4 ++ .../jsp/cmm/uss/umt/EgovDelUserManage.jsp | 37 +++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/src/main/java/itn/let/uss/umt/service/UserDefaultVO.java b/src/main/java/itn/let/uss/umt/service/UserDefaultVO.java index 4fe78500..a4a8d8c0 100644 --- a/src/main/java/itn/let/uss/umt/service/UserDefaultVO.java +++ b/src/main/java/itn/let/uss/umt/service/UserDefaultVO.java @@ -171,6 +171,16 @@ public class UserDefaultVO implements Serializable { private String searchHotlineAgentCode; + private String searchDeleteType; + + public String getSearchDeleteType() { + return searchDeleteType; + } + + public void setSearchDeleteType(String searchDeleteType) { + this.searchDeleteType = searchDeleteType; + } + public String getSearchHotlineAgentCode() { return searchHotlineAgentCode; } diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml index 15a2136f..7217bb3b 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml @@ -184,6 +184,10 @@ adminSmsNoticeYn = #searchAdminSmsNoticeYn# + + deleteType = #searchDeleteType# + + (shortPrice > 0 AND (18.00 > shortPrice OR 50.00 > longPrice OR 90.00 > picturePrice OR 110.00 > picture2Price OR 130.00 > picture3Price)) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp index 4b321920..8a1a5a17 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp @@ -132,6 +132,43 @@ function fn_search2(){ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분${item.deleteTypeName}계
인원${item.deleteTypeCnt}
+
+

총 건

From 5cbc48dbf6358dc66b2d83397dde98979378cdf9 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 17:39:58 +0900 Subject: [PATCH 21/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=86=B5=EA=B3=84=20=EB=AC=B8=EA=B5=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/cmm/uss/umt/EgovDelUserManage.jsp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp index 8a1a5a17..05dd3d5c 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp @@ -136,15 +136,11 @@ function fn_search2(){
- - - - - - - - - + + + + + @@ -229,7 +225,7 @@ function fn_search2(){ From a9bbbde63fd1e641ad6a4f83b9853597e139897e Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 17:46:41 +0900 Subject: [PATCH 22/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=86=B5=EA=B3=84=20=EA=B0=84=EA=B2=A9?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp index 05dd3d5c..5c0891c4 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp @@ -138,7 +138,7 @@ function fn_search2(){ - + From d9ad056a164f987d8b1956d1560589554ba3c01b Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 17:55:34 +0900 Subject: [PATCH 23/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=86=B5=EA=B3=84=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=95=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp index 5c0891c4..09d25f44 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp @@ -86,6 +86,7 @@ function fn_search2(){
+ From 0cc9c811a599848a9fc47a8d1c966fab549767bb Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 18:05:23 +0900 Subject: [PATCH 24/39] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=83=89=EC=8B=9C=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=EC=82=AC=EC=9C=A0=20=EC=B4=88=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp index 09d25f44..e288a8f2 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovDelUserManage.jsp @@ -79,6 +79,9 @@ function fn_search2(){ } } + // 초기화 + $("#searchDeleteType").val(''); + linkPage(1); } @@ -86,7 +89,7 @@ function fn_search2(){ - + From f00bbc14b60c0c6e2182278cfc45da0ec44b6da6 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 18:25:49 +0900 Subject: [PATCH 25/39] =?UTF-8?q?KG=20=EB=AA=A8=EB=B9=8C=EB=A6=AC=EC=96=B8?= =?UTF-8?q?=EC=8A=A4=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EA=B8=88=EC=95=A1=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp index c987797b..1eedae39 100644 --- a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp @@ -244,7 +244,7 @@ function pgOpenerPopup(){ //KG 모빌리언스 => CARD function kgmPayCardRequest() { - $("#price").val(110); + $("#price").val(1100); $.ajax({ type: "POST", @@ -301,7 +301,7 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(110); + $("#price").val(1100); $.ajax({ type: "POST", diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index 513d52a3..8402c74c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -174,7 +174,7 @@ function pgOpenerPopup(){ //KG 모빌리언스 => CARD function kgmPayCardRequest() { - $("#price").val(110); + $("#price").val(1100); $.ajax({ type: "POST", @@ -231,7 +231,7 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(110); + $("#price").val(1100); $.ajax({ type: "POST", From 1b6dab9a6c01a28e6f31619d543005d8755241b9 Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 27 Jun 2023 09:37:10 +0900 Subject: [PATCH 26/39] =?UTF-8?q?KG=20=EB=AA=A8=EB=B9=8C=EB=A6=AC=EC=96=B8?= =?UTF-8?q?=EC=8A=A4=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B8=88=EC=95=A1?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp index 1eedae39..557b3595 100644 --- a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp @@ -301,7 +301,7 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(1100); + $("#price").val(5500); $.ajax({ type: "POST", diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index 8402c74c..34ca2447 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -231,7 +231,7 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(1100); + $("#price").val(5500); $.ajax({ type: "POST", From a4b9ba69c58b8d083b447e3656d60d3b54214e2c Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 27 Jun 2023 15:33:06 +0900 Subject: [PATCH 27/39] =?UTF-8?q?2023/06/27=20=ED=8C=A9=EC=8A=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20alt=20=EA=B0=92=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index 6629d4c7..fc0eb24c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -478,7 +478,7 @@

팩스 광고 필수 표시 의무사항

- + <팩스광고 예시> (광고)○○○샵 전화번호 02-123-4567 주소 경기도 남양주시 다산순환로 20 대량 팩스발송은 여기서 쉽고 빠르게 한번에! 신규회원 첫 결제 ★☆할인 및 적립 이벤트!!☆★ 기간) 20XX.01.01 ~ 20XX.12~31 (광고) 팩스 수신을 원하지않을 경우 080-1234-5678

  • 01

    From 2f84d4a7ffbd0f1936b1b2db86d4a1620eafe01d Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 27 Jun 2023 15:41:36 +0900 Subject: [PATCH 28/39] =?UTF-8?q?=ED=99=98=EB=B6=88=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/pay/web/RefundController.java | 11 ++---- .../WEB-INF/jsp/uss/ion/pay/RefundList.jsp | 4 +-- .../WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp | 36 ++++++++----------- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/main/java/itn/let/mjo/pay/web/RefundController.java b/src/main/java/itn/let/mjo/pay/web/RefundController.java index 03d17a92..610e579f 100644 --- a/src/main/java/itn/let/mjo/pay/web/RefundController.java +++ b/src/main/java/itn/let/mjo/pay/web/RefundController.java @@ -1012,14 +1012,8 @@ public class RefundController { return ResponseEntity.ok().body(refundService.insertPayCanAjax(userInfoAdd(refundVO))); } - /** - * 환불요청 등록 Ajax - * @param RefundVO - * @param model - * @return modelAndView - * @throws Exception - */ - @RequestMapping(value = {"/uss/ion/pay/refMonInsAjax.do"}) + + @RequestMapping(value = {"/uss/ion/msg/refMonInsAjax.do"}) public ModelAndView refMonInsAjax(final MultipartHttpServletRequest multiRequest , RefundVO refundVO , HttpServletRequest request) throws Exception { @@ -1060,6 +1054,7 @@ public class RefundController { return modelAndView; } + /** * 환불신청금액(환불요청 상태) Ajax * @param RefundVO diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp index 05dd3e2d..d52d57a7 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundList.jsp @@ -322,9 +322,9 @@ function fnSelectMber(mberId) {
- 기업회원으로 다시 가입 + 기업회원 전환 사용할 일이 없어서 @@ -247,7 +243,7 @@ function fn_search2(){ 다른 사이트이용 - 해지사유 직접 입력 + 기타(직접 입력)
- <%-- + - --%> +
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp index 828ba654..a0a84dc4 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp @@ -94,7 +94,6 @@ function fn_refundIdChk(){ $('#mberNm').val(refundVO.mberNm); $('#dpsitPhoneNo').val(refundVO.mberPhoneNo); $('#mberMoneyTxt').text(fn_unitChanges(refundVO.mberMoney)); - $('#mberMoney').val(refundVO.mberMoney); // 환불가능금액 mberRefundMaxMoney = refundVO.mberMoney; @@ -229,6 +228,7 @@ var _fileIdx = 0; var _fileForm2 = new Array(); function fn_refund_insert() { + if($("input[name=reason]:checked").val() == "999"){ document.listForm.refundReason.value = document.listForm.reason.value; document.listForm.refundReasonEtc.value = document.listForm.reasonEtc.value; @@ -266,10 +266,14 @@ function fn_refund_insert() { } }); + //for(var key of data.keys()){ + // console.log(key); + //} + $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "/uss/ion/pay/refMonInsAjax.do", + url: "/uss/ion/msg/refMonInsAjax.do", data: data, dataType:'json', async: false, @@ -387,6 +391,13 @@ function comma(num){