From 404bf310b7437dd4c2f05aa5a21e827a8c160e6d Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 22 Aug 2025 12:09:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B9=9C=EA=B5=AC=ED=86=A1=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=95=AD=EB=AA=A9=EB=93=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgagent/service/MjonMsgAgentStsVO.java | 224 +----------------- .../let/sym/site/service/JoinSettingVO.java | 190 +-------------- .../uss/umt/web/EgovUserManageController.java | 41 ++++ .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 26 +- .../let/sym/site/EgovSiteManage_SQL_Mysql.xml | 6 + .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 59 +++-- .../WEB-INF/jsp/sym/site/baseUnitPrice.jsp | 12 + .../uss/ion/kakaoat/ReserveKakaoATList.jsp | 4 +- .../jsp/uss/ion/kakaoat/SendKakaoATList.jsp | 4 +- .../sendresult/KakaoSendResultList.jsp | 4 +- 10 files changed, 135 insertions(+), 435 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java b/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java index e3735db..b431166 100644 --- a/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java +++ b/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java @@ -3,12 +3,15 @@ */ package itn.let.mjo.msgagent.service; -import java.util.List; +import lombok.Getter; +import lombok.Setter; /** * @author woo * */ +@Getter +@Setter public class MjonMsgAgentStsVO { private String agentCode; //전송사 구분 코드 (01: 아이하트 , 02:현대 퓨처넷 , 03: 아이엠오) @@ -40,225 +43,8 @@ public class MjonMsgAgentStsVO { private double kakaoAtCost; private double kakaoFtCost; private double kakaoFt2Cost; - private double kakaoft3Cost; + private double kakaoFt3Cost; private double faxCost; - public String getBlineYn() { - return blineYn; - } - public void setBlineYn(String blineYn) { - this.blineYn = blineYn; - } - public double getMinPrice() { - return minPrice; - } - public void setMinPrice(double minPrice) { - this.minPrice = minPrice; - } - public double getMaxPrice() { - return maxPrice; - } - public void setMaxPrice(double maxPrice) { - this.maxPrice = maxPrice; - } - - public String getUserId() { - return userId; - } - public void setUserId(String userId) { - this.userId = userId; - } - public String getAgentCode() { - return agentCode; - } - public void setAgentCode(String agentCode) { - this.agentCode = agentCode; - } - public String getSendRate() { - return sendRate; - } - public void setSendRate(String sendRate) { - this.sendRate = sendRate; - } - public String getUseYn() { - return useYn; - } - public void setUseYn(String useYn) { - this.useYn = useYn; - } - public String getRegisterId() { - return RegisterId; - } - public void setRegisterId(String registerId) { - RegisterId = registerId; - } - public String getRegistPnttm() { - return RegistPnttm; - } - public void setRegistPnttm(String registPnttm) { - RegistPnttm = registPnttm; - } - public String getLastUpdtPnttm() { - return lastUpdtPnttm; - } - public void setLastUpdtPnttm(String lastUpdtPnttm) { - this.lastUpdtPnttm = lastUpdtPnttm; - } - public String getLastUpdusrId() { - return lastUpdusrId; - } - public void setLastUpdusrId(String lastUpdusrId) { - this.lastUpdusrId = lastUpdusrId; - } - public String getMsgType() { - return msgType; - } - public void setMsgType(String msgType) { - this.msgType = msgType; - } - public String getRepAgent() { - return repAgent; - } - public void setRepAgent(String repAgent) { - this.repAgent = repAgent; - } - public String getAgentPrice() { - return agentPrice; - } - public void setAgentPrice(String agentPrice) { - this.agentPrice = agentPrice; - } - public String getAgentCodeNm() { - return agentCodeNm; - } - public void setAgentCodeNm(String agentCodeNm) { - this.agentCodeNm = agentCodeNm; - } - public String getAgetnCodeDc() { - return agetnCodeDc; - } - public void setAgetnCodeDc(String agetnCodeDc) { - this.agetnCodeDc = agetnCodeDc; - } - - public String getSearchUseYn() { - return searchUseYn; - } - public void setSearchUseYn(String searchUseYn) { - this.searchUseYn = searchUseYn; - } - - - public String getSelectAgentCode() { - return selectAgentCode; - } - public void setSelectAgentCode(String selectAgentCode) { - this.selectAgentCode = selectAgentCode; - } - - // 일괄 수정 VO - private List repAgents; - - public List getRepAgents() { - return repAgents; - } - public void setRepAgents(List repAgents) { - this.repAgents = repAgents; - } - - private List msgTypes; - public List getMsgTypes() { - return msgTypes; - } - public void setMsgTypes(List msgTypes) { - this.msgTypes = msgTypes; - } - - private List useYns; - public List getUseYns() { - return useYns; - } - public void setUseYns(List useYns) { - this.useYns = useYns; - } - - private List sendRates; - public List getSendRates() { - return sendRates; - } - public void setSendRates(List sendRates) { - this.sendRates = sendRates; - } - - private List agentPrices; - public List getAgentPrices() { - return agentPrices; - } - public void setAgentPrices(List agentPrices) { - this.agentPrices = agentPrices; - } - - private List agentCodes; - public List getAgentCodes() { - return agentCodes; - } - public void setAgentCodes(List agentCodes) { - this.agentCodes = agentCodes; - } - public String getCostId() { - return costId; - } - public void setCostId(String costId) { - this.costId = costId; - } - public double getShortCost() { - return shortCost; - } - public void setShortCost(double shortCost) { - this.shortCost = shortCost; - } - public double getLongCost() { - return longCost; - } - public void setLongCost(double longCost) { - this.longCost = longCost; - } - public double getPictureCost() { - return pictureCost; - } - public void setPictureCost(double pictureCost) { - this.pictureCost = pictureCost; - } - public double getKakaoAtCost() { - return kakaoAtCost; - } - public void setKakaoAtCost(double kakaoAtCost) { - this.kakaoAtCost = kakaoAtCost; - } - public double getKakaoFtCost() { - return kakaoFtCost; - } - public void setKakaoFtCost(double kakaoFtCost) { - this.kakaoFtCost = kakaoFtCost; - } - public double getKakaoFt2Cost() { - return kakaoFt2Cost; - } - public void setKakaoFt2Cost(double kakaoFt2Cost) { - this.kakaoFt2Cost = kakaoFt2Cost; - } - public double getKakaoft3Cost() { - return kakaoft3Cost; - } - public void setKakaoft3Cost(double kakaoft3Cost) { - this.kakaoft3Cost = kakaoft3Cost; - } - public double getFaxCost() { - return faxCost; - } - public void setFaxCost(double faxCost) { - this.faxCost = faxCost; - } - } diff --git a/src/main/java/itn/let/sym/site/service/JoinSettingVO.java b/src/main/java/itn/let/sym/site/service/JoinSettingVO.java index a76eca5..ea9a413 100644 --- a/src/main/java/itn/let/sym/site/service/JoinSettingVO.java +++ b/src/main/java/itn/let/sym/site/service/JoinSettingVO.java @@ -1,5 +1,8 @@ package itn.let.sym.site.service; +import lombok.Getter; +import lombok.Setter; + /** * 로그인정책에 대한 VO 클래스를 정의한다. * 로그인정책정보의 목록 항목을 관리한다. @@ -18,6 +21,8 @@ package itn.let.sym.site.service; * * */ +@Getter +@Setter public class JoinSettingVO { /** @@ -37,6 +42,8 @@ public class JoinSettingVO { private float customTextPrice; // 텍스트 단순수정 private float kakaoAtPrice; // 카카오 알림톡 단가 private float kakaoFtPrice; // 카카오 친구톡 단가 + private float kakaoFtImgPrice; // 카카오 친구톡 이미지 단가 + private float kakaoFtWideImgPrice; // 카카오 친구톡 와이드 이미지 단가 private float faxPrice; // 팩스 단가 private float refundPer; //환불 비율 @@ -51,188 +58,5 @@ public class JoinSettingVO { private String smishingNoti; //첫결제(카드제외) 스미싱의심 알림 여부 private String holiSmishingNoti; //야간 스미싱알림 여부 - public String getSmishingNoti() { - return smishingNoti; - } - - public void setSmishingNoti(String smishingNoti) { - this.smishingNoti = smishingNoti; - } - - 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 float getCustomSamplePrice() { - return customSamplePrice; - } - - public void setCustomSamplePrice(float customSamplePrice) { - this.customSamplePrice = customSamplePrice; - } - - public float getCustomEditPrice() { - return customEditPrice; - } - - public void setCustomEditPrice(float customEditPrice) { - this.customEditPrice = customEditPrice; - } - - public float getCustomEdit3Price() { - return customEdit3Price; - } - - public void setCustomEdit3Price(float customEdit3Price) { - this.customEdit3Price = customEdit3Price; - } - - public float getCustomTextPrice() { - return customTextPrice; - } - - public void setCustomTextPrice(float customTextPrice) { - this.customTextPrice = customTextPrice; - } - - public float getRefundPer() { - return refundPer; - } - - public void setRefundPer(float refundPer) { - this.refundPer = refundPer; - } - - public float getJoinCash() { - return joinCash; - } - - public void setJoinCash(float joinCash) { - this.joinCash = joinCash; - } - - public float getPointPer() { - return pointPer; - } - - public void setPointPer(float pointPer) { - this.pointPer = pointPer; - } - - public String getLasUpdusrId() { - return lasUpdusrId; - } - - public void setLasUpdusrId(String lasUpdusrId) { - this.lasUpdusrId = lasUpdusrId; - } - - public String getLastUpdtPnttm() { - return lastUpdtPnttm; - } - - public void setLastUpdtPnttm(String lastUpdtPnttm) { - this.lastUpdtPnttm = lastUpdtPnttm; - } - - public String getJoinCertType() { - return joinCertType; - } - - public void setJoinCertType(String joinCertType) { - this.joinCertType = joinCertType; - } - - public String getSmsNoti() { - return smsNoti; - } - - public void setSmsNoti(String smsNoti) { - this.smsNoti = smsNoti; - } - - public String getEmailNoti() { - return emailNoti; - } - - public void setEmailNoti(String emailNoti) { - this.emailNoti = emailNoti; - } - - public String getSlackNoti() { - return slackNoti; - } - - public void setSlackNoti(String slackNoti) { - this.slackNoti = slackNoti; - } - - public float getKakaoAtPrice() { - return kakaoAtPrice; - } - - public void setKakaoAtPrice(float kakaoAtPrice) { - this.kakaoAtPrice = kakaoAtPrice; - } - - public float getKakaoFtPrice() { - return kakaoFtPrice; - } - - public void setKakaoFtPrice(float kakaoFtPrice) { - this.kakaoFtPrice = kakaoFtPrice; - } - - public float getFaxPrice() { - return faxPrice; - } - - public void setFaxPrice(float faxPrice) { - this.faxPrice = faxPrice; - } - - public String getHoliSmishingNoti() { - return holiSmishingNoti; - } - - public void setHoliSmishingNoti(String holiSmishingNoti) { - this.holiSmishingNoti = holiSmishingNoti; - } } 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 aafce44..d3e44d0 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1050,6 +1050,8 @@ public class EgovUserManageController { model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price()); model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice()); model.addAttribute("sysKakaoFtPrice", sysJoinSetVO.getKakaoFtPrice()); + model.addAttribute("sysKakaoFtImgPrice", sysJoinSetVO.getKakaoFtImgPrice()); + model.addAttribute("sysKakaoFtWideImgPrice", sysJoinSetVO.getKakaoFtWideImgPrice()); // 등급제 단가 추출 => 시스템 단가에 적용 @@ -1062,6 +1064,8 @@ public class EgovUserManageController { Float picture3Price = mberManageVO.getPicture3Price(); Float kakaoAtPrice = mberManageVO.getKakaoAtPrice(); Float kakaoFtPrice = mberManageVO.getKakaoFtPrice(); + Float kakaoFtImgPrice = mberManageVO.getKakaoFtImgPrice(); + Float kakaoFtWideImgPrice = mberManageVO.getKakaoFtWideImgPrice(); Float faxPrice = mberManageVO.getFaxPrice(); System.out.println("mberManageVO.getFaxPrice() : " + mberManageVO.getFaxPrice()); @@ -1082,6 +1086,14 @@ public class EgovUserManageController { kakaoFtPrice = sysJoinSetVO.getKakaoFtPrice(); } + if(kakaoFtImgPrice < 1) { + kakaoFtImgPrice = sysJoinSetVO.getKakaoFtImgPrice(); + } + + if(kakaoFtWideImgPrice < 1) { + kakaoFtWideImgPrice = sysJoinSetVO.getKakaoFtWideImgPrice(); + } + if(faxPrice < 1) { faxPrice = sysJoinSetVO.getFaxPrice(); } @@ -1093,6 +1105,8 @@ public class EgovUserManageController { model.addAttribute("picture3Price", picture3Price); model.addAttribute("kakaoAtPrice", kakaoAtPrice); model.addAttribute("kakaoFtPrice", kakaoFtPrice); + model.addAttribute("kakaoFtImgPrice", kakaoFtImgPrice); + model.addAttribute("kakaoFtWideImgPrice", kakaoFtWideImgPrice); model.addAttribute("faxPrice", faxPrice); model.addAttribute("sysJoinSetVO", sysJoinSetVO); @@ -1278,6 +1292,12 @@ public class EgovUserManageController { double kakaoFtCost = 0.00; double kakaoFtMargin = 0.00; + double kakaoFtImgCost = 0.00; + double kakaoFtImgMargin = 0.00; + + double kakaoFtWideImgCost = 0.00; + double kakaoFtWideImgMargin = 0.00; + double faxCost = 0.00; double faxMargin = 0.00; @@ -1320,6 +1340,8 @@ public class EgovUserManageController { MjonMsgAgentStsVO resultAgentCost = mjonMsgAgentStsService.selectHotLineAgentCost("04"); kakaoAtCost = resultAgentCost.getKakaoAtCost(); //알림톡 원가 kakaoFtCost = resultAgentCost.getKakaoFtCost(); //친구톡 원가 + kakaoFtImgCost = resultAgentCost.getKakaoFt2Cost(); //친구톡 이미지 원가 + kakaoFtWideImgCost = resultAgentCost.getKakaoFt3Cost(); //친구톡 와이드 이미지 원가 // kakao 알림톡 마진률 계산 //kakaoAtCost = kakaoApiService.selectKakaoCost(); @@ -1328,6 +1350,12 @@ public class EgovUserManageController { //kakao 친구톡 마진률 계산 kakaoFtMargin = (1-(kakaoFtCost / kakaoFtPrice))*100; + //kakao 친구톡 이미지 마진률 계산 + kakaoFtImgMargin = (1-(kakaoFtImgCost / kakaoFtImgPrice))*100; + + //kakao 친구톡 와이드 이미지 마진률 계산 + kakaoFtWideImgMargin = (1-(kakaoFtWideImgCost / kakaoFtWideImgPrice))*100; + // fax 원가 SELECT faxCost = faxService.getFaxCost(); // fax 마직 계산 :: 1-원가/단가 @@ -1345,8 +1373,12 @@ public class EgovUserManageController { model.addAttribute("avgPriceP", avgPriceP); model.addAttribute("kakaoAtCost", kakaoAtCost); model.addAttribute("kakaoFtCost", kakaoFtCost); + model.addAttribute("kakaoFtImgCost", kakaoFtImgCost); + model.addAttribute("kakaoFtWideImgCost",kakaoFtWideImgCost); model.addAttribute("kakaoAtMargin", kakaoAtMargin); model.addAttribute("kakaoFtMargin", kakaoFtMargin); + model.addAttribute("kakaoFtImgMargin", kakaoFtImgMargin); + model.addAttribute("kakaoFtWideImgMargin", kakaoFtWideImgMargin); model.addAttribute("faxCost", faxCost); model.addAttribute("faxMargin", faxMargin); } @@ -3042,6 +3074,15 @@ public class EgovUserManageController { mberManageVO.setKakaoFtPrice(0); } + // 친구톡 이미지=> 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅 + if (Float.compare(sysJoinSetVO.getKakaoFtImgPrice(), mberManageVO.getKakaoFtImgPrice()) == 0) { + mberManageVO.setKakaoFtImgPrice(0); + } + // 친구톡 와이드 이미지=> 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅 + if (Float.compare(sysJoinSetVO.getKakaoFtWideImgPrice(), mberManageVO.getKakaoFtWideImgPrice()) == 0) { + mberManageVO.setKakaoFtWideImgPrice(0); + } + int resultCnt = mberManageService.updateUserPrice(mberManageVO); if(resultCnt > 0) { diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 4108019..8c7f369 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -2139,18 +2139,20 @@ - 친구톡 금액 + 친구톡 텍스트 금액 + + 친구톡 이미지 금액 + + + + 친구톡 와이드 금액 + +
diff --git a/src/main/webapp/WEB-INF/jsp/sym/site/baseUnitPrice.jsp b/src/main/webapp/WEB-INF/jsp/sym/site/baseUnitPrice.jsp index 0595a5f..048350b 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/site/baseUnitPrice.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/site/baseUnitPrice.jsp @@ -90,6 +90,18 @@ 카카오 알림톡 + + 카카오 친구톡 텍스트 + + + + 카카오 친구톡 이미지 + + + + 카카오 친구톡 와이드 + + 팩스 diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index cda6670..fdc68ba 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -403,8 +403,8 @@ function fnSmishingUpdate(flag) {
-

알림톡 예약 전송리스트(전체)

-

알림톡 예약 전송리스트 현황을 파악할 수 있습니다.

+

카톡 예약 전송리스트(전체)

+

카톡 예약 전송리스트 현황을 파악할 수 있습니다.

diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index acd5e9d..44867b8 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -568,8 +568,8 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
-

알림톡전송리스트(전체)

-

알림톡전송리스트 현황을 파악할 수 있습니다.

+

카톡전송리스트(전체)

+

카톡전송리스트 현황을 파악할 수 있습니다.

diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/sendresult/KakaoSendResultList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/sendresult/KakaoSendResultList.jsp index e4dc76c..298dd27 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/sendresult/KakaoSendResultList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/sendresult/KakaoSendResultList.jsp @@ -85,8 +85,8 @@ function rstCodeListExcelDownload(){
-

카카오 알림톡 발송 결과 코드 리스트(중계사별)

-

카카오 알림톡 발송 결과 코드 리스트 현황을 파악할 수 있습니다.

+

카톡 발송결과 코드 리스트(DAU)

+

카톡 발송결과 코드 리스트 현황을 파악할 수 있습니다.