Commit @469de9b40faa15f46a78eb564156e27e95938706

rosewiper 2024-02-06

Merge branch 'master' into kakaoFT

@469de9b40faa15f46a78eb564156e27e95938706

9e8b827

469de9b

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java

--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java

+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java


 		model.addAttribute("symbolList", symbolList);
 		
 		//최근 전송 내역
-		Calendar cal = Calendar.getInstance();
+		/*Calendar cal = Calendar.getInstance();
     	Date now = new Date();
     	
     	SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");

     	
     	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 */

9e8b827

469de9b

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

--- src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java

+++ src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java


 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;

 
 	@Resource(name="taxDAO")
 	private TaxDAO taxDAO;
+	
+	@Resource(name="MjonMsgDataDAO")
+	private MjonMsgDataDAO mjonMsgDataDAO;
 
 	@Resource(name = "egovMjonCashIdGnrService")
     private EgovIdGnrService idgenMjonCashId;

 		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);
+			
+		}
+		
 	}	
 	
 	/**

9e8b827

469de9b

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java

+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java


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

9e8b827

469de9b

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

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

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp


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

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

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

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

Add a comment

Open 0
Closed 0

List

...	...	@@ -530,7 +530,7 @@
530	530	model.addAttribute("symbolList", symbolList);
531	531
532	532	//최근 전송 내역
533		- Calendar cal = Calendar.getInstance();
	533	+ /*Calendar cal = Calendar.getInstance();
534	534	Date now = new Date();
535	535
536	536	SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
...	...	@@ -542,11 +542,11 @@
542	542
543	543	searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작
544	544	List<?> resultLatestMsgList = mjonMsgDataService.selectLatestMsgList(searchVO);
545		- model.addAttribute("resultLatestMsgList", resultLatestMsgList);
	545	+ model.addAttribute("resultLatestMsgList", resultLatestMsgList);*/
546	546
547	547	//자주보내는 번호
548		- List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO);
549		- model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);
	548	+ /*List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO);
	549	+ model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);*/
550	550
551	551
552	552	/** pageing */

...	...	@@ -31,6 +31,7 @@
31	31	import itn.let.mjo.event.service.impl.MjonEventDAO;
32	32	import itn.let.mjo.msg.service.MjonMsgVO;
33	33	import itn.let.mjo.msgdata.service.MjonMsgDataService;
	34	+import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
34	35	import itn.let.mjo.pay.service.MjonPayService;
35	36	import itn.let.mjo.pay.service.MjonPayVO;
36	37	import itn.let.mjo.pay.service.MjonVaMsgLogVO;
...	...	@@ -59,6 +60,9 @@
59	60
60	61	@Resource(name="taxDAO")
61	62	private TaxDAO taxDAO;
	63	+
	64	+ @Resource(name="MjonMsgDataDAO")
	65	+ private MjonMsgDataDAO mjonMsgDataDAO;
62	66
63	67	@Resource(name = "egovMjonCashIdGnrService")
64	68	private EgovIdGnrService idgenMjonCashId;
...	...	@@ -2570,15 +2574,46 @@
2570	2574	UserManageVO umVO = new UserManageVO();
2571	2575	umVO.setMberId(mjVO.getUserId());
2572	2576	umVO.setCash((float)mjVO.getCash());
2573		-
2574		- // point 값 넣기
2575		- mjonPayVO = this.setAdvPointVO(umVO);
2576	2577
2577		- //POINT 테이블
2578		- mjonPayDAO.insertPoint(mjonPayVO);
2579	2578
2580		- //회원정보 POINT 업데이트
2581		- mjonPayDAO.updateMemberPoint(mjonPayVO);
	2579	+ /*
	2580	+ * 후불고객 포인트 적립 기능 변경
	2581	+ * 후불고객 중 협의단가를 적용받는 고객은 포인트 적립을 받지 않는다고 함 (장건영 팀장)
	2582	+ * 2024.02.06일 변경처리 우영두
	2583	+ *
	2584	+ * */
	2585	+
	2586	+ //회원 협의 단가 정보 조회
	2587	+ MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
	2588	+
	2589	+ float shortPrice = mberManageVO.getShortPrice();
	2590	+ float longPrice = mberManageVO.getLongPrice();
	2591	+ float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
	2592	+ float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
	2593	+ float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
	2594	+ float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
	2595	+
	2596	+ String negoPriceYn = "N";
	2597	+
	2598	+ //협의단가 총합이 0 이상이면 협의단가 대상으로 지정
	2599	+ if(totPrice > 0) {
	2600	+ negoPriceYn = "Y";
	2601	+ }
	2602	+
	2603	+ //협의 단가 정보가 없는 경우만 포인트 적립을 해준다.
	2604	+ if(negoPriceYn.equals("N")) {
	2605	+
	2606	+ // point 값 넣기
	2607	+ mjonPayVO = this.setAdvPointVO(umVO);
	2608	+
	2609	+ //POINT 테이블
	2610	+ mjonPayDAO.insertPoint(mjonPayVO);
	2611	+
	2612	+ //회원정보 POINT 업데이트
	2613	+ mjonPayDAO.updateMemberPoint(mjonPayVO);
	2614	+
	2615	+ }
	2616	+
