diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index d3e8e124..0e33a82c 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -193,19 +193,21 @@ public class KakaoSendUtil { // step3 // 바이트 수 체크 및 금액설정 - - Float kakaoAtPrice = mberManageVO.getKakaoAtPrice(); + // 유효한 단가 계산 float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()); float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()); + float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice()); String shortPStr = Float.toString(shortPrice); String mmsPStr = Float.toString(longPrice); + String kakaoAtPStr = Float.toString(kakaoAtPrice); // 공통 가격 설정 sendVO.setSmsPrice(shortPStr); sendVO.setMmsPrice(mmsPStr); + sendVO.setKakaoAtPrice(kakaoAtPStr); if("Y".equals(kakaoVO.getSubMsgSendYn())) { @@ -222,8 +224,7 @@ public class KakaoSendUtil { } else { - kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice()); - sendVO.setEachPrice( Float.toString(kakaoAtPrice) ); + sendVO.setEachPrice(kakaoAtPStr); } diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java index cef9cf34..21ca4b50 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java @@ -956,7 +956,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements /** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/ kakaoVO.setMsgGroupId(sendVO.getMsgGroupId()); - kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getEachPrice())); + kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getKakaoAtPrice())); kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice())); kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice())); diff --git a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java index 2843c4d3..7f4e1e1e 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java @@ -242,7 +242,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka int failed = 0; // 실패 건수 if("Y".equals(resultVO.getBizKakaoResendYn())) { success = resultVO.getSuccessCount() + resultVO.getKakaoResendSuccCount(); - failed = resultVO.getKakaoResendFailCount(); + failed = resultVO.getFailCount() - resultVO.getKakaoResendSuccCount(); }else { success = resultVO.getSuccessCount(); failed = resultVO.getFailCount(); @@ -254,8 +254,8 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka String failedPct = total > 0 ? String.format("%.1f%%", (failed / (double) total) * 100) : "0.0%"; resultVO.setSuccessPct(successPct); - resultVO.setFailedPct(waitingPct); - resultVO.setWaitingPct(failedPct); + resultVO.setFailedPct(failedPct); + resultVO.setWaitingPct(waitingPct); resultVO.setTotPrice(this.priceProc(resultVO.getSuccessPrice(), resultVO.getKakaoResendSuccPrice())); @@ -290,6 +290,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka //성공 건수 세팅 KakaoSentVO eachCnt = new KakaoSentVO(); eachCnt.setMsgGroupId(result.getMsgGroupId()); + eachCnt.setBizKakaoResendYn("Y".equals(result.getBizKakaoResendYn()) ? "Y" : "N"); try { eachCnt = kakaoSentDAO.selectKakaoSentCntEachCnt_advc(eachCnt); } catch (Exception e) { diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 00b94da6..779d269d 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1664,63 +1664,48 @@ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp index 20a12045..bcc03db8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp @@ -659,7 +659,7 @@ function previewPhone(){
등록일시
-
${result.regDate}
+
@@ -760,7 +760,7 @@ function previewPhone(){
성공건수
-
건(${result.successPct})
+
건(${result.successPct})
@@ -774,7 +774,12 @@ function previewPhone(){
실패건수
-
건(${result.failedPct})
+ <%-- 대체문자 기능 on + 카카오톡 실패 + 대체문자 실패 = 실패 + 대체문자 기능 off + 카카오톡 실패 = 실패 + *카카오톡 실패임에도 대체문자로 발송이 성공한 경우 실패로 체크하지 않음 --%> +
건(${result.failedPct})
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp index b7ac38ba..7b04f291 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp @@ -156,11 +156,11 @@ $(document).ready(function(){ }); - $(document).on('change','#pageUnit', function(){ + /* $(document).on('change','#pageUnit', function(){ linkPage(1); - }); + }); */ //발송건수 셋 cntSet();