From 9b9f867c71a59ead7b9385149b52eeaf56427d6f Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Tue, 6 Feb 2024 14:55:28 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9B=84=EB=B6=88=EC=A0=9C=EA=B3=A0=EA=B0=9D?=
 =?UTF-8?q?=20=ED=98=91=EC=9D=98=20=EB=8B=A8=EA=B0=80=EA=B0=80=20=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?=
 =?UTF-8?q?=EC=A0=81=EB=A6=BD=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EB=B0=9C=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/service/impl/MjonPayServiceImpl.java  |  6 ++++
 .../let/mjo/pay/web/MjonPayController.java    | 18 ++++++++++
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml  |  1 +
 .../WEB-INF/jsp/web/pay/PayUserSWList.jsp     | 36 ++++++++++++++++---
 4 files changed, 57 insertions(+), 4 deletions(-)

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){
 								<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>