Commit @fd6b4a7d669a5505eaee7f41c8cd545411d8247a

itn 2023-08-29

간편결제 네이버, 카카오 페이 등 구분값 저장 추가 요금결제내역 현금영수증 의무발행대기 상태일때 세금계산서, 현금영수증, 간이영수증 신청기능 추가

요금결제내역 현금영수증 의무발행대기 상태일때 세금계산서, 현금영수증, 간이영수증 신청기능 추가

@fd6b4a7d669a5505eaee7f41c8cd545411d8247a

7827f55

fd6b4a7

src/main/java/itn/let/mjo/pay/service/MjonPayVO.java

--- src/main/java/itn/let/mjo/pay/service/MjonPayVO.java

+++ src/main/java/itn/let/mjo/pay/service/MjonPayVO.java


 	private String mrctTrdNo; 		// 상점거래번호
 	private String trdNo; 			// 모빌리언스 거래번호
 	private String spayMethod;		// 간편결제 구분값
+	private String spayDiv;			// 간편결제분류
 	
 
+	public String getSpayDiv() {
+		return spayDiv;
+	}
+
+	public void setSpayDiv(String spayDiv) {
+		this.spayDiv = spayDiv;
+	}
+
 	public String getAmtSpaySum() {
 		return amtSpaySum;
 	}

7827f55

fd6b4a7

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


 		mjonPayVO.setUserId(mjonPayVO.getUserId());
 		mjonPayVO.setFrstRegisterId(mjonPayVO.getUserId());
 		String s_paymethod = mjonPayVO.getPayMethod();
+		String spaydiv = mjonPayVO.getSpayDiv();
 		
 		if(s_paymethod.equals("CARD")){
 			s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001)       	
 		}else if(s_paymethod.equals("SPAY")){
-			s_paymethod = "간편결제" ; // 간편결제	
+			s_paymethod = "간편결제" ; // 간편결제
+			if(spaydiv.equals("NAV")){
+				s_paymethod = "간편결제(네이버페이)" ;
+			}
+			else if(spaydiv.equals("KKO")){
+				s_paymethod = "간편결제(카카오페이)" ;
+			}
+			else if(spaydiv.equals("TOS")){
+				s_paymethod = "간편결제(토스페이)" ;
+			}
+			else if(spaydiv.equals("PYC")){
+				s_paymethod = "간편결제(페이코)" ;
+			}
 		}else if(s_paymethod.equals("BANK")){
 			s_paymethod = "계좌이체" ; // 계좌이체(정상 결과코드:4000)	
 		}else if(s_paymethod.equals("CELLPHONE")){

 		
 		return mjonPayVO;
 	}
