Commit @ae45168a319dafc5cf80f0f1e9302223d6b0c82f

itn 2023-08-29

간편결제사 세부분류 추가

@ae45168a319dafc5cf80f0f1e9302223d6b0c82f

996ef34

ae45168

src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml


 			, KGM.SVC_ID			AS svcId
 			, KGM.TRADE_ID			AS mrctTrdNo
 			, KGM.MOBILE_ID			AS trdNo
+			, IFNULL(A.SPAY_DIV, '') AS spayDiv
 		FROM
 			MJ_PG A 
 			LEFT JOIN

         	(   SELECT USER_MONEY  FROM    LETTNGNRLMBER WHERE   MBER_ID  = A.USER_ID	)  AS userMoney , /** 보유캐시 */
          	(   SELECT USER_POINT FROM    LETTNGNRLMBER WHERE   MBER_ID  = A.USER_ID	)  AS userPoint  /** 보유포인트 */
          	, mber.MBER_NM AS userName
+         	, IFNULL(A.SPAY_DIV, '') AS spayDiv
 		 FROM MJ_PG A LEFT JOIN
          	( SELECT CODE_NM ,CODE ,CODE_DC
 	           FROM    LETTCCMMNDETAILCODE

996ef34

ae45168

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp


 							</td>
 							<td>
 								<c:choose>
-									<c:when test="${result.payMethodTxt eq '신용카드'}">
+									<c:when test="${result.payMethod eq 'CARD'}">
 										<c:choose>
 											<c:when test="${not empty result.cardName}">
 												카드(<c:out value="${result.cardName}"/>)

 											</c:otherwise>
 										</c:choose>
 									</c:when>
-									<c:when test="${result.payMethodTxt eq '간편결제'}">
+									<c:when test="${result.payMethod eq 'SPAY'}">
 										<c:choose>
+											<c:when test="${not empty result.spayDiv}">
+												<c:choose>
+													<c:when test="${result.spayDiv eq 'NAV'}">
+														간편(네이버)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'KKO'}">
+														간편(카카오)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'TOS'}">
+														간편(토스)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'PYC'}">
+														간편(페이코)
+													</c:when>
+												</c:choose>
+											</c:when>																				
 											<c:when test="${not empty result.cardName}">
 												간편(<c:out value="${result.cardName}"/>)
 											</c:when>

996ef34

ae45168

src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp


 							<%-- <td><fmt:formatNumber value="${result.cancelAmt}" type="number" /><c:if test="${'8' eq result.pgStatus}"><font color="red">(오류)</font></c:if></td> --%>
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
-									<c:when test="${result.payMethodTxt eq '신용카드'}">
+									<c:when test="${result.payMethod eq 'CARD'}">
 										<c:choose>
 											<c:when test="${not empty result.cardName}">
 												카드(<c:out value="${result.cardName}"/>)

 											</c:otherwise>
 										</c:choose>
 									</c:when>
-									<c:when test="${result.payMethodTxt eq '간편결제'}">
+									<c:when test="${result.payMethod eq 'SPAY'}">
 										<c:choose>
+											<c:when test="${not empty result.spayDiv}">
+												<c:choose>
+													<c:when test="${result.spayDiv eq 'NAV'}">
+														간편(네이버)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'KKO'}">
+														간편(카카오)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'TOS'}">
+														간편(토스)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'PYC'}">
+														간편(페이코)
+													</c:when>
+												</c:choose>
+											</c:when>										
 											<c:when test="${not empty result.cardName}">
 												간편(<c:out value="${result.cardName}"/>)
 											</c:when>

996ef34

ae45168

src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp


 						<th><span class="reqArea">결제수단</span></th>
 						<td colspan="3">
 								<c:choose>
-									<c:when test="${mjonPayVO.payMethodTxt eq '신용카드'}">
+									<c:when test="${mjonPayVO.payMethod eq 'CARD'}">
 										<c:choose>
 											<c:when test="${not empty mjonPayVO.cardName}">
 												카드(<c:out value="${mjonPayVO.cardName}"/>)

 											</c:otherwise>
 										</c:choose>
 									</c:when>
-									<c:when test="${mjonPayVO.payMethodTxt eq '간편결제'}">
+									<c:when test="${mjonPayVO.payMethod eq 'SPAY'}">
 										<c:choose>
+											<c:when test="${not empty mjonPayVO.spayDiv}">
+												<c:choose>
+													<c:when test="${mjonPayVO.spayDiv eq 'NAV'}">
+														간편(네이버)
+													</c:when>
+													<c:when test="${mjonPayVO.spayDiv eq 'KKO'}">
+														간편(카카오)
+													</c:when>
+													<c:when test="${mjonPayVO.spayDiv eq 'TOS'}">
+														간편(토스)
+													</c:when>
+													<c:when test="${mjonPayVO.spayDiv eq 'PYC'}">
+														간편(페이코)
+													</c:when>
+												</c:choose>
+											</c:when>																				
 											<c:when test="${not empty mjonPayVO.cardName}">
 												간편(<c:out value="${mjonPayVO.cardName}"/>)
 											</c:when>

