diff --git a/src/main/java/itn/com/cmm/util/MJUtil.java b/src/main/java/itn/com/cmm/util/MJUtil.java index a0dc9411..7029522a 100644 --- a/src/main/java/itn/com/cmm/util/MJUtil.java +++ b/src/main/java/itn/com/cmm/util/MJUtil.java @@ -318,4 +318,17 @@ public final class MJUtil { return dupliBlockList; } + /** + * 사업자등록번호 대시('-') 추가 + * 대시 유무 상관없음 + * 유효성 맞지 않을시 변환안됨. + */ + public static String bizNoAddDash(String str) { + if(str == null) { + return str; + } + String regExp = "(\\d{3})(\\d{2})(\\d{5})$"; + String chgf = "$1-$2-$3"; + return str.replaceFirst(regExp, chgf); + } } 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 41764164..e4a4e305 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -4908,34 +4908,11 @@ public class MjonPayController { model.addAttribute("resultList", payUserSumList); // 수신자 정보 - String mberNm = ""; // 회사명 - String managerNm = ""; // 담당자명 - String moblphonNo = ""; // 연락처 - String mberEmailAdres = ""; //이메일 - MberManageVO mberManageVO = new MberManageVO(); - mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); - if (mberManageVO != null) { - // 회원종류 p-개인 c-기업 - if (mberManageVO.getDept().equals("c")) { - mberNm = mberManageVO.getMberNm(); - managerNm = mberManageVO.getManagerNm(); - moblphonNo = mberManageVO.getMoblphonNo(); - mberEmailAdres = mberManageVO.getMberEmailAdres(); - } - else { - mberNm = mberManageVO.getMberNm(); - managerNm = mberManageVO.getMberNm(); - moblphonNo = mberManageVO.getMoblphonNo(); - mberEmailAdres = mberManageVO.getMberEmailAdres(); - } - } - - model.addAttribute("mberNm", mberNm); - model.addAttribute("managerNm", managerNm); - model.addAttribute("moblphonNo", moblphonNo); - model.addAttribute("bizNo", mberManageVO.getBizNo()); - model.addAttribute("mberEmailAdres", mberEmailAdres); - model.addAttribute("dept", mberManageVO.getDept()); + MJUtil mjUtil = new MJUtil(); + MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); + mberManageVO.setMoblphonNo(mjUtil.addDash(mberManageVO.getMoblphonNo())); + mberManageVO.setBizNo(mjUtil.bizNoAddDash(mberManageVO.getBizNo())); + model.addAttribute("mberManageVO", mberManageVO); //부가세 포함 가격 정보 계산 double addTax = Math.round(totalSumPrice * 0.1); @@ -6081,7 +6058,10 @@ public class MjonPayController { mjonPayVO.setUserId(userId); //결제 정보 불러오기 + MJUtil mjUtil = new MJUtil(); MjonPayVO result = mjonPayService.selectPayDetail(mjonPayVO); + result.setMbtlNum(mjUtil.addDash(result.getMbtlNum())); + result.setBizNo(mjUtil.bizNoAddDash(result.getBizNo())); model.addAttribute("result", result); return "web/pay/payInvoicePrintPopup"; 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 0429b89f..a531664e 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 @@ -3595,9 +3595,9 @@ , MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate , M.msgTypeName , M.orderByCode - , SUM(IF(M.msgTypeName = '단문(SMS)', 1, 0)) AS shtSendCount - , SUM(IF(M.msgTypeName = '장문(LMS)', 1, 0)) AS longSendCount - , SUM(IF(M.msgTypeName = '그림(MMS)', 1, 0)) AS pictSendCount + , SUM(IF(M.msgTypeName = '단문', 1, 0)) AS shtSendCount + , SUM(IF(M.msgTypeName = '장문', 1, 0)) AS longSendCount + , SUM(IF(M.msgTypeName = '그림', 1, 0)) AS pictSendCount , SUM(IF(M.msgTypeName = '알림톡', 1, 0)) AS atSendCount , SUM(IF(M.msgTypeName = '친구톡', 1, 0)) AS ftSendCount @@ -3616,14 +3616,14 @@ , B.MSG_TYPE , CASE WHEN B.MSG_TYPE = '6' AND B.FILE_CNT > 0 - THEN '그림(MMS)' + THEN '그림' WHEN B.MSG_TYPE = '6' AND B.FILE_CNT = 0 - THEN '장문(LMS)' + THEN '장문' WHEN B.MSG_TYPE = '8' THEN '알림톡' WHEN B.MSG_TYPE = '9' THEN '친구톡' - ELSE '단문(SMS)' + ELSE '단문' END msgTypeName , CASE WHEN B.MSG_TYPE = '6' AND B.FILE_CNT > 0 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 42f8dd38..15d5b3b8 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 @@ -2371,6 +2371,7 @@ , MP.REG_DATE AS regDate , MP.AMT AS amt , MP.CASH AS cash + , MP.PG_STATUS AS pgStatus FROM LETTNGNRLMBER LM LEFT JOIN MJ_PG MP ON MP.USER_ID = LM.MBER_ID diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp index 72db2baf..abe09cb8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp @@ -71,8 +71,8 @@ function f_print(){