+	
+	/**
+	 * @param mjonPayVO
+	 * @return
+	 * @throws Exception
+	 * point table 값 넣기
+	 */
+	private MjonPayVO setKgmPointVO(MjonPayVO mjonPayVO) throws Exception{
+			
+			String s_paymethod = mjonPayVO.getPayMethod();
+			String spaydiv = mjonPayVO.getSpayDiv();
+			
+			if(s_paymethod.equals("CARD")){
+				s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001)       	
+			}else if(s_paymethod.equals("SPAY")){
+				s_paymethod = "간편결제" ; // 간편결제	
+				if(spaydiv.equals("NAV")){
+					s_paymethod = "간편결제(네이버페이)" ;
+				}
+				else if(spaydiv.equals("KKO")){
+					s_paymethod = "간편결제(카카오페이)" ;
+				}
+				else if(spaydiv.equals("TOS")){
+					s_paymethod = "간편결제(토스페이)" ;
+				}
+				else if(spaydiv.equals("PYC")){
+					s_paymethod = "간편결제(페이코)" ;
+				}				
+			}else if(s_paymethod.equals("BANK")){
+				s_paymethod = "계좌이체" ; // 계좌이체(정상 결과코드:4000)	
+			}else if(s_paymethod.equals("CELLPHONE")){
+				s_paymethod = "휴대폰" ; // 휴대폰(정상 결과코드:A000)	 
+			}else if(s_paymethod.equals("VBANK")){
+				s_paymethod = "가상계좌" ; // 가상계좌(정상 결과코드:4100)
+			}else if(s_paymethod.equals("SSG_BANK")){
+				s_paymethod = "SSG은행계좌" ; // SSG은행계좌(정상 결과코드:0000)
+			}else if(s_paymethod.equals("CMS_BANK")){
+				s_paymethod = "계좌간편결제" ; // 계좌간편결제(정상 결과코드:0000)
+			}else {
+				s_paymethod = "";
+			}			
+			
+			String s_amt = mjonPayVO.getAmt();
+			// 부가세별도 충전금액
+			s_amt = setCashVatNotIncluded(s_amt);
+			
+			//포인트 테이블 변수설정
+			JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();			
+			//int point = Math.round( (Float.parseFloat(s_amt)*2/100) ) ;
+			float p_i_re_point = 0; 
+			if (sysJoinSetVO != null) {
+				p_i_re_point = sysJoinSetVO.getPointPer();
+			}
+			int point = Math.round((Float.parseFloat(s_amt)*p_i_re_point/100)) ;
+			
+			mjonPayVO.setPoint(point);
+			
+			String pointMemo = s_paymethod; //포인트 메모
+			pointMemo = pointMemo + " " + point + " 충전" ;
+
+			mjonPayVO.setPointMemo(pointMemo);
+		
+		return mjonPayVO;
+	}	
 	
 	/**
 	 * @param mjonPayVO

 		mjonPayVO = this.setKgmCashVO(mjonPayVO);
 		
 		//point 값 넣기
-		mjonPayVO = this.setPointVO(mjonPayVO);
+		mjonPayVO = this.setKgmPointVO(mjonPayVO);
 		
 		
 		//PG, PGTXT, CASH , 포인트 insert / 회원정보 캐시,포인트 update

7827f55

fd6b4a7

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


 		System.out.println(mjonPayVO.getTid());
 		
 		MjonPayVO resultPayVO = mjonPayService.selectPayVO(mjonPayVO);
+
+		// Step 1. 세금계산서, 현금영수증 발행
+		TaxVO taxVO2 = new TaxVO();
+		taxVO2.setMoid(mjonPayVO.getMoid());
+		taxVO2.setRcptType("3");
+		taxService.deleteReceiptInfo(taxVO2);		
 		
+		// Step 2. 간이영수증 발행
 		TaxVO taxVO = new TaxVO();
-		
 		//간이영수증은 해당 팝업 호출 시 바로 완료처리함
 		taxVO.setMoid(mjonPayVO.getMoid());
 		taxVO.setRcptType("0"); // 발행유형-[PG결제-현금영수증 유형과 동일] 1:소득공제, 2:지출증빙, 3:의무발행, 9:세금계산서, 0:간이영수증

7827f55

fd6b4a7

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

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

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


     	String Cardname		= request.getParameter("Cardname");		/* 결제 카드사명 */
     	String chkValue		= request.getParameter("chkValue");		/* 결과값 검증 hash데이터 */
     	String spayMethod	= request.getParameter("Paymethod");	/* 지불방법 (간편결제 시에만 응답) */	
+    	String MSTR			= request.getParameter("MSTR");			//[2000byte 이하] 가맹점 전달 콜백변수
 
     	System.out.println("#############################################################");
 		System.out.println("KG MOBILIANS NotiUrl - CARD Tradeid : " + Tradeid);
+		System.out.println("KG MOBILIANS NotiUrl - CARD MSTR : " + MSTR);
 		System.out.println("KG MOBILIANS NotiUrl - CARD SpayMethod : " + spayMethod);
     	
     	String cpChkValue = "";

 		    	mjonPayVO.setAmt(Prdtprice);			// 결제금액
 				mjonPayVO.setPayMethod("SPAY");		// 결제방법
 				mjonPayVO.setSpayMethod(spayMethod);	// 간편결제 결제방법
+				mjonPayVO.setSpayDiv(MSTR);	// 간편결제분류
 				
 				mjonPayVO.setPgCode("KGM");				//
 				mjonPayVO.setGoodsName(Prdtnm);	//

 		    	mjonPayVO.setResultMsg(Resultmsg); 
 		    	mjonPayVO.setAmt(Prdtprice);			// 결제금액
 				mjonPayVO.setPayMethod("CELLPHONE");	// 결제방법
+				mjonPayVO.setSpayMethod("");	// 간편결제 결제방법
+				mjonPayVO.setSpayDiv("");	// 간편결제분류
+				
 				mjonPayVO.setPgCode("KGM");				//
 				mjonPayVO.setGoodsName(Prdtnm);	//
 				mjonPayVO.setPhone("");					// 모바일

 		    	mjonPayVO.setResultMsg(Resultmsg); 
 		    	mjonPayVO.setAmt(Prdtprice);			// 결제금액
 				mjonPayVO.setPayMethod("BANK");	// 결제방법
