diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java index 4189ec2f..7ddaa800 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java @@ -758,6 +758,7 @@ public class MjonKakaoATController { String profileId = resultChannelList.get(i).getProfileId(); String deleteYn = resultChannelList.get(i).getDeleteYn(); String userId = resultChannelList.get(i).getUserId(); + String lastUpdtPnttm = resultChannelList.get(i).getLastUpdtPnttm(); kakaoProfileVO.setSenderKey(senderKey); kakaoProfileVO.setProfileId(profileId); @@ -774,6 +775,7 @@ public class MjonKakaoATController { returnChannelVO.setModifiedAt(tmpProfileVO.getModifiedAt()); returnChannelVO.setDeleteYn(deleteYn); returnChannelVO.setUserId(userId); + returnChannelVO.setLastUpdtPnttm(lastUpdtPnttm); resultApiProfileList.add(returnChannelVO); diff --git a/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java b/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java index e6d971ed..2522d29e 100644 --- a/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java +++ b/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java @@ -77,10 +77,8 @@ public class MjonEventPayV2Controller { } // 하드코딩 - if(!userId.equals("nobledeco")) { - if(!userId.equals("nopay")) { - return "redirect:/web/main/mainPage.do"; - } + if(!userId.equals("nobledeco") && !userId.equals("nobledeco2") && !userId.equals("nopay")) { + return "redirect:/web/main/mainPage.do"; } //기존 결제 내역이 있는 회원인지 확인 diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index fe7bc442..ecb5205b 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1841,6 +1841,7 @@ public class MjonPayController { "/web/member/pay/PayListCardAjax.do", "/web/member/pay/PayListVBankAjax.do", "/web/member/pay/PayListBankAjax.do", + "/web/member/pay/PayListSPayAjax.do", "/web/member/pay/PayListOfflineAjax.do", "/web/member/pay/PayListRefundAjax.do" }) @@ -1894,6 +1895,7 @@ public class MjonPayController { || pattern.equals("/web/member/pay/PayListCardAjax.do") || pattern.equals("/web/member/pay/PayListVBankAjax.do") || pattern.equals("/web/member/pay/PayListBankAjax.do") + || pattern.equals("/web/member/pay/PayListSPayAjax.do") || pattern.equals("/web/member/pay/PayListOfflineAjax.do") || pattern.equals("/web/member/pay/PayListRefundAjax.do") ) { //전체 , 모바일, 신용카드 @@ -2024,6 +2026,11 @@ public class MjonPayController { mjonPayVO.setPayMethod("BANK"); mjonPayVO.setPageType("bank"); } + if(pattern.equals("/web/member/pay/PayListSPayAjax.do")) { //즉시이체 + mjonPayVO.setSearchCondition2("SPAY"); + mjonPayVO.setPayMethod("SPAY"); + mjonPayVO.setPageType("SPAY"); + } if(pattern.equals("/web/member/pay/PayListOfflineAjax.do")) { //무통장 mjonPayVO.setSearchCondition2("OFFLINE"); mjonPayVO.setPayMethod("OFFLINE"); 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/mjo/pay/web/RefundController.java b/src/main/java/itn/let/mjo/pay/web/RefundController.java index 91603163..610e579f 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,86 @@ public class RefundController { return ResponseEntity.ok().body(refundService.insertPayCanAjax(userInfoAdd(refundVO))); } + + @RequestMapping(value = {"/uss/ion/msg/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/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/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java new file mode 100644 index 00000000..301a3ee1 --- /dev/null +++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java @@ -0,0 +1,9 @@ +package itn.let.sym.grd.service; + +import java.util.List; + +public interface MberGrdService { + + List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception ; + +} diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java new file mode 100644 index 00000000..1ba1ac62 --- /dev/null +++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java @@ -0,0 +1,151 @@ +package itn.let.sym.grd.service; + +import java.util.List; + +public class MberGrdVO { + + private int grdSetNo; // 등급설정번호 + private String grdSetNm; // 등급설정명 + private long totAmt; // 누적결제액 + private String totAmtComma; // 누적결제액(콤마) + private float shortPrice; // 단문 단가 + private float longPrice; //장문 단가 + private float picturePrice; // 그림 단가 + private float picture2Price; // 그림 2장단가 + private float picture3Price; // 그림 3장단가 + private String regId; // 최초등록자 아이디 + private String regDate; // 최초등록 일자 + private String editId; // 수정등록자 아이디 + private String editDate; // 수정등록 일자 + + private List grdSetNos; + private List totAmts; + private List shortPrices; + private List longPrices; + private List picturePrices; + private List picture2Prices; + private List picture3Prices; + + public int getGrdSetNo() { + return grdSetNo; + } + public void setGrdSetNo(int grdSetNo) { + this.grdSetNo = grdSetNo; + } + public String getGrdSetNm() { + return grdSetNm; + } + public void setGrdSetNm(String grdSetNm) { + this.grdSetNm = grdSetNm; + } + public long getTotAmt() { + return totAmt; + } + public void setTotAmt(long totAmt) { + this.totAmt = totAmt; + } + public String getTotAmtComma() { + return totAmtComma; + } + public void setTotAmtComma(String totAmtComma) { + this.totAmtComma = totAmtComma; + } + public float getShortPrice() { + return shortPrice; + } + public void setShortPrice(float shortPrice) { + this.shortPrice = shortPrice; + } + public float getLongPrice() { + return longPrice; + } + public void setLongPrice(float longPrice) { + this.longPrice = longPrice; + } + public float getPicturePrice() { + return picturePrice; + } + public void setPicturePrice(float picturePrice) { + this.picturePrice = picturePrice; + } + public float getPicture2Price() { + return picture2Price; + } + public void setPicture2Price(float picture2Price) { + this.picture2Price = picture2Price; + } + public float getPicture3Price() { + return picture3Price; + } + public void setPicture3Price(float picture3Price) { + this.picture3Price = picture3Price; + } + public String getRegId() { + return regId; + } + public void setRegId(String regId) { + this.regId = regId; + } + public String getRegDate() { + return regDate; + } + public void setRegDate(String regDate) { + this.regDate = regDate; + } + public String getEditId() { + return editId; + } + public void setEditId(String editId) { + this.editId = editId; + } + public String getEditDate() { + return editDate; + } + public void setEditDate(String editDate) { + this.editDate = editDate; + } + + public List getGrdSetNos() { + return grdSetNos; + } + public void setGrdSetNos(List grdSetNos) { + this.grdSetNos = grdSetNos; + } + public List getTotAmts() { + return totAmts; + } + public void setTotAmts(List totAmts) { + this.totAmts = totAmts; + } + public List getShortPrices() { + return shortPrices; + } + public void setShortPrices(List shortPrices) { + this.shortPrices = shortPrices; + } + public List getLongPrices() { + return longPrices; + } + public void setLongPrices(List longPrices) { + this.longPrices = longPrices; + } + public List getPicturePrices() { + return picturePrices; + } + public void setPicturePrices(List picturePrices) { + this.picturePrices = picturePrices; + } + public List getPicture2Prices() { + return picture2Prices; + } + public void setPicture2Prices(List picture2Prices) { + this.picture2Prices = picture2Prices; + } + public List getPicture3Prices() { + return picture3Prices; + } + public void setPicture3Prices(List picture3Prices) { + this.picture3Prices = picture3Prices; + } + +} diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java new file mode 100644 index 00000000..ebb2176f --- /dev/null +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java @@ -0,0 +1,18 @@ +package itn.let.sym.grd.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import itn.let.sym.grd.service.MberGrdVO; + +@Repository("mberGrdDAO") +public class MberGrdDAO extends EgovAbstractDAO { + + @SuppressWarnings("unchecked") + public List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception{ + return (List)list("mberGrdDAO.selectMberGrdSettingList", mberGrdVO); + } + +} diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java new file mode 100644 index 00000000..0711561b --- /dev/null +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -0,0 +1,24 @@ +package itn.let.sym.grd.service.impl; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import itn.let.sym.grd.service.MberGrdService; +import itn.let.sym.grd.service.MberGrdVO; + +@Service("mberGrdService") +public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberGrdService { + + @Resource(name="mberGrdDAO") + MberGrdDAO mberGrdDAO; + + @Override + public List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdSettingList(mberGrdVO); + } + +} diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java new file mode 100644 index 00000000..d0614d7d --- /dev/null +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -0,0 +1,73 @@ +package itn.let.sym.grd.web; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import itn.com.cmm.LoginVO; +import itn.let.sym.grd.service.MberGrdService; +import itn.let.sym.grd.service.MberGrdVO; + +@Controller +public class MberGrdController { + + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + + /** + * 등급제 관리 화면 + * + * @param mberGrdVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/sym/grd/selectMberGrdSetting.do") + public String selectJoinSetting(MberGrdVO mberGrdVO, ModelMap model) throws Exception { + + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + + return "/sym/grd/mberGrdSetting"; + } + + // 등급제 일괄 저장 + @RequestMapping(value = "/sym/grd/mberGrdSettingMassUpdateAjax.do") + public ModelAndView mberGrdSettingMassUpdateAjax( + @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + + // 로그인VO에서 사용자 정보 가져오기 + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + String frstRegisterId = loginVO == null ? "" : loginVO.getId(); + mberGrdVO.setRegId(frstRegisterId); // 최초등록자ID + + try{ + // 등급제 업데이트 + //mberGrdService.updateHashTagList(mberGrdVO); + } + catch(Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + +} diff --git a/src/main/java/itn/let/sym/log/clg/service/EgovLoginLogAspect.java b/src/main/java/itn/let/sym/log/clg/service/EgovLoginLogAspect.java index a465503f..88fb9481 100644 --- a/src/main/java/itn/let/sym/log/clg/service/EgovLoginLogAspect.java +++ b/src/main/java/itn/let/sym/log/clg/service/EgovLoginLogAspect.java @@ -3,6 +3,8 @@ package itn.let.sym.log.clg.service; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import itn.com.cmm.LoginVO; +import java.net.InetAddress; + import javax.annotation.Resource; /** 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/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/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)) { 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; + } } 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/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-sym-grd.xml b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-sym-grd.xml new file mode 100644 index 00000000..7398d841 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-sym-grd.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml new file mode 100644 index 00000000..4ee7628e --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -0,0 +1,28 @@ + + + + + + + + + + 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..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,6 +89,7 @@ function fn_search2(){
+ @@ -132,6 +136,39 @@ function fn_search2(){ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분${item.deleteTypeName}계
인원${item.deleteTypeCnt}
+
+

총 건

@@ -192,7 +229,7 @@ function fn_search2(){ - 기업회원으로 다시 가입 + 기업회원 전환 사용할 일이 없어서 @@ -210,7 +247,7 @@ function fn_search2(){ 다른 사이트이용 - 해지사유 직접 입력 + 기타(직접 입력) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstTaxList.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstTaxList.jsp index ff27d997..9256516f 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstTaxList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstTaxList.jsp @@ -112,7 +112,8 @@ function setMberCmpHstStatusSave(p_index) { function biznoPop() { var p_bizno = $('#bizNo').val(); - window.open('https://www.bizno.net/article/'+p_bizno); + //window.open('https://www.bizno.net/article/'+p_bizno); + window.open('https://moneypin.biz/bizno/detail/'+p_bizno); } // 기업회원 상세정보 @@ -279,7 +280,7 @@ $(function(){ <%-- --%> - + <%-- --%> 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"%> diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp new file mode 100644 index 00000000..fb3aa124 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp @@ -0,0 +1,106 @@ +<%@ 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="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"%> + + + + + 등급제 관리 + + + +
+
+
+

등급제 관리

+

등급제 관리 페이지 입니다.

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
등급누적결제액단문장문그림(1장)그림(2장)그림(3장)
" style="height: 20px; width: 150px; padding: 5px 5px 5px 5px;" />" style="height: 20px; width: 100px; padding: 5px 5px 5px 5px;" />" style="height: 20px; width: 100px; padding: 5px 5px 5px 5px;" />" style="height: 20px; width: 100px; padding: 5px 5px 5px 5px;" />" style="height: 20px; width: 100px; padding: 5px 5px 5px 5px;" />" style="height: 20px; width: 100px; padding: 5px 5px 5px 5px;" />
+
+ +
+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/KakaoATChannelIDList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/KakaoATChannelIDList.jsp index 181e6980..0e8e298e 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/KakaoATChannelIDList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/KakaoATChannelIDList.jsp @@ -190,31 +190,28 @@ function fnSelectMber(mberId) { - - - - + + + + + - - 번호 회원ID 채널ID 채널명 등록상태 - 등록일 + 채널생성일 + 채널등록일 삭제여부 - <%-- - - --%> @@ -257,6 +254,10 @@ function fnSelectMber(mberId) { + + + + @@ -310,12 +311,19 @@ function fnSelectMber(mberId) {
-
등록일
+
채널생성일
+
+
채널등록일
+
+ + +
+
삭제여부
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATDetailList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATDetailList.jsp index edae69cb..17a3a704 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATDetailList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATDetailList.jsp @@ -141,6 +141,7 @@ function fnSelectMber(mberId) {
+ diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp index 5260a70e..b9f52fc0 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp @@ -326,8 +326,8 @@ function fnSmishingUpdate(flag, id) { - + @@ -350,7 +350,7 @@ function fnSmishingUpdate(flag, id) { 수단 결제폰번호 결제상태 - 결제메세지 + 결제메세지 영수증 스미싱 결제시간 @@ -432,8 +432,22 @@ function fnSmishingUpdate(flag, id) { - <%-- () --%> + + 간편 + + + () + + + <%-- 9991, 9993, I002 결과코드는 사용자가 결제 중간에 취소하여 오류가 발생한 케이스임. --%> + (결제취소) + + + + + + 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..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 @@ -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) {
+ + +
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..256a1474 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/RefundRegist.jsp @@ -0,0 +1,555 @@ +<%-- + 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"%> + + + +환불 등록 + + + + + + + + + + + + + + + + + + + + + +
+
+
+

환불 등록

+

환불등록 페이지 입니다.

+
+
+

환불 금액 입력

+ + + + + + + + + + + + + + + + + + + + + + + +
+ 회원 아이디 + + + +
회원 이름 +
환불 가능 금액 +
환불 신청 금액 + + + 전액환불 +
+ +

+

환불 사유 및 연락처

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

+ + + + + + + + + + + + + + +
통장사본 +
+ + + +
+
증빙서류 +
+ + + +
+
+ +
+ + +
+ +
+
+ + + +
+
+
+
+ + 회원 아이디 검색 +
+
+ 검색할 아이디 +
+
+ 아이디를 검색하세요 +
+
+
+ + + 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 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..f9215e8d 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 @@ -192,13 +192,15 @@ function pgOpenerPopup(){ var payMethod = ""; document.pgForm.action = "/web/member/pay/PayActionAjax.do"; - if($currentTab==0){ payMethod = "CARD";} - else if($currentTab==1){ payMethod = "VBANK"; } - /*else if($currentTab==2){ payMethod = "TEMP_CARD"; }*/ - /* else if($currentTab==2){ payMethod = "CELLPHONE"; - document.pgForm.action = "/web/kgm/pay/KGMPayActionAjax.do"; - } */ //휴대폰 결제 방식 안보이도록 수정 20221117 - else if($currentTab==2){ payMethod = "BANK"; } + if ($currentTab == 0) { + payMethod = "SPAY"; + } else if ($currentTab==1) { + payMethod = "CARD"; + } else if($currentTab==2){ + payMethod = "VBANK"; + } else if($currentTab==3){ + payMethod = "BANK"; + } $('input[name=payMethod]').val(payMethod); //결제수단 상태 체크 @@ -224,28 +226,29 @@ function pgOpenerPopup(){ // 결제창 호출 if ($currentTab==0) { - // KG 모빌리언스 => CARD(신용카드) + // KG 모빌리언스 => SPAY(간편결제) kgmPayCardRequest(); } - else if ($currentTab==2) { - // KG 모빌리언스 => BANK(즉시이체) - kgmPayBankRequest(); - } - else { - // 기타 + else if ($currentTab==1) { + // 나이스페이 => CARD(카드결제) pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no"); document.pgForm.method = "post"; document.pgForm.target = "pg_opener" ; document.pgForm.submit(); - } + } + else if ($currentTab==2) { + // 전용계좌 + } + else if ($currentTab==3) { + // KG 모빌리언스 => BANK(즉시이체) + kgmPayBankRequest(); + } } //KG 모빌리언스 => CARD function kgmPayCardRequest() { - $("#price").val(110); - $.ajax({ type: "POST", url: "/web/member/pay/kgmCardEncodeAjax.do", @@ -301,8 +304,6 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(110); - $.ajax({ type: "POST", url: "/web/member/pay/kgmMobileEncodeAjax.do", @@ -369,8 +370,6 @@ function kgmPayMobileRequest() { //KG 모빌리언스 => BANK function kgmPayBankRequest() { - $("#price").val(1100); - $.ajax({ type: "POST", url: "/web/member/pay/kgmBankEncodeAjax.do", @@ -810,17 +809,75 @@ function TabTypePay(obj, tabId) {

충전수단 선택

    -
    • +
    • +
    • - -
+ +
+

간편결제

+ + + + + + + + + + + + + + + + + + +
충전금액 + +

원

+ +
+
+
+
최종 결제금액 :
+
+
    +
  • 원(공급가액)
    • +
  • 원(부가세)
    • +
  • 원(최종금액)
    • +
+
+
+ +
+
+
+ <%--

- 신용카드 결제가 어려우신 고객께서는 문자온 고객센터(010-8432-9333)를 통해서도 ARS 신용카드 결제를 하실 수 있습니다.

--%> +

- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.

+

- 카드사별 정책상 충전금액 제한이 있을 수 있습니다. 단, ARS 신용카드 결제는 충전금액 제한 없이 이용하실 수 있습니다.

+
+
+
+ + -
+

신용카드

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

    diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp index fe6b3f1a..0ad55334 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp @@ -186,9 +186,9 @@ function fnShowRefundPrintPopup(){
      • +
      • -
      • diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp index 16ab51d7..da109637 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp @@ -514,7 +514,7 @@ $(document).on("click", "#chkAll", function(e) {

      간이영수증 발행완료

       - + 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..bae6c524 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -117,14 +117,18 @@ function pgOpenerPopup(){ var payMethod = ""; document.pgForm.action = "/web/member/pay/PayActionAjax.do"; - - if($currentTab==0){ payMethod = "CARD";} - else if($currentTab==1){ payMethod = "VBANK"; } - /*else if($currentTab==2){ payMethod = "TEMP_CARD"; }*/ - else if($currentTab==2){ payMethod = "CELLPHONE"; - document.pgForm.action = "/web/kgm/pay/KGMPayActionAjax.do"; + + if ($currentTab == 0) { + payMethod = "SPAY"; + } else if ($currentTab == 1) { + payMethod = "CARD"; + } else if ($currentTab == 2) { + payMethod = "VBANK"; + } else if ($currentTab==3) { + payMethod = "CELLPHONE"; + } else if ($currentTab==4) { + payMethod = "BANK"; } - else if($currentTab==3){ payMethod = "BANK"; } $('input[name=payMethod]').val(payMethod); //결제수단 상태 체크 @@ -149,33 +153,29 @@ function pgOpenerPopup(){ var popupY = scY + (docHeight - 195) / 2; // 결제창 호출 - if ($currentTab==0) { - // KG 모빌리언스 => CARD(신용카드) + if ($currentTab == 0) { + // KG 모빌리언스 => SPAY(간편결제) kgmPayCardRequest(); - } - else if ($currentTab==2) { + } else if ($currentTab == 1) { + // 나이스페이 => CARD(카드결제) + pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no"); + + document.pgForm.method = "post"; + document.pgForm.target = "pg_opener" ; + document.pgForm.submit(); + } else if ($currentTab == 2) { + // 전용계좌 + } else if ($currentTab == 3) { // KG 모빌리언스 => MOBILE(휴대폰결제) kgmPayMobileRequest(); - } - else if ($currentTab==3) { + } else if ($currentTab==4) { // KG 모빌리언스 => BANK(즉시이체) kgmPayBankRequest(); } - else { - // 기타 - pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no"); - - document.pgForm.method = "post"; - document.pgForm.target = "pg_opener" ; - document.pgForm.submit(); - } - } //KG 모빌리언스 => CARD function kgmPayCardRequest() { - $("#price").val(110); - $.ajax({ type: "POST", url: "/web/member/pay/kgmCardEncodeAjax.do", @@ -231,8 +231,6 @@ function kgmPayCardRequest() { //KG 모빌리언스 => MOBILE function kgmPayMobileRequest() { - $("#price").val(110); - $.ajax({ type: "POST", url: "/web/member/pay/kgmMobileEncodeAjax.do", @@ -299,8 +297,6 @@ function kgmPayMobileRequest() { //KG 모빌리언스 => BANK function kgmPayBankRequest() { - $("#price").val(1100); - $.ajax({ type: "POST", url: "/web/member/pay/kgmBankEncodeAjax.do", @@ -643,7 +639,8 @@ function TabTypePay(obj, tabId) {

      충전수단 선택

        -
        • +
        • +
        • @@ -652,8 +649,82 @@ function TabTypePay(obj, tabId) {
        + +
        +

        간편결제

        +
+ + + + + + + + + + + + + + + + + +
충전금액 + + <%-- +

원

+ + + + + --%> +

원

+ +
+
+
+
최종 결제금액 :
+
+
    +
  • 원(공급가액)
    • +
  • 원(부가세)
    • +
  • 원(최종금액)
    • +
+
+
+ +
+
+
+ <%--

- 신용카드 결제가 어려우신 고객께서는 문자온 고객센터(010-8432-9333)를 통해서도 ARS 신용카드 결제를 하실 수 있습니다.

--%> +

- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.

+

- 카드사별 정책상 충전금액 제한이 있을 수 있습니다. 단, ARS 신용카드 결제는 충전금액 제한 없이 이용하실 수 있습니다.

+
+
+
+ + -
+

신용카드

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 +
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