diff --git a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java index 252dd2b6..55d612d8 100644 --- a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java +++ b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java @@ -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); 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 dfefc82b..152a69cc 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -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); + } 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 9520f659..c7716bb3 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 @@ -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 diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp index c3bad9a2..28ac2512 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp @@ -308,7 +308,14 @@ function fnRevDetailPop03(msgGroupId){
포인트
-
포인트
-
포인트
-
포인트
-