+				mjonPayVO.setSpayMethod("");	// 간편결제 결제방법
+				mjonPayVO.setSpayDiv("");	// 간편결제분류				
 				mjonPayVO.setPgCode("KGM");				//
 				mjonPayVO.setGoodsName(Prdtnm);	//
 				mjonPayVO.setPhone("");					// 모바일

7827f55

fd6b4a7

src/main/java/itn/let/mjo/tax/service/TaxService.java

--- src/main/java/itn/let/mjo/tax/service/TaxService.java

+++ src/main/java/itn/let/mjo/tax/service/TaxService.java


 
 	void deleteReceipts(TaxVO taxVO) throws Exception ;
 	
+	void deleteReceiptInfo(TaxVO taxVO) throws Exception ;
+	
 	int updateTaxForRefundCancle(TaxVO taxVO) throws Exception;
 	
 	void updateTaxReceiptFile(TaxVO taxVO) throws Exception;

7827f55

fd6b4a7

src/main/java/itn/let/mjo/tax/service/impl/TaxServiceImpl.java

--- src/main/java/itn/let/mjo/tax/service/impl/TaxServiceImpl.java

+++ src/main/java/itn/let/mjo/tax/service/impl/TaxServiceImpl.java


 	}
 
 	@Override
+	public void deleteReceiptInfo(TaxVO taxVO) throws Exception {
+		taxDAO.deleteReceipt(taxVO);
+	}
+	
+	@Override
 	public int updateTaxForRefundCancle(TaxVO taxVO) throws Exception {
 		return taxDAO.updateTaxForRefundCancle(taxVO);
 	}

7827f55

fd6b4a7

src/main/java/itn/let/mjo/tax/web/TaxController.java

--- src/main/java/itn/let/mjo/tax/web/TaxController.java

+++ src/main/java/itn/let/mjo/tax/web/TaxController.java


 		if("p".equals(taxVO.getDept()) && "9".equals(taxVO.getRcptType()) && "C".equals(taxVO.getTaxTrgt())) {
 			taxVO.setRegNo(egovCryptoUtil.encrypt(taxVO.getRegNo()));
 		}
+		
+		// Step 1. 세금계산서, 현금영수증 발행
+		TaxVO taxVO2 = new TaxVO();
+		taxVO2.setMoid(taxVO.getMoid());
+		taxVO2.setRcptType("3");
+		taxService.deleteReceiptInfo(taxVO2);
+		
+		// Step 2. 세금계산서, 현금영수증 발행
 		taxService.insertCashBill(taxVO);
+		
 		redirectAttributes.addFlashAttribute("message", "발행신청 완료하였습니다.");
 		RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/web/member/pay/PayList.do");
 		return redirectUrlMaker.getRedirectUrl();

7827f55

fd6b4a7

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


               BANK_CODE, BANK_NAME, RCPT_TYPE, RCPT_AUTH_CODE, RCPT_TID,
               CARRIER, MOBILE, VBANK_CODE, VBANK_NAME, VBANK_NUM,
               VBANK_EXP_DATE, CANCEL_RESULT_CODE, CANCEL_RESULT_MSG, CANCEL_AMT, CANCEL_DATE, 
-              CANCEL_TIME, CANCEL_NUM, CALC_BASE_M, AFTER_PAY_YN, SPAY_METHOD
+              CANCEL_TIME, CANCEL_NUM, CALC_BASE_M, AFTER_PAY_YN, SPAY_METHOD, SPAY_DIV
        )
        VALUES
        (

               #bankCode#, #bankName#, #rcptType#, #rcptAuthCode#, #rcptTid#,
               #carrier#, #mobile#, #vbankCode#, #vbankName#, #vbankNum#,
               #vbankExpDate#, #cancelResultCode#, #cancelResultMsg#, #cancelAmt#, #cancelDate#, 
-              #cancelTime#, #cancelNum#, #calcBaseM#, #afterPayYn#, #spayMethod#
+              #cancelTime#, #cancelNum#, #calcBaseM#, #afterPayYn#, #spayMethod#, #spayDiv#
        )
        
 	</insert>

7827f55

fd6b4a7

src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp

