From 972c32081ff20a7699462f3ee4345f8a8b4a51b6 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 23 Jun 2023 10:44:39 +0900 Subject: [PATCH 01/29] =?UTF-8?q?=EC=9B=90=EC=98=81=ED=98=84=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovNewUserManage.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovNewUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovNewUserManage.jsp index b82e5113..3df58661 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovNewUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovNewUserManage.jsp @@ -9,7 +9,7 @@ 2009.03.03 JJY 최초 생성 2011.08.31 JJY 경량환경 버전 생성 - author : 공통서비스 개발팀 JJY + author : 공통서비스 개발팀 WYH since : 2009.03.03 --%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> From 1cea012c6833270f8eab600717679a731c593014 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 11:05:44 +0900 Subject: [PATCH 02/29] =?UTF-8?q?KG=EB=AA=A8=EB=B9=8C=EB=A6=AC=EC=96=B8?= =?UTF-8?q?=EC=8A=A4=20=EA=B2=B0=EC=A0=9C=EC=99=84=EB=A3=8C=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovProps/globals_prod.properties | 6 ++-- .../WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp | 30 ++++++++++++++++++ .../WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp | 31 +++++++++++++++++++ .../WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp | 31 +++++++++++++++++++ 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index cd23f188..1473f71c 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -99,7 +99,7 @@ Globals.pay.kgm.card.cnSvcid=191017078687 Globals.pay.kgm.card.payMode=10 #BANK Globals.pay.kgm.bank.raSvcid=230510133362 -Globals.pay.kgm.bank.payMode=00 +Globals.pay.kgm.bank.payMode=10 #MOBILE -Globals.pay.kgm.mobile.mcSvcid=170622040674 -Globals.pay.kgm.mobile.payMode=00 +Globals.pay.kgm.mobile.mcSvcid=220613125202 +Globals.pay.kgm.mobile.payMode=10 diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp index 54f010d1..b704fd90 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp @@ -68,7 +68,37 @@ function goClose() { + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp index 7fc531a8..5015737b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp @@ -68,6 +68,37 @@ function goClose() { + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp index 5d270da8..cd5c0f39 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp @@ -68,6 +68,37 @@ function goClose() { + + + + + + + + + + + + + + + \ No newline at end of file From cee60942180b2ef821ea7f1c3d49c7b4a4d91c7e Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 11:27:25 +0900 Subject: [PATCH 03/29] =?UTF-8?q?=EC=B2=AB=EA=B2=B0=EC=A0=9C=20=EC=8A=A4?= =?UTF-8?q?=EB=AF=B8=EC=8B=B1=EC=9D=98=EC=8B=AC=20=EC=A7=80=EC=A0=95?= =?UTF-8?q?=EC=8B=9C=20=EC=96=BC=EB=9F=BF=20=ED=95=9C=EB=B2=88=EB=A7=8C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/pay/web/MjonPayV2Controller.java | 6 +-- .../umt/service/EgovUserManageService.java | 3 ++ .../impl/EgovUserManageServiceImpl.java | 51 ++++++++++--------- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index 469bfe11..83f04d9f 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -946,7 +946,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } else { // 대상 : 휴대폰결제, 즉시이체, 전용계좌 @@ -977,7 +977,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } } } @@ -1376,7 +1376,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } } } diff --git a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java index 2d5b1956..887475ff 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java @@ -185,6 +185,9 @@ public interface EgovUserManageService { // 스미싱의심 온/오프 - 상세에서 단일로 public void updateOneUserSmishingYn(UserManageVO userManageVO) throws Exception; + // 스미싱의심 온/오프 - 상세에서 단일로 => 슬랙, 문자 알림 No + public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception; + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception; diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 5f68842a..5cae0e38 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -539,32 +539,37 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement // 스미싱의심 온/오프 단일 public void updateOneUserSmishingYn(UserManageVO userManageVO) throws Exception { - // 업데이트 - userManageDAO.updateUserSmishingYn(userManageVO); - - // 법인폰 알림문자 발송 - UserManageVO rtnVO = new UserManageVO(); - rtnVO = selectSmishingYnUserInfo(userManageVO); - if (rtnVO.getSmishingYn().equals("Y")) { - // 법인폰 알람여부 체크 - JoinSettingVO joinSettingVO = new JoinSettingVO(); - joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); - // SMS 체크 - if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { - // 스미싱의심 SMS 알림전송 - mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱 의심!", rtnVO.getMberId(), rtnVO.getMberNm()); - } - - // SLACK 체크 - if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { - // Slack 메시지 발송(단순본문) - String msg = "[문자온] 스미싱 의심! - " + rtnVO.getMberNm() +"("+ rtnVO.getMberId() + ")"; - mjonCommon.sendSimpleSlackMsg(msg); - } - } + // 업데이트 + userManageDAO.updateUserSmishingYn(userManageVO); + // 법인폰 알림문자 발송 + UserManageVO rtnVO = new UserManageVO(); + rtnVO = selectSmishingYnUserInfo(userManageVO); + if (rtnVO.getSmishingYn().equals("Y")) { + // 법인폰 알람여부 체크 + JoinSettingVO joinSettingVO = new JoinSettingVO(); + joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); + // SMS 체크 + if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { + // 스미싱의심 SMS 알림전송 + mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱 의심!", rtnVO.getMberId(), rtnVO.getMberNm()); + } + + // SLACK 체크 + if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { + // Slack 메시지 발송(단순본문) + String msg = "[문자온] 스미싱 의심! - " + rtnVO.getMberNm() +"("+ rtnVO.getMberId() + ")"; + mjonCommon.sendSimpleSlackMsg(msg); + } + } } + // 스미싱의심 온/오프 단일 => 슬랙, 문자 알림 No + public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception { + // 업데이트 + userManageDAO.updateUserSmishingYn(userManageVO); + } + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { if(!"".equals(checkedIdForUpt)) { From 761a305ae78b5c1ca84d764b03c53757763eff67 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 26 Jun 2023 12:41:02 +0900 Subject: [PATCH 04/29] =?UTF-8?q?=EC=A0=84=EC=9A=A9=EA=B3=84=EC=A2=8C=20?= =?UTF-8?q?=EC=B2=AB=EA=B2=B0=EC=A0=9C=EC=8B=9C=20=EC=8A=A4=EB=AF=B8?= =?UTF-8?q?=EC=8B=B1=EC=95=8C=EB=A6=BC=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SchdlrManageServiceImpl.java | 66 +++++++++++++++++++ src/main/java/itn/web/ContentController.java | 30 +++++++++ 2 files changed, 96 insertions(+) diff --git a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java index daee55bd..38e233ea 100644 --- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java +++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java @@ -19,6 +19,7 @@ import itn.com.cmm.service.EgovFileMngService; import itn.com.cmm.service.impl.FileManageDAO; import itn.let.fax.user.service.impl.FaxDAO; import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService; +import itn.let.mjo.mjocommon.MjonCommon; import itn.let.mjo.msgdata.service.MjonMsgDataService; import itn.let.mjo.pay.service.MjonPayService; import itn.let.mjo.pay.service.StVcVO; @@ -26,6 +27,9 @@ import itn.let.mjo.payva.service.VacsAhstService; import itn.let.mjo.payva.service.VacsAhstVO; import itn.let.schdlr.service.SchdlrManageService; import itn.let.schdlr.service.SchdlrVO; +import itn.let.sym.site.service.EgovSiteManagerService; +import itn.let.uss.umt.service.EgovUserManageService; +import itn.let.utl.user.service.MjonNoticeSendUtil; @Service("SchdlrManageService") public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements SchdlrManageService { @@ -73,6 +77,21 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements @Resource(name = "mjonPayService") private MjonPayService mjonPayService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + /** 사이트 설정 */ + @Resource(name = "egovSiteManagerService") + EgovSiteManagerService egovSiteManagerService; + + /** 알림전송 Util */ + @Resource(name = "mjonNoticeSendUtil") + private MjonNoticeSendUtil mjonNoticeSendUtil; + + @Resource(name="MjonCommon") + private MjonCommon mjonCommon; + @Resource(name = "faxDAO") public FaxDAO faxDao; @@ -343,6 +362,53 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements //세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기 vacsAhstService.updateVacsAhstCashComplete(temp); + /* + try { + String Userid = temp.getMberId(); + String mberNm = ""; + + // 대상 : 휴대폰결제, 즉시이체, 전용계좌 + // Step 1. 스미싱의심 지정 여부 + JoinSettingVO joinSettingVO = new JoinSettingVO(); + joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); + if (joinSettingVO != null && joinSettingVO.getSmishingNoti().equals("Y")) { + // Step 1. 개인회원 여부 체크 + int isPersnalMemberCnt = egovSiteManagerService.selectPersnalMemberCnt(Userid); + if (isPersnalMemberCnt == 1) { + // Step 2. 첫결제 여부 체크 + int isFirstPayCnt = egovSiteManagerService.selectFirstPayCnt(Userid); + if (isFirstPayCnt == 1) { + // SMS 체크 + if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { + // 스미싱의심 SMS 알림전송 + mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱의심/전용계좌 첫결제", Userid, mberNm); + } + + // SLACK 체크 + if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { + // Slack 메시지 발송(단순본문) + String msg = "[문자온] 스미싱의심/전용계좌 첫결제 - " + mberNm +"("+ Userid + ")"; + mjonCommon.sendSimpleSlackMsg(msg); + } + + // 스미싱 의심회원으로 변경 + UserManageVO userManageVO = new UserManageVO(); + userManageVO.setSmishingYn("Y"); + userManageVO.setMberId(Userid); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); + } + } + } + + } + catch (Exception e) { + System.out.println("#############################################################"); + System.out.println("전용계좌 슬랙알림 & 스미싱의심 처리 Error"); + System.out.println("전용계좌 TrNo : " + temp.getTrNo()); + System.out.println("전용계좌 e.getMessage() : " + e.getMessage()); + } + */ + } } diff --git a/src/main/java/itn/web/ContentController.java b/src/main/java/itn/web/ContentController.java index c953f45f..e9de9b30 100644 --- a/src/main/java/itn/web/ContentController.java +++ b/src/main/java/itn/web/ContentController.java @@ -34,6 +34,7 @@ import itn.com.uss.olh.hpc.service.HackIpService; import itn.com.uss.olh.hpc.service.HackIpVO; import itn.let.lett.service.LetterVO; import itn.let.mjo.pay.service.MjonPayVO; +import itn.let.schdlr.service.SchdlrManageService; import itn.let.uss.ion.cnt.service.CntManageVO; import itn.let.uss.ion.cnt.service.EgovCntManageService; @@ -46,6 +47,9 @@ public class ContentController{ @Resource(name = "hackIpService") private HackIpService hackIpService; + @Resource(name = "SchdlrManageService") + private SchdlrManageService schdlrManageService; + /*인사말*/ @RequestMapping(value="/web/intro/intro.do") public String intro(@RequestParam Map commandMap, Model model) throws Exception { @@ -661,4 +665,30 @@ public class ContentController{ return modelAndView; } + // 전용계좌 스케줄러 실행 + @RequestMapping(value= {"/web/main/vacsAutoChargeAjax.do"}) + public ModelAndView vacsAutoCharge(HttpServletRequest request, + ModelMap model) throws Exception{ + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + + try { + + schdlrManageService.vacsAutoCharge(); + + } + catch(Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } } From 99568aae79bf3b7e298a9d84395db212dc5ad5f0 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 26 Jun 2023 15:35:11 +0900 Subject: [PATCH 05/29] =?UTF-8?q?2023/06/26=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4=EC=9E=90=20=EB=B6=84=EB=A5=98=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pb/css/content.css | 10 + src/main/webapp/pb/user_manage_list2_1.html | 334 ++++++++++++++++++++ 2 files changed, 344 insertions(+) create mode 100644 src/main/webapp/pb/user_manage_list2_1.html diff --git a/src/main/webapp/pb/css/content.css b/src/main/webapp/pb/css/content.css index a5458532..9a8c112d 100644 --- a/src/main/webapp/pb/css/content.css +++ b/src/main/webapp/pb/css/content.css @@ -278,6 +278,16 @@ input[type="button"].printBtn{border: 1px solid #686b72;background-image: url(/p .pageCont .tbType3 tbody tr th{background-color: #f3f6fa;color: #222;vertical-align: middle;letter-spacing: -1px;} .pageCont .tbType3 tbody tr td{color: #222;height: 45px;vertical-align: middle;} + +.pageCont .tbType4{text-align: center; width: 100%; table-layout: fixed; margin:0 0 50px 0;} +.pageCont .tbType4 thead tr th{border-top:2px solid #456ded; border-bottom:3px double #e6e6e6; padding: 13px 0; font-size: 1em; font-weight: 500;color: #555; white-space: nowrap; border-left:1px solid #d5d5d5; text-align:center;} +.pageCont .tbType4 thead tr th:first-child {border-left:none;} +.pageCont .tbType4{border-top: 2px solid #456ded;width: 100%;table-layout: fixed;text-align: left;} +.pageCont .tbType4 tbody tr{border-bottom: 2px solid #e5e5e5;} +.pageCont .tbType4 tbody tr td{vertical-align: middle;font-size: 1em;font-weight: 400;color: #555;padding: 12px 0; border-left:1px solid #d5d5d5; text-align:center;} +.pageCont .tbType4 tbody tr td:first-child {border-left:none;} + + .ipStatus .contBox{margin-right: 30px;margin-bottom: 50px;flex-grow: 2 1;width: auto;float: left;} .ipStatus .contBox:nth-child(1){width: 65%;} .ipStatus .contBox:nth-child(2){width: 30%;} diff --git a/src/main/webapp/pb/user_manage_list2_1.html b/src/main/webapp/pb/user_manage_list2_1.html new file mode 100644 index 00000000..94e0a6b6 --- /dev/null +++ b/src/main/webapp/pb/user_manage_list2_1.html @@ -0,0 +1,334 @@ + + + + + + + + 회원관리 >회원 정보(리스트) + + + + + + + + + + +
+

아이티앤 로고이미지

+
+
    +
  • +
  • +
  • +
  • +
+
+
    +
  • 타임아웃 아이콘 +

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

    +
  • +
  • 타임 아이콘 +

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

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

사용자관리

+
+
+
+
+
~ +
+


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

182

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디사용자명회원구분전화번호법인폰문자할인이벤트상태후보자상세가입일자최근로그인
182 + + 이의승개인 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 06/29] =?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 07/29] =?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 08/29] =?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 09/29] =?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 10/29] =?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 11/29] =?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 12/29] =?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 13/29] =?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 14/29] =?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 15/29] =?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 16/29] =?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){