후불제고객 협의 단가가 있는 경우 포인트 적립이 안되도록 처리 개발 중

This commit is contained in:
rosewiper 2024-02-06 14:55:28 +09:00
parent 2a2bebfa8b
commit 9b9f867c71
4 changed files with 57 additions and 4 deletions

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;
@ -2571,6 +2575,8 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
umVO.setMberId(mjVO.getUserId());
umVO.setCash((float)mjVO.getCash());
MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
// point 넣기
mjonPayVO = this.setAdvPointVO(umVO);

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

View File

@ -2120,6 +2120,7 @@
, PICTURE2_PRICE AS picture2Price
, PICTURE3_PRICE AS picture3Price
, KAKAO_AT_PRICE AS kakaoAtPrice
, KAKAO_FT_PRICE AS kakaoFtPrice
, FAX_PRICE AS faxPrice
, USER_MONEY AS userMoney
, USER_POINT AS userPoint

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>