diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayService.java b/src/main/java/itn/let/mjo/pay/service/MjonPayService.java index 8f6cdf38..cce02bc6 100644 --- a/src/main/java/itn/let/mjo/pay/service/MjonPayService.java +++ b/src/main/java/itn/let/mjo/pay/service/MjonPayService.java @@ -76,9 +76,10 @@ public interface MjonPayService { void updatePointUseByCase(MjonPayVO mjonPayVO) throws Exception; - String selectSumPayMoney(String userId) throws Exception; - + + String selectAgentSumPayMoney(String userId) throws Exception; + String selectSumPoint(String userId) throws Exception; List selectPayListForRefund(MjonPayVO mjonPayVO) throws Exception; diff --git a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java index ab25a946..ed872913 100644 --- a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java +++ b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java @@ -179,6 +179,10 @@ public class MjonPayDAO extends EgovAbstractDAO { return (String) select("mjonPayDAO.selectSumPayMoney", userId); } + public String selectAgentSumPayMoney(String userId) throws Exception{ + return (String) select("mjonPayDAO.selectAgentSumPayMoney", userId); + } + public String selectSumPoint(String userId) throws Exception{ return (String) select("mjonPayDAO.selectSumPoint", userId); } diff --git a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java index a70ca870..1c870c2c 100644 --- a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java +++ b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java @@ -2499,13 +2499,16 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP } } - - @Override public String selectSumPayMoney(String userId) throws Exception{ return mjonPayDAO.selectSumPayMoney(userId); } + @Override + public String selectAgentSumPayMoney(String userId) throws Exception { + return mjonPayDAO.selectAgentSumPayMoney(userId); + } + @Override public String selectSumPoint(String userId) throws Exception{ return mjonPayDAO.selectSumPoint(userId); @@ -2740,4 +2743,6 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP return mjonPayDAO.selectPointInfoList(userId); } + + } 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 55d5f1c5..eca2dbcc 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2409,7 +2409,7 @@ public class MjonPayController { mjonMsgVO.setUserId(userId); { // 충전캐시 - String sumPayMoney = mjonPayService.selectSumPayMoney(userId); + String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); model.addAttribute("sumPayMoney", sumPayMoney); } @@ -2480,7 +2480,7 @@ public class MjonPayController { { // 충전캐시 - String sumPayMoney = mjonPayService.selectSumPayMoney(userId); + String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); model.addAttribute("sumPayMoney", sumPayMoney); } diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index 9a722b58..e80b4936 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -1285,6 +1285,14 @@ + + SELECT 'chargeCash' AS divFlag - ,SUM(AMT) AS cashSum + ,SUM(CASH) AS cashSum FROM MJ_PG WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataCallToListView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataCallToListView.jsp index cfebe30b..87d3f762 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataCallToListView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataCallToListView.jsp @@ -11,15 +11,25 @@ var sendComplete = '${resultTotCallToInfo.sendComplete}'; var sendReady = '${resultTotCallToInfo.sendReady}'; - $("#totCallToCnt").text(totCallToCnt); - $("#sendComplete").text(sendComplete); - $("#sendReady").text(sendReady); + if(sendReady > 0){ + + $("#totCallToCnt").text(totCallToCnt); + $("#sendComplete").text(sendComplete); + $("#sendReady").text(sendReady); + + }else{ + + $("#totCallToCnt").text(0); + $("#sendComplete").text(0); + $("#sendReady").text(0); + + }