2582	2617	}
2583	2618
2584	2619	/**

...	...	@@ -2675,6 +2675,24 @@
2675	2675	int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100));
2676	2676	model.addAttribute("unPaymentPointAfterPay", unPaymentPointAfterPay);
2677	2677
	2678	+ /*
	2679	+ * 2024.02.06 후불제 회원 중 협의단가를 사용하는 회원은 포인트 적립이 되지 않아야함.
	2680	+ * 후불제 협의 단가 여부 체크
	2681	+ * 모든 협의 단가 금액을 합산하여 0보다 크면 협의단가 있음.
	2682	+ * */
	2683	+ float shortPrice = mberManageVO.getShortPrice();
	2684	+ float longPrice = mberManageVO.getLongPrice();
	2685	+ float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
	2686	+ float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
	2687	+ float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
	2688	+ float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
	2689	+ String negoPriceYn = "N";
	2690	+
	2691	+ if(totPrice > 0) {
	2692	+ negoPriceYn = "Y";
	2693	+ }
	2694	+ model.addAttribute("negoPriceYn", negoPriceYn);
	2695	+
2678	2696	}
2679	2697
2680	2698

...	...	@@ -308,7 +308,14 @@
308	308	<p>포인트</p>
309	309	<p>
310	310	<span>
311		- <fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
	311	+ <c:choose>
	312	+ <c:when test="${negoPriceYn eq 'N'}">
	313	+ <fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
	314	+ </c:when>
	315	+ <c:otherwise>
	316	+ 0
	317	+ </c:otherwise>
	318	+ </c:choose>
312	319	</span>원
313	320	</p>
314	321	</div>
...	...	@@ -331,7 +338,14 @@
331	338	<p>포인트</p>
332	339	<p>
333	340	<span>
334		- <fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
	341	+ <c:choose>
	342	+ <c:when test="${negoPriceYn eq 'N'}">
	343	+ <fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
	344	+ </c:when>
	345	+ <c:otherwise>
	346	+ 0
	347	+ </c:otherwise>
	348	+ </c:choose>
335	349	</span>원
336	350	</p>
337	351	</div>
...	...	@@ -354,7 +368,14 @@
354	368	<p>포인트</p>
355	369	<p>
356	370	<span>
357		- <fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
	371	+ <c:choose>
	372	+ <c:when test="${negoPriceYn eq 'N'}">
	373	+ <fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
	374	+ </c:when>
	375	+ <c:otherwise>
	376	+ 0
	377	+ </c:otherwise>
	378	+ </c:choose>
358	379	</span>원
359	380	</p>
360	381	</div>
...	...	@@ -381,7 +402,14 @@
381	402	<p>포인트</p>
382	403	<p>
383	404	<span>
384		- <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
	405	+ <c:choose>
	406	+ <c:when test="${negoPriceYn eq 'N'}">
	407	+ <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
	408	+ </c:when>
	409	+ <c:otherwise>
	410	+ 0
	411	+ </c:otherwise>
	412	+ </c:choose>
385	413	</span>원
386	414	</p>
387	415	</div>

Delete comment