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

---
 .../pay/service/impl/MjonPayServiceImpl.java  | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 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 55d612d8..454aac10 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
@@ -2574,17 +2574,46 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
 		UserManageVO umVO = new UserManageVO(); 
 		umVO.setMberId(mjVO.getUserId());
 		umVO.setCash((float)mjVO.getCash());
+
 		
+		/*
+		 * 후불고객 포인트 적립 기능 변경
+		 * 후불고객 중 협의단가를 적용받는 고객은 포인트 적립을 받지 않는다고 함 (장건영 팀장)
+		 * 2024.02.06일 변경처리 우영두
+		 * 
+		 * */
+		
+		//회원 협의 단가 정보 조회 
 		MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
 		
-		// point 값 넣기
-		mjonPayVO = this.setAdvPointVO(umVO);
-
-		//POINT 테이블
-		mjonPayDAO.insertPoint(mjonPayVO);  
+		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);
+			
+		}
 		
-		//회원정보 POINT 업데이트
-		mjonPayDAO.updateMemberPoint(mjonPayVO);
 	}	
 	
 	/**