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

Merge branch 'master' into kakaoFT

Browse Source
This commit is contained in:
rosewiper 2024-02-06 16:58:23 +09:00
commit 469de9b40f
4 changed files with 96 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java
View File

@ -530,7 +530,7 @@ public class MjonMsgCampainTWDataController {
model.addAttribute("symbolList", symbolList);
//최근 전송 내역
Calendar cal = Calendar.getInstance();
/*Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
@ -542,11 +542,11 @@ public class MjonMsgCampainTWDataController {
searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작
List<?> resultLatestMsgList = mjonMsgDataService.selectLatestMsgList(searchVO);
model.addAttribute("resultLatestMsgList", resultLatestMsgList);
model.addAttribute("resultLatestMsgList", resultLatestMsgList);*/
//자주보내는 번호
List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO);
model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);
/*List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO);
model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);*/
/** pageing */

49
src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java
View File

@ -31,6 +31,7 @@ import itn.let.mjo.event.service.MjonEventVO;
import itn.let.mjo.event.service.impl.MjonEventDAO;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
import itn.let.mjo.pay.service.MjonPayService;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.mjo.pay.service.MjonVaMsgLogVO;
@ -59,6 +60,9 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
@Resource(name="taxDAO")
private TaxDAO taxDAO;
@Resource(name="MjonMsgDataDAO")
private MjonMsgDataDAO mjonMsgDataDAO;
@Resource(name = "egovMjonCashIdGnrService")
private EgovIdGnrService idgenMjonCashId;
@ -2570,15 +2574,46 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
UserManageVO umVO = new UserManageVO();
umVO.setMberId(mjVO.getUserId());
umVO.setCash((float)mjVO.getCash());
// point 값 넣기
mjonPayVO = this.setAdvPointVO(umVO);
//POINT 테이블
mjonPayDAO.insertPoint(mjonPayVO);
//회원정보 POINT 업데이트
mjonPayDAO.updateMemberPoint(mjonPayVO);
/*
* 후불고객 포인트 적립 기능 변경
* 후불고객 중 협의단가를 적용받는 고객은 포인트 적립을 받지 않는다고 함 (장건영 팀장)
* 2024.02.06일 변경처리 우영두
*
* */
//회원 협의 단가 정보 조회
MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
float shortPrice = mberManageVO.getShortPrice();
float longPrice = mberManageVO.getLongPrice();
float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
String negoPriceYn = "N";
//협의단가 총합이 0 이상이면 협의단가 대상으로 지정
if(totPrice > 0) {
negoPriceYn = "Y";
}
//협의 단가 정보가 없는 경우만 포인트 적립을 해준다.
if(negoPriceYn.equals("N")) {
// point 값 넣기
mjonPayVO = this.setAdvPointVO(umVO);
//POINT 테이블
mjonPayDAO.insertPoint(mjonPayVO);
//회원정보 POINT 업데이트
mjonPayDAO.updateMemberPoint(mjonPayVO);
}
}
/**

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

@ -2675,6 +2675,24 @@ public class MjonPayController {
int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100));
model.addAttribute("unPaymentPointAfterPay", unPaymentPointAfterPay);
/*
* 2024.02.06 후불제 회원 중 협의단가를 사용하는 회원은 포인트 적립이 되지 않아야함.
* 후불제 협의 단가 여부 체크
* 모든 협의 단가 금액을 합산하여 0보다 크면 협의단가 있음.
* */
float shortPrice = mberManageVO.getShortPrice();
float longPrice = mberManageVO.getLongPrice();
float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
String negoPriceYn = "N";
if(totPrice > 0) {
negoPriceYn = "Y";
}
model.addAttribute("negoPriceYn", negoPriceYn);
}

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

@ -308,7 +308,14 @@ function fnRevDetailPop03(msgGroupId){
<p>포인트</p>
<p>
<span>
<fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
<c:choose>
<c:when test="${negoPriceYn eq 'N'}">
<fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
</c:when>
<c:otherwise>
0
</c:otherwise>
</c:choose>
</span>원
</p>
</div>
@ -331,7 +338,14 @@ function fnRevDetailPop03(msgGroupId){
<p>포인트</p>
<p>
<span>
<fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
<c:choose>
<c:when test="${negoPriceYn eq 'N'}">
<fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
</c:when>
<c:otherwise>
0
</c:otherwise>
</c:choose>
</span>원
</p>
</div>
@ -354,7 +368,14 @@ function fnRevDetailPop03(msgGroupId){
<p>포인트</p>
<p>
<span>
<fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
<c:choose>
<c:when test="${negoPriceYn eq 'N'}">
<fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
</c:when>
<c:otherwise>
0
</c:otherwise>
</c:choose>
</span>원
</p>
</div>
@ -381,7 +402,14 @@ function fnRevDetailPop03(msgGroupId){
<p>포인트</p>
<p>
<span>
<fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
<c:choose>
<c:when test="${negoPriceYn eq 'N'}">
<fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
</c:when>
<c:otherwise>
0
</c:otherwise>
</c:choose>
</span>원
</p>
</div>