996ef34

ae45168

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

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

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


 								</c:choose> --%>
 							</td>
 							<td>
-								<c:out value="${result.payMethodTxt}"/><c:if test="${result.payMethod == 'SPAY'}">(<c:out value="${result.cardName}"/>)</c:if>								
-								<c:if test="${result.pgCode == 'VBANK'}">
-									(<c:out value="${result.vbankNum}"/>)
-								</c:if>
+								<c:choose>
+									<c:when test="${result.payMethod eq 'SPAY'}">
+										<c:choose>
+											<c:when test="${not empty result.spayDiv}">
+												<c:choose>
+													<c:when test="${result.spayDiv eq 'NAV'}">
+														간편결제(네이버)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'KKO'}">
+														간편결제(카카오)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'TOS'}">
+														간편결제(토스)
+													</c:when>
+													<c:when test="${result.spayDiv eq 'PYC'}">
+														간편결제(페이코)
+													</c:when>
+												</c:choose>
+											</c:when>										
+											<c:when test="${not empty result.cardName}">
+												간편결제(<c:out value="${result.cardName}"/>)
+											</c:when>
+											<c:otherwise>
+												간편결제
+											</c:otherwise>
+										</c:choose>
+									</c:when>									
+									<c:when test="${result.payMethod == 'VBANK'}">
+										<c:out value="${result.payMethodTxt}"/>
+										(<c:out value="${result.vbankNum}"/>)
+									</c:when>
+									<c:otherwise>
+										<c:out value="${result.payMethodTxt}"/>
+									</c:otherwise>
+								</c:choose>							
 							</td>
 							<td class="tRight">
 								<fmt:formatNumber value="${result.amt}" pattern=""/>

Add a comment

Open 0
Closed 0

List

...	...	@@ -114,6 +114,7 @@
114	114	, KGM.SVC_ID AS svcId
115	115	, KGM.TRADE_ID AS mrctTrdNo
116	116	, KGM.MOBILE_ID AS trdNo
	117	+ , IFNULL(A.SPAY_DIV, '') AS spayDiv
117	118	FROM
118	119	MJ_PG A
119	120	LEFT JOIN
...	...	@@ -773,6 +774,7 @@
773	774	( SELECT USER_MONEY FROM LETTNGNRLMBER WHERE MBER_ID = A.USER_ID ) AS userMoney , /** 보유캐시 */
774	775	( SELECT USER_POINT FROM LETTNGNRLMBER WHERE MBER_ID = A.USER_ID ) AS userPoint /** 보유포인트 */
775	776	, mber.MBER_NM AS userName
	777	+ , IFNULL(A.SPAY_DIV, '') AS spayDiv
