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

Merge branch 'jsp'

Browse Source
This commit is contained in:
itn 2023-08-09 14:22:40 +09:00
commit b2476984d4
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
View File

@ -1092,6 +1092,14 @@ public class EgovUserManageController {
//1.시스템 기본 단가 정보 조회하기
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
model.addAttribute("sysShortPrice", sysJoinSetVO.getShortPrice());
model.addAttribute("sysLongPrice", sysJoinSetVO.getLongPrice());
model.addAttribute("sysPicturePrice", sysJoinSetVO.getPicturePrice());
model.addAttribute("sysPicture2Price", sysJoinSetVO.getPicture2Price());
model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice());
// 등급제 단가 추출 => 시스템 단가에 적용
sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId);
@ -2791,7 +2799,31 @@ public class EgovUserManageController {
}
try {
//1.시스템 기본 단가 정보 조회하기
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
// 문자 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
if (Float.compare(sysJoinSetVO.getShortPrice(), mberManageVO.getShortPrice()) == 0) {
if (Float.compare(sysJoinSetVO.getLongPrice(), mberManageVO.getLongPrice()) == 0) {
if (Float.compare(sysJoinSetVO.getPicturePrice(), mberManageVO.getPicturePrice()) == 0) {
if (Float.compare(sysJoinSetVO.getPicture2Price(), mberManageVO.getPicture2Price()) == 0) {
if (Float.compare(sysJoinSetVO.getPicture3Price(), mberManageVO.getPicture3Price()) == 0) {
mberManageVO.setShortPrice(0);
mberManageVO.setLongPrice(0);
mberManageVO.setPicturePrice(0);
mberManageVO.setPicture2Price(0);
mberManageVO.setPicture3Price(0);
mberManageVO.setPicture3Price(0);
}
}
}
}
}
// 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) {
mberManageVO.setKakaoAtPrice(0);
}
int resultCnt = mberManageService.updateUserPrice(mberManageVO);
if(resultCnt > 0) {

2
src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
View File

@ -680,6 +680,8 @@
, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
, A.EDIT_DATE = NOW()
, A.TEMP_YN = 'Y'
, A.GRD_END_DATE = '9999:12:31 23:59:59'
, A.GRD_STATUS = 'Y'
WHERE A.TEMP_YN = 'N'
AND C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
]]>

19
src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
View File

@ -61,6 +61,12 @@ tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}
<!-- <script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script> -->
<script type="text/javaScript" language="javascript" defer="defer">
var grdSettingList = []; // 등급별 단가 정보
var sysShortPrice = "${sysShortPrice}";
var sysLongPrice = "${sysLongPrice}";
var sysPicturePrice = "${sysPicturePrice}";
var sysPicture2Price = "${sysPicture2Price}";
var sysPicture3Price = "${sysPicture3Price}";
var sysKakaoAtPrice = "${sysKakaoAtPrice}";
$(document).ready(function(){
console.log('${serverName}');
@ -700,6 +706,18 @@ function fn_userSearch(){
form.submit();
}
// 문자 금액 초기화
function fnPriceReset() {
form = document.msgPriceForm;
form.shortPrice.value = sysShortPrice;
form.longPrice.value = sysLongPrice;
form.picturePrice.value = sysPicturePrice;
form.picture2Price.value = sysPicture2Price;
form.picture3Price.value = sysPicture3Price;
form.kakaoAtPrice.value = sysKakaoAtPrice;
}
//문자발송 금액 변경 처리
function fnPriceUpdate(mberId){
@ -5572,6 +5590,7 @@ function kakaoATDelayCancel(msgGroupId){
</table>
<div class="button_box">
<button type="button" onclick="fnPriceUpdate('<c:out value="${mberManageVO.mberId}"/>'); return false;">금액 변경</button>
<button type="button" onclick="fnPriceReset(); return false;">초기화</button>
</div>
</div>
</div>