--- src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp

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


 		kgmPayBankRequest();		
 	} else {
 		var cnDirect = "";
+		var mstr = "";
 		if ($currentTab == 3) {
 			cnDirect = "NAV:00:N";	// 네이버페이
+			mstr = "NAV";
 		} else if ($currentTab==4) {
 			cnDirect = "KKO:00:N";	// 카카오페이
+			mstr = "KKO";
 		} else if ($currentTab==5) {
 			cnDirect = "TOS:00:N";	// 토스페이
+			mstr = "TOS";
 		} else if ($currentTab==6) {
 			cnDirect = "PYC:00:N";	// 페이코
+			mstr = "PYC";
 		}	
 		
 		// KG 모빌리언스 => SPAY(간편결제)
-		kgmPayCardRequest(cnDirect);		
+		kgmPayCardRequest(cnDirect, mstr);		
 	}	
 
 }
 
 //KG 모빌리언스 => CARD
-function kgmPayCardRequest(cnDirect) {
+function kgmPayCardRequest(cnDirect, mstr) {
 	$.ajax({
         type: "POST",
         url: "/web/member/pay/kgmCardEncodeAjax.do",

 				form.Failurl.value = data.Failurl;
 				form.Userid.value = data.Userid;
 				form.Username.value = data.Username;
-				form.MSTR.value = data.MSTR;
+				form.MSTR.value = mstr;
 				form.Payeremail.value = data.Payeremail;
 				form.Cryptyn.value = data.Cryptyn;
 				form.Cryptstring.value = data.Cryptstring;

7827f55

fd6b4a7

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:if test="${result.rcptType eq '5'}">
 													<p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
 												</c:if>
+
+												<!-- 의무발생일경우  -->												
+												<c:if test="${result.rcptType eq '3'}">
+													<c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
+														<c:if test="${result.btnChk eq 'Y'}">
+															<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
+															<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
+														</c:if>
+
+														<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
+													</c:if>
+													
+													<!-- 휴대폰결제 -->
+													<c:if test="${result.payMethod eq 'CELLPHONE'}">
+														<!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
+														<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
+													</c:if>
+												</c:if>
 											</c:if>
 											<!-- 발행완료 -->
 											<c:if test="${result.confirmYn eq 'Y'}">

7827f55

fd6b4a7

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

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

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


 		kgmPayBankRequest();		
 	} else {
 		var cnDirect = "";
+		var mstr = "";
 		if ($currentTab == 4) {
 			cnDirect = "NAV:00:N";	// 네이버페이
+			mstr = "NAV";
 		} else if ($currentTab==5) {
 			cnDirect = "KKO:00:N";	// 카카오페이
+			mstr = "KKO";
 		} else if ($currentTab==6) {
 			cnDirect = "TOS:00:N";	// 토스페이
+			mstr = "TOS";
 		} else if ($currentTab==7) {
 			cnDirect = "PYC:00:N";	// 페이코
+			mstr = "PYC";
 		}	
 		
 		// KG 모빌리언스 => SPAY(간편결제)
-		kgmPayCardRequest(cnDirect);		
+		kgmPayCardRequest(cnDirect, mstr);		
 	} 	
 }
 
 //KG 모빌리언스 => CARD
-function kgmPayCardRequest(cnDirect) {
+function kgmPayCardRequest(cnDirect, mstr) {
 	$.ajax({
         type: "POST",
         url: "/web/member/pay/kgmCardEncodeAjax.do",

 				form.Failurl.value = data.Failurl;
 				form.Userid.value = data.Userid;
 				form.Username.value = data.Username;
-				form.MSTR.value = data.MSTR;
+				form.MSTR.value = mstr;
 				form.Payeremail.value = data.Payeremail;
 				form.Cryptyn.value = data.Cryptyn;
 				form.Cryptstring.value = data.Cryptstring;

Add a comment

Open 0
Closed 0

List

...	...	@@ -256,8 +256,17 @@
256	256	private String mrctTrdNo; // 상점거래번호
257	257	private String trdNo; // 모빌리언스 거래번호
258	258	private String spayMethod; // 간편결제 구분값
	259	+ private String spayDiv; // 간편결제분류
259	260
260	261
	262	+ public String getSpayDiv() {
	263	+ return spayDiv;
	264	+ }
	265	+
	266	+ public void setSpayDiv(String spayDiv) {
	267	+ this.spayDiv = spayDiv;
	268	+ }
	269	+
261	270	public String getAmtSpaySum() {
262	271	return amtSpaySum;
263	272	}

...	...	@@ -1679,11 +1679,24 @@
1679	1679	mjonPayVO.setUserId(mjonPayVO.getUserId());
1680	1680	mjonPayVO.setFrstRegisterId(mjonPayVO.getUserId());
1681	1681	String s_paymethod = mjonPayVO.getPayMethod();
	1682	+ String spaydiv = mjonPayVO.getSpayDiv();
1682	1683
1683	1684	if(s_paymethod.equals("CARD")){
1684	1685	s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001)
1685	1686	}else if(s_paymethod.equals("SPAY")){
1686		- s_paymethod = "간편결제" ; // 간편결제
	1687	+ s_paymethod = "간편결제" ; // 간편결제
	1688	+ if(spaydiv.equals("NAV")){
	1689	+ s_paymethod = "간편결제(네이버페이)" ;
	1690	+ }
	1691	+ else if(spaydiv.equals("KKO")){
	1692	+ s_paymethod = "간편결제(카카오페이)" ;
	1693	+ }
	1694	+ else if(spaydiv.equals("TOS")){
	1695	+ s_paymethod = "간편결제(토스페이)" ;
	1696	+ }
	1697	+ else if(spaydiv.equals("PYC")){
	1698	+ s_paymethod = "간편결제(페이코)" ;
	1699	+ }
1687	1700	}else if(s_paymethod.equals("BANK")){
1688	1701	s_paymethod = "계좌이체" ; // 계좌이체(정상 결과코드:4000)
1689	1702	}else if(s_paymethod.equals("CELLPHONE")){
...	...	@@ -1703,6 +1716,70 @@
1703	1716
1704	1717	return mjonPayVO;
1705	1718	}
	1719	+
	1720	+ /**
	1721	+ * @param mjonPayVO
	1722	+ * @return
	1723	+ * @throws Exception
	1724	+ * point table 값 넣기
	1725	+ */
	1726	+ private MjonPayVO setKgmPointVO(MjonPayVO mjonPayVO) throws Exception{
	1727	+
	1728	+ String s_paymethod = mjonPayVO.getPayMethod();
	1729	+ String spaydiv = mjonPayVO.getSpayDiv();
	1730	+
	1731	+ if(s_paymethod.equals("CARD")){
	1732	+ s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001)
	1733	+ }else if(s_paymethod.equals("SPAY")){
	1734	+ s_paymethod = "간편결제" ; // 간편결제
	1735	+ if(spaydiv.equals("NAV")){
	1736	+ s_paymethod = "간편결제(네이버페이)" ;
	1737	+ }
	1738	+ else if(spaydiv.equals("KKO")){
	1739	+ s_paymethod = "간편결제(카카오페이)" ;
	1740	+ }
	1741	+ else if(spaydiv.equals("TOS")){
	1742	+ s_paymethod = "간편결제(토스페이)" ;
	1743	+ }
	1744	+ else if(spaydiv.equals("PYC")){
	1745	+ s_paymethod = "간편결제(페이코)" ;
	1746	+ }
	1747	+ }else if(s_paymethod.equals("BANK")){
	1748	+ s_paymethod = "계좌이체" ; // 계좌이체(정상 결과코드:4000)
	1749	+ }else if(s_paymethod.equals("CELLPHONE")){
	1750	+ s_paymethod = "휴대폰" ; // 휴대폰(정상 결과코드:A000)
	1751	+ }else if(s_paymethod.equals("VBANK")){
	1752	+ s_paymethod = "가상계좌" ; // 가상계좌(정상 결과코드:4100)
	1753	+ }else if(s_paymethod.equals("SSG_BANK")){
	1754	+ s_paymethod = "SSG은행계좌" ; // SSG은행계좌(정상 결과코드:0000)
	1755	+ }else if(s_paymethod.equals("CMS_BANK")){
	1756	+ s_paymethod = "계좌간편결제" ; // 계좌간편결제(정상 결과코드:0000)
	1757	+ }else {
	1758	+ s_paymethod = "";
	1759	+ }
	1760	+
	1761	+ String s_amt = mjonPayVO.getAmt();
	1762	+ // 부가세별도 충전금액
	1763	+ s_amt = setCashVatNotIncluded(s_amt);
	1764	+
	1765	+ //포인트 테이블 변수설정
	1766	+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
	1767	+ //int point = Math.round( (Float.parseFloat(s_amt)*2/100) ) ;
	1768	+ float p_i_re_point = 0;
	1769	+ if (sysJoinSetVO != null) {
	1770	+ p_i_re_point = sysJoinSetVO.getPointPer();
	1771	+ }
	1772	+ int point = Math.round((Float.parseFloat(s_amt)*p_i_re_point/100)) ;
	1773	+
	1774	+ mjonPayVO.setPoint(point);
	1775	+
	1776	+ String pointMemo = s_paymethod; //포인트 메모
	1777	+ pointMemo = pointMemo + " " + point + " 충전" ;
	1778	+
	1779	+ mjonPayVO.setPointMemo(pointMemo);
	1780	+
	1781	+ return mjonPayVO;
	1782	+ }
1706	1783
1707	1784	/**
1708	1785	* @param mjonPayVO
...	...	@@ -2086,7 +2163,7 @@
2086	2163	mjonPayVO = this.setKgmCashVO(mjonPayVO);
2087	2164
2088	2165	//point 값 넣기
2089		- mjonPayVO = this.setPointVO(mjonPayVO);
	2166	+ mjonPayVO = this.setKgmPointVO(mjonPayVO);
2090	2167
2091	2168
2092	2169	//PG, PGTXT, CASH , 포인트 insert / 회원정보 캐시,포인트 update

...	...	@@ -2823,9 +2823,15 @@
2823	2823	System.out.println(mjonPayVO.getTid());
2824	2824
2825	2825	MjonPayVO resultPayVO = mjonPayService.selectPayVO(mjonPayVO);
	2826	+
	2827	+ // Step 1. 세금계산서, 현금영수증 발행
	2828	+ TaxVO taxVO2 = new TaxVO();
	2829	+ taxVO2.setMoid(mjonPayVO.getMoid());
	2830	+ taxVO2.setRcptType("3");
	2831	+ taxService.deleteReceiptInfo(taxVO2);
2826	2832
	2833	+ // Step 2. 간이영수증 발행
2827	2834	TaxVO taxVO = new TaxVO();
2828		-
2829	2835	//간이영수증은 해당 팝업 호출 시 바로 완료처리함
2830	2836	taxVO.setMoid(mjonPayVO.getMoid());
2831	2837	taxVO.setRcptType("0"); // 발행유형-[PG결제-현금영수증 유형과 동일] 1:소득공제, 2:지출증빙, 3:의무발행, 9:세금계산서, 0:간이영수증

...	...	@@ -450,9 +450,11 @@
450	450	String Cardname = request.getParameter("Cardname"); /* 결제 카드사명 */
451	451	String chkValue = request.getParameter("chkValue"); /* 결과값 검증 hash데이터 */
452	452	String spayMethod = request.getParameter("Paymethod"); /* 지불방법 (간편결제 시에만 응답) */
	453	+ String MSTR = request.getParameter("MSTR"); //[2000byte 이하] 가맹점 전달 콜백변수
453	454
454	455	System.out.println("#############################################################");
455	456	System.out.println("KG MOBILIANS NotiUrl - CARD Tradeid : " + Tradeid);
	457	+ System.out.println("KG MOBILIANS NotiUrl - CARD MSTR : " + MSTR);
456	458	System.out.println("KG MOBILIANS NotiUrl - CARD SpayMethod : " + spayMethod);
457	459
458	460	String cpChkValue = "";
...	...	@@ -594,6 +596,7 @@
594	596	mjonPayVO.setAmt(Prdtprice); // 결제금액
595	597	mjonPayVO.setPayMethod("SPAY"); // 결제방법
596	598	mjonPayVO.setSpayMethod(spayMethod); // 간편결제 결제방법
	599	+ mjonPayVO.setSpayDiv(MSTR); // 간편결제분류
597	600
598	601	mjonPayVO.setPgCode("KGM"); //
599	602	mjonPayVO.setGoodsName(Prdtnm); //
...	...	@@ -993,6 +996,9 @@
993	996	mjonPayVO.setResultMsg(Resultmsg);
994	997	mjonPayVO.setAmt(Prdtprice); // 결제금액
995	998	mjonPayVO.setPayMethod("CELLPHONE"); // 결제방법
	999	+ mjonPayVO.setSpayMethod(""); // 간편결제 결제방법
	1000	+ mjonPayVO.setSpayDiv(""); // 간편결제분류
	1001	+
996	1002	mjonPayVO.setPgCode("KGM"); //
997	1003	mjonPayVO.setGoodsName(Prdtnm); //
998	1004	mjonPayVO.setPhone(""); // 모바일
...	...	@@ -1415,6 +1421,8 @@
1415	1421	mjonPayVO.setResultMsg(Resultmsg);
1416	1422	mjonPayVO.setAmt(Prdtprice); // 결제금액
1417	1423	mjonPayVO.setPayMethod("BANK"); // 결제방법
	1424	+ mjonPayVO.setSpayMethod(""); // 간편결제 결제방법
	1425	+ mjonPayVO.setSpayDiv(""); // 간편결제분류
1418	1426	mjonPayVO.setPgCode("KGM"); //
1419	1427	mjonPayVO.setGoodsName(Prdtnm); //
1420	1428	mjonPayVO.setPhone(""); // 모바일

...	...	@@ -14,6 +14,8 @@
14	14
15	15	void deleteReceipts(TaxVO taxVO) throws Exception ;
16	16
	17	+ void deleteReceiptInfo(TaxVO taxVO) throws Exception ;
	18	+
17	19	int updateTaxForRefundCancle(TaxVO taxVO) throws Exception;
18	20
19	21	void updateTaxReceiptFile(TaxVO taxVO) throws Exception;

...	...	@@ -57,6 +57,11 @@
57	57	}
58	58
59	59	@Override
	60	+ public void deleteReceiptInfo(TaxVO taxVO) throws Exception {
	61	+ taxDAO.deleteReceipt(taxVO);
	62	+ }
	63	+
	64	+ @Override
60	65	public int updateTaxForRefundCancle(TaxVO taxVO) throws Exception {
61	66	return taxDAO.updateTaxForRefundCancle(taxVO);
62	67	}

...	...	@@ -268,7 +268,16 @@
268	268	if("p".equals(taxVO.getDept()) && "9".equals(taxVO.getRcptType()) && "C".equals(taxVO.getTaxTrgt())) {
269	269	taxVO.setRegNo(egovCryptoUtil.encrypt(taxVO.getRegNo()));
270	270	}
	271	+
	272	+ // Step 1. 세금계산서, 현금영수증 발행
	273	+ TaxVO taxVO2 = new TaxVO();
	274	+ taxVO2.setMoid(taxVO.getMoid());
	275	+ taxVO2.setRcptType("3");
	276	+ taxService.deleteReceiptInfo(taxVO2);
	277	+
	278	+ // Step 2. 세금계산서, 현금영수증 발행
271	279	taxService.insertCashBill(taxVO);
	280	+
272	281	redirectAttributes.addFlashAttribute("message", "발행신청 완료하였습니다.");
273	282	RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/web/member/pay/PayList.do");
274	283	return redirectUrlMaker.getRedirectUrl();

...	...	@@ -632,7 +632,7 @@
632	632	BANK_CODE, BANK_NAME, RCPT_TYPE, RCPT_AUTH_CODE, RCPT_TID,
633	633	CARRIER, MOBILE, VBANK_CODE, VBANK_NAME, VBANK_NUM,
634	634	VBANK_EXP_DATE, CANCEL_RESULT_CODE, CANCEL_RESULT_MSG, CANCEL_AMT, CANCEL_DATE,
635		- CANCEL_TIME, CANCEL_NUM, CALC_BASE_M, AFTER_PAY_YN, SPAY_METHOD
	635	+ CANCEL_TIME, CANCEL_NUM, CALC_BASE_M, AFTER_PAY_YN, SPAY_METHOD, SPAY_DIV
636	636	)
637	637	VALUES
638	638	(
...	...	@@ -644,7 +644,7 @@
644	644	#bankCode#, #bankName#, #rcptType#, #rcptAuthCode#, #rcptTid#,
645	645	#carrier#, #mobile#, #vbankCode#, #vbankName#, #vbankNum#,
646	646	#vbankExpDate#, #cancelResultCode#, #cancelResultMsg#, #cancelAmt#, #cancelDate#,
647		- #cancelTime#, #cancelNum#, #calcBaseM#, #afterPayYn#, #spayMethod#
	647	+ #cancelTime#, #cancelNum#, #calcBaseM#, #afterPayYn#, #spayMethod#, #spayDiv#
648	648	)
649	649
650	650	</insert>

...	...	@@ -353,24 +353,29 @@
353	353	kgmPayBankRequest();
354	354	} else {
355	355	var cnDirect = "";
	356	+ var mstr = "";
356	357	if ($currentTab == 3) {
357	358	cnDirect = "NAV:00:N"; // 네이버페이
	359	+ mstr = "NAV";
358	360	} else if ($currentTab==4) {
359	361	cnDirect = "KKO:00:N"; // 카카오페이
	362	+ mstr = "KKO";
360	363	} else if ($currentTab==5) {
361	364	cnDirect = "TOS:00:N"; // 토스페이
	365	+ mstr = "TOS";
362	366	} else if ($currentTab==6) {
363	367	cnDirect = "PYC:00:N"; // 페이코
	368	+ mstr = "PYC";
364	369	}
365	370
366	371	// KG 모빌리언스 => SPAY(간편결제)
367		- kgmPayCardRequest(cnDirect);
	372	+ kgmPayCardRequest(cnDirect, mstr);
368	373	}
369	374
370	375	}
371	376
372	377	//KG 모빌리언스 => CARD
373		-function kgmPayCardRequest(cnDirect) {
	378	+function kgmPayCardRequest(cnDirect, mstr) {
374	379	$.ajax({
375	380	type: "POST",
376	381	url: "/web/member/pay/kgmCardEncodeAjax.do",
...	...	@@ -394,7 +399,7 @@
394	399	form.Failurl.value = data.Failurl;
395	400	form.Userid.value = data.Userid;
396	401	form.Username.value = data.Username;
397		- form.MSTR.value = data.MSTR;
	402	+ form.MSTR.value = mstr;
398	403	form.Payeremail.value = data.Payeremail;
399	404	form.Cryptyn.value = data.Cryptyn;
400	405	form.Cryptstring.value = data.Cryptstring;

...	...	@@ -557,6 +557,24 @@
557	557	<c:if test="${result.rcptType eq '5'}">
558	558	<p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
559	559	</c:if>
	560	+
	561	+ <!-- 의무발생일경우 -->
	562	+ <c:if test="${result.rcptType eq '3'}">
	563	+ <c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
	564	+ <c:if test="${result.btnChk eq 'Y'}">
	565	+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
	566	+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
	567	+ </c:if>
	568	+
	569	+ <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
	570	+ </c:if>
	571	+
	572	+ <!-- 휴대폰결제 -->
	573	+ <c:if test="${result.payMethod eq 'CELLPHONE'}">
	574	+ <!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
	575	+ <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
	576	+ </c:if>
	577	+ </c:if>
560	578	</c:if>
561	579	<!-- 발행완료 -->
562	580	<c:if test="${result.confirmYn eq 'Y'}">

...	...	@@ -292,23 +292,28 @@
292	292	kgmPayBankRequest();
293	293	} else {
294	294	var cnDirect = "";
	295	+ var mstr = "";
295	296	if ($currentTab == 4) {
296	297	cnDirect = "NAV:00:N"; // 네이버페이
	298	+ mstr = "NAV";
297	299	} else if ($currentTab==5) {
298	300	cnDirect = "KKO:00:N"; // 카카오페이
	301	+ mstr = "KKO";
299	302	} else if ($currentTab==6) {
300	303	cnDirect = "TOS:00:N"; // 토스페이
	304	+ mstr = "TOS";
301	305	} else if ($currentTab==7) {
302	306	cnDirect = "PYC:00:N"; // 페이코
	307	+ mstr = "PYC";
303	308	}
304	309
305	310	// KG 모빌리언스 => SPAY(간편결제)
306		- kgmPayCardRequest(cnDirect);
	311	+ kgmPayCardRequest(cnDirect, mstr);
307	312	}
308	313	}
309	314
310	315	//KG 모빌리언스 => CARD
311		-function kgmPayCardRequest(cnDirect) {
	316	+function kgmPayCardRequest(cnDirect, mstr) {
312	317	$.ajax({
313	318	type: "POST",
314	319	url: "/web/member/pay/kgmCardEncodeAjax.do",
...	...	@@ -332,7 +337,7 @@
332	337	form.Failurl.value = data.Failurl;
333	338	form.Userid.value = data.Userid;
334	339	form.Username.value = data.Username;
335		- form.MSTR.value = data.MSTR;
	340	+ form.MSTR.value = mstr;
336	341	form.Payeremail.value = data.Payeremail;
337	342	form.Cryptyn.value = data.Cryptyn;
338	343	form.Cryptstring.value = data.Cryptstring;

Delete comment