tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이지우 - 사용자 > 결제관리 > 요금 결제내역/요금 사용내역 수정

Browse Source
This commit is contained in:
JIWOO 2025-07-28 16:45:49 +09:00
parent 1ef82c5f3d
commit 0d88276068
8 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/itn/com/cmm/util/MJUtil.java
View File

@ -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);
}
}

36
src/main/java/itn/let/mjo/pay/web/MjonPayController.java
View File

@ -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";

12
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
View File

@ -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
<!-- , SUM(M.MSG_GROUP_CNT) AS sendCount -->
@ -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

1
src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
View File

@ -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

26
src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
View File

@ -71,8 +71,8 @@ function f_print(){
<th>등록번호</th>
<td>
<c:choose>
<c:when test="${dept eq'c'}">
<c:out value="${bizNo}"/>
<c:when test="${mberManageVO.dept eq'c'}">
<c:out value="${mberManageVO.bizNo}"/>
</c:when>
<c:otherwise>
-
@ -84,8 +84,8 @@ function f_print(){
<th>상<span class="blank"></span>호</th>
<td>
<c:choose>
<c:when test="${dept eq'c'}">
<c:out value="${mberNm}"/>
<c:when test="${mberManageVO.dept eq'c'}">
<c:out value="${mberManageVO.mberNm}"/>
</c:when>
<c:otherwise>
-
@ -97,25 +97,25 @@ function f_print(){
<th>성<span class="blank"></span>명</th>
<td>
<c:choose>
<c:when test="${dept eq'c'}">
<c:out value="${managerNm}"/>
<c:when test="${mberManageVO.dept eq'c'}">
<c:out value="${mberManageVO.managerNm}"/>
</c:when>
<c:otherwise>
<c:out value="${mberName}"/>
<c:out value="${mberManageVO.mberNm}"/>
</c:otherwise>
</c:choose>
</td>
</tr>
<tr>
<th>전화번호</th>
<td><c:out value="${moblphonNo}"/></td>
<td><c:out value="${mberManageVO.moblphonNo}"/></td>
</tr>
<tr>
<th style="letter-spacing:-0.85px;">이&ensp;메&ensp;일</th>
<td><c:out value="${mberEmailAdres}"/></td>
<td><c:out value="${mberManageVO.mberEmailAdres}"/></td>
</tr>
<tr>
<td colspan="2" style="text-align:center;"><span><c:if test="${dept eq'c'}">주식회사 </c:if><c:out value="${mberNm}"/></span>님의 사용내역(<c:out value="${startDate}"/>~<c:out value="${endDate}"/>)을 아래와 같이 확인합니다.</td>
<td colspan="2" style="text-align:center;"><span><c:out value="${mberManageVO.mberNm}"/></span>님의 사용내역(<c:out value="${startDate}"/>~<c:out value="${endDate}"/>)을 아래와 같이 확인합니다.</td>
</tr>
</tbody>
</table>
@ -156,15 +156,15 @@ function f_print(){
<td>${result.msgTypeName}</td>
<td>
<c:choose>
<c:when test="${result.msgTypeName eq '단문(SMS)'}">
<c:when test="${result.msgTypeName eq '단문'}">
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
<c:out value="${shtSendCount}"/>
</c:when>
<c:when test="${result.msgTypeName eq '장문(LMS)'}">
<c:when test="${result.msgTypeName eq '장문'}">
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
<c:out value="${longSendCount}"/>
</c:when>
<c:when test="${result.msgTypeName eq '그림(MMS)'}">
<c:when test="${result.msgTypeName eq '그림'}">
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
<c:out value="${pictSendCount}"/>
</c:when>

3
src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp
View File

@ -96,7 +96,10 @@ function payUserListAjax(pageNo){
document.listForm.pageIndex.value = pageNo;
var sendData= $(document.listForm).serializeArray();
//조회 완료 인지를 위하여 hide show로 화면 변화 추가
$("#payUserListLoad").hide();
$("#payUserListLoad").load("/web/member/pay/payUserSWListAjax.do", sendData ,function(response, status, xhr){
$("#payUserListLoad").show();
});
}

2
src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
View File

@ -260,7 +260,7 @@ function fnShowPdfPrintPopup(){
<button type="button" class="btnType btn_36 border_gray btnType12" onclick="fnShowPrintPopup(); return false;">사용내역서</button>
</c:when>
<c:otherwise>
<button type="button" class="btnType btn_36 border_gray btnType12" onclick="alert('거래명세서, 사용내역서 발행할 요금사용내역이 없습니다.');">사용내역서</button>
<button type="button" class="btnType btn_36 border_gray btnType12" onclick="alert('선택한 조회기간의 요금사용내역이 없습니다.');">사용내역서</button>
</c:otherwise>
</c:choose>
<button type="button" class="excel_btn">

2
src/main/webapp/WEB-INF/jsp/web/pay/payInvoicePrintPopup.jsp
View File

@ -338,7 +338,7 @@
<th colspan="2" rowspan="2" style="background:#fff;vertical-align:middle;">
<c:choose>
<c:when test="${result.prePaymentYn eq 'N'}">
<c:when test="${result.prePaymentYn eq 'N' and result.pgStatus ne '1'}">
이 금액을 [<span>청&ensp;구</span>]함
</c:when>
<c:otherwise>