diff --git a/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java b/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java index cc53994a..364c494e 100644 --- a/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java +++ b/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java @@ -45,4 +45,10 @@ public interface MjonMsgAgentStsService { //회원 전용 전송사 정보 조회 public List selectMsgAgentListByAgentCode(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception; + + //회원 전용 전송사 발송 단가 정보 조회 + public List selectHotLineAgentPriceList(String hotLineAgentCode) throws Exception; + + //회원 전용 전송사 발송 원가 정보 조회 + public MjonMsgAgentStsVO selectHotLineAgentCost(String hotLineAgentCode) throws Exception; } 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 afe9f356..e3735dbf 100644 --- a/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java +++ b/src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java @@ -33,6 +33,16 @@ public class MjonMsgAgentStsVO { private String searchUseYn ; private String blineYn; + private String costId; + private double shortCost; + private double longCost; + private double pictureCost; + private double kakaoAtCost; + private double kakaoFtCost; + private double kakaoFt2Cost; + private double kakaoft3Cost; + private double faxCost; + public String getBlineYn() { return blineYn; } @@ -194,6 +204,60 @@ public class MjonMsgAgentStsVO { } 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/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java b/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java index 2a153483..fb6fee52 100644 --- a/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java +++ b/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java @@ -111,4 +111,39 @@ public class MjonMsgAgentStsDAO extends EgovAbstractDAO { } + //회원 전용 전송사 발송 단가 정보 조회 + @SuppressWarnings("unchecked") + public List selectHotLineAgentPriceList(String hotLineAgentCode) throws Exception{ + + List resultList = new ArrayList(); + + try { + + resultList = (List) list("mjonMsgAgentStsDAO.selectHotLineAgentPriceList", hotLineAgentCode); + + } catch (Exception e) { + System.out.println("+++++++++++ selectHotLineAgentPriceList Service DAO Error!!! " + e); + } + + return resultList; + + } + + //회원 전용 전송사 발송 원가 정보 조회 + public MjonMsgAgentStsVO selectHotLineAgentCost(String hotLineAgentCode) throws Exception{ + + MjonMsgAgentStsVO resultCost = new MjonMsgAgentStsVO(); + + try { + + resultCost = (MjonMsgAgentStsVO) select("mjonMsgAgentStsDAO.selectHotLineAgentCost", hotLineAgentCode); + + } catch (Exception e) { + System.out.println("+++++++++++ selectHotLineAgentCost Service DAO Error!!! " + e); + } + + return resultCost; + + } + } diff --git a/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java b/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java index dfbd02b7..250cf12a 100644 --- a/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java @@ -213,4 +213,40 @@ public class MjonMsgAgentStsServiceImpl extends EgovAbstractServiceImpl implemen } + //회원 전용 전송사 발송 단가 정보 조회 + @Override + public List selectHotLineAgentPriceList(String hotLineAgentCode) throws Exception{ + + List resultList = new ArrayList(); + + try { + + resultList = mjonMsgAgentStsDAO.selectHotLineAgentPriceList(hotLineAgentCode); + + } catch (Exception e) { + System.out.println("+++++++++++ selectHotLineAgentPriceList Service Imple Error!!! " + e); + } + + return resultList; + + } + + //회원 전용 전송사 발송 원가 정보 조회 + @Override + public MjonMsgAgentStsVO selectHotLineAgentCost(String hotLineAgentCode) throws Exception{ + + MjonMsgAgentStsVO resultCost = new MjonMsgAgentStsVO(); + + try { + + resultCost = mjonMsgAgentStsDAO.selectHotLineAgentCost(hotLineAgentCode); + + } catch (Exception e) { + System.out.println("+++++++++++ selectHotLineAgentCostList Service Imple Error!!! " + e); + } + + return resultCost; + + } + } 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 648790e6..1e7c5f4e 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1371,6 +1371,57 @@ public class EgovUserManageController { model.addAttribute("faxMargin", faxMargin); } + {//전용전송사 선택시 마진율 계산을 위한 데이터 조회 + + String hotLineAgentCode = mberManageVO.getHotlineAgentCode(); + double agentPriceS = 0.00; //전송사 단문 발송 단가 + double agentPriceL = 0.00; //전송사 장문 발송 단가 + double agentPriceP = 0.00; //전송사 그림 발송 단가 + double agentCostS = 0.00; //전송사 단문 발송 원가 + double agentCostL = 0.00; //전송사 장문 발송 원가 + double agentCostP = 0.00; //전송사 그림 발송 원가 + String agentCodeNm = ""; + + + if(!hotLineAgentCode.equals("00")) { + + //전용 전송사 발송 단가 조회 + List resultAgentPriceList = mjonMsgAgentStsService.selectHotLineAgentPriceList(hotLineAgentCode); + agentCodeNm = resultAgentPriceList.get(0).getAgentCodeNm(); + + for(MjonMsgAgentStsVO hotLineVO : resultAgentPriceList) { + + String msgType = hotLineVO.getMsgType(); + + if(msgType.equals("S")) { + agentPriceS = Double.parseDouble(hotLineVO.getAgentPrice()); + }else if(msgType.equals("L")) { + agentPriceL = Double.parseDouble(hotLineVO.getAgentPrice()); + }else { + agentPriceP = Double.parseDouble(hotLineVO.getAgentPrice()); + } + + } + + //전용 전송사 발송 단가 조회 + MjonMsgAgentStsVO resultAgentCost = mjonMsgAgentStsService.selectHotLineAgentCost(hotLineAgentCode); + + agentCostS = resultAgentCost.getShortCost(); + agentCostL = resultAgentCost.getLongCost(); + agentCostP = resultAgentCost.getPictureCost(); + + model.addAttribute("agentPriceS", agentPriceS); + model.addAttribute("agentPriceL", agentPriceL); + model.addAttribute("agentPriceP", agentPriceP); + model.addAttribute("agentCostS", agentCostS); + model.addAttribute("agentCostL", agentCostL); + model.addAttribute("agentCostP", agentCostP); + model.addAttribute("agentCodeNm", agentCodeNm); + + } + + } + {//첫결제 내역 정보 불러오기 MjonPayVO resultMjonFrstPayVO = mjonPayService.selectFrstPayInfoByUserId(userId); diff --git a/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml index e241888c..1b625a9f 100644 --- a/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml @@ -189,6 +189,45 @@ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index 5b884e4e..59e243b1 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -5065,14 +5065,30 @@ function kakaoATDelayCancel(msgGroupId){ - - 문자온 원가 - ~ - ~ - ~ - ~ - ~ - + <%-- 전용 전송사가 없는 경우 전체 전송사의 최소 값 ~ 최대값을 표시, 전용 전송사가 있는 경우 해당 전송사의 전송 원가를 표시해줌 --%> + + + + 문자온 원가 + ~ + ~ + ~ + ~ + ~ + + + + + 문자온 원가() + + + + + + + + + @@ -5127,13 +5143,25 @@ function kakaoATDelayCancel(msgGroupId){ + <%-- 전용전송사가 없는 경우 전체전송사의 평균 원가를 기준으로 마진률을 계산, 전용 전송사가 있는 경우 해당 전송사의 전송 원가를 기준으로 마진률을 계산 --%> 마진률 - % - % - % - % - % + + + % + % + % + % + % + + + % + % + % + % + % + +