776	778	FROM MJ_PG A LEFT JOIN
777	779	( SELECT CODE_NM ,CODE ,CODE_DC
778	780	FROM LETTCCMMNDETAILCODE

...	...	@@ -270,7 +270,7 @@
270	270	</td>
271	271	<td>
272	272	<c:choose>
273		- <c:when test="${result.payMethodTxt eq '신용카드'}">
	273	+ <c:when test="${result.payMethod eq 'CARD'}">
274	274	<c:choose>
275	275	<c:when test="${not empty result.cardName}">
276	276	카드(<c:out value="${result.cardName}"/>)
...	...	@@ -283,8 +283,24 @@
283	283	</c:otherwise>
284	284	</c:choose>
285	285	</c:when>
286		- <c:when test="${result.payMethodTxt eq '간편결제'}">
	286	+ <c:when test="${result.payMethod eq 'SPAY'}">
287	287	<c:choose>
	288	+ <c:when test="${not empty result.spayDiv}">
	289	+ <c:choose>
	290	+ <c:when test="${result.spayDiv eq 'NAV'}">
	291	+ 간편(네이버)
	292	+ </c:when>
	293	+ <c:when test="${result.spayDiv eq 'KKO'}">
	294	+ 간편(카카오)
	295	+ </c:when>
	296	+ <c:when test="${result.spayDiv eq 'TOS'}">
	297	+ 간편(토스)
	298	+ </c:when>
	299	+ <c:when test="${result.spayDiv eq 'PYC'}">
	300	+ 간편(페이코)
	301	+ </c:when>
	302	+ </c:choose>
	303	+ </c:when>
288	304	<c:when test="${not empty result.cardName}">
289	305	간편(<c:out value="${result.cardName}"/>)
290	306	</c:when>

...	...	@@ -417,7 +417,7 @@
417	417	<%-- <td><fmt:formatNumber value="${result.cancelAmt}" type="number" /><c:if test="${'8' eq result.pgStatus}"><font color="red">(오류)</font></c:if></td> --%>
418	418	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
419	419	<c:choose>
420		- <c:when test="${result.payMethodTxt eq '신용카드'}">
	420	+ <c:when test="${result.payMethod eq 'CARD'}">
421	421	<c:choose>
422	422	<c:when test="${not empty result.cardName}">
423	423	카드(<c:out value="${result.cardName}"/>)
...	...	@@ -430,8 +430,24 @@
430	430	</c:otherwise>
431	431	</c:choose>
432	432	</c:when>
433		- <c:when test="${result.payMethodTxt eq '간편결제'}">
	433	+ <c:when test="${result.payMethod eq 'SPAY'}">
434	434	<c:choose>
	435	+ <c:when test="${not empty result.spayDiv}">
	436	+ <c:choose>
	437	+ <c:when test="${result.spayDiv eq 'NAV'}">
	438	+ 간편(네이버)
	439	+ </c:when>
	440	+ <c:when test="${result.spayDiv eq 'KKO'}">
	441	+ 간편(카카오)
	442	+ </c:when>
	443	+ <c:when test="${result.spayDiv eq 'TOS'}">
	444	+ 간편(토스)
	445	+ </c:when>
	446	+ <c:when test="${result.spayDiv eq 'PYC'}">
	447	+ 간편(페이코)
	448	+ </c:when>
	449	+ </c:choose>
	450	+ </c:when>
435	451	<c:when test="${not empty result.cardName}">
436	452	간편(<c:out value="${result.cardName}"/>)
437	453	</c:when>

...	...	@@ -212,7 +212,7 @@
212	212	<th><span class="reqArea">결제수단</span></th>
213	213	<td colspan="3">
214	214	<c:choose>
215		- <c:when test="${mjonPayVO.payMethodTxt eq '신용카드'}">
	215	+ <c:when test="${mjonPayVO.payMethod eq 'CARD'}">
216	216	<c:choose>
217	217	<c:when test="${not empty mjonPayVO.cardName}">
218	218	카드(<c:out value="${mjonPayVO.cardName}"/>)
...	...	@@ -225,8 +225,24 @@
225	225	</c:otherwise>
226	226	</c:choose>
227	227	</c:when>
228		- <c:when test="${mjonPayVO.payMethodTxt eq '간편결제'}">
	228	+ <c:when test="${mjonPayVO.payMethod eq 'SPAY'}">
229	229	<c:choose>
	230	+ <c:when test="${not empty mjonPayVO.spayDiv}">
	231	+ <c:choose>
	232	+ <c:when test="${mjonPayVO.spayDiv eq 'NAV'}">
	233	+ 간편(네이버)
	234	+ </c:when>
	235	+ <c:when test="${mjonPayVO.spayDiv eq 'KKO'}">
	236	+ 간편(카카오)
	237	+ </c:when>
	238	+ <c:when test="${mjonPayVO.spayDiv eq 'TOS'}">
	239	+ 간편(토스)
	240	+ </c:when>
	241	+ <c:when test="${mjonPayVO.spayDiv eq 'PYC'}">
	242	+ 간편(페이코)
	243	+ </c:when>
	244	+ </c:choose>
	245	+ </c:when>
230	246	<c:when test="${not empty mjonPayVO.cardName}">
231	247	간편(<c:out value="${mjonPayVO.cardName}"/>)
232	248	</c:when>

...	...	@@ -502,10 +502,41 @@
502	502	</c:choose> --%>
503	503	</td>
504	504	<td>
505		- <c:out value="${result.payMethodTxt}"/><c:if test="${result.payMethod == 'SPAY'}">(<c:out value="${result.cardName}"/>)</c:if>
506		- <c:if test="${result.pgCode == 'VBANK'}">
507		- (<c:out value="${result.vbankNum}"/>)
508		- </c:if>
	505	+ <c:choose>
	506	+ <c:when test="${result.payMethod eq 'SPAY'}">
	507	+ <c:choose>
	508	+ <c:when test="${not empty result.spayDiv}">
	509	+ <c:choose>
	510	+ <c:when test="${result.spayDiv eq 'NAV'}">
	511	+ 간편결제(네이버)
	512	+ </c:when>
	513	+ <c:when test="${result.spayDiv eq 'KKO'}">
	514	+ 간편결제(카카오)
	515	+ </c:when>
	516	+ <c:when test="${result.spayDiv eq 'TOS'}">
	517	+ 간편결제(토스)
	518	+ </c:when>
	519	+ <c:when test="${result.spayDiv eq 'PYC'}">
	520	+ 간편결제(페이코)
	521	+ </c:when>
	522	+ </c:choose>
	523	+ </c:when>
	524	+ <c:when test="${not empty result.cardName}">
	525	+ 간편결제(<c:out value="${result.cardName}"/>)
	526	+ </c:when>
	527	+ <c:otherwise>
	528	+ 간편결제
	529	+ </c:otherwise>
	530	+ </c:choose>
	531	+ </c:when>
	532	+ <c:when test="${result.payMethod == 'VBANK'}">
	533	+ <c:out value="${result.payMethodTxt}"/>
	534	+ (<c:out value="${result.vbankNum}"/>)
	535	+ </c:when>
	536	+ <c:otherwise>
	537	+ <c:out value="${result.payMethodTxt}"/>
	538	+ </c:otherwise>
	539	+ </c:choose>
509	540	</td>
510	541	<td class="tRight">
511	542	<fmt:formatNumber value="${result.amt}" pattern=""/>

Delete comment