Commit @9b9f867c71a59ead7b9385149b52eeaf56427d6f

rosewiper 2024-02-06

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

@9b9f867c71a59ead7b9385149b52eeaf56427d6f

2a2bebf

9b9f867

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;

 		umVO.setMberId(mjVO.getUserId());
 		umVO.setCash((float)mjVO.getCash());
 		
+		MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
+		
 		// point 값 넣기
 		mjonPayVO = this.setAdvPointVO(umVO);
 

2a2bebf

9b9f867

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

2a2bebf

9b9f867

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 			, 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

2a2bebf

9b9f867

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

...	...	@@ -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;
...	...	@@ -2571,6 +2575,8 @@
2571	2575	umVO.setMberId(mjVO.getUserId());
2572	2576	umVO.setCash((float)mjVO.getCash());
2573	2577
	2578	+ MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId());
	2579	+
2574	2580	// point 값 넣기
2575	2581	mjonPayVO = this.setAdvPointVO(umVO);
2576	2582

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

...	...	@@ -2120,6 +2120,7 @@
2120	2120	, PICTURE2_PRICE AS picture2Price
2121	2121	, PICTURE3_PRICE AS picture3Price
2122	2122	, KAKAO_AT_PRICE AS kakaoAtPrice
	2123	+ , KAKAO_FT_PRICE AS kakaoFtPrice
2123	2124	, FAX_PRICE AS faxPrice
2124	2125	, USER_MONEY AS userMoney
2125	2126	, USER_POINT AS userPoint

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