From da0109a6026b6cfbb853f0b4691490db2e09c02f Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 25 Aug 2023 16:04:27 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=ED=95=98=EA=B8=B0>=EC=B6=A9?= =?UTF-8?q?=EC=A0=84,=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AC=B8=EA=B5=AC?= =?UTF-8?q?=20=EB=B0=8F=20=ED=98=84=EA=B8=88=EC=98=81=EC=88=98=EC=A6=9D=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=9D=B8=EC=84=9C=ED=8A=B8=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/impl/MjonPayServiceImpl.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 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 f70f0537..f6460f56 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 @@ -1682,6 +1682,8 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP if(s_paymethod.equals("CARD")){ s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001) + }else if(s_paymethod.equals("SPAY")){ + s_paymethod = "간편결제" ; // 간편결제 }else if(s_paymethod.equals("BANK")){ s_paymethod = "계좌이체" ; // 계좌이체(정상 결과코드:4000) }else if(s_paymethod.equals("CELLPHONE")){ @@ -1711,6 +1713,24 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP private MjonPayVO setPointVO(MjonPayVO mjonPayVO) throws Exception{ String s_paymethod = mjonPayVO.getPayMethod(); + if(s_paymethod.equals("CARD")){ + s_paymethod = "신용카드" ; // 신용카드(정상 결과코드:3001) + }else if(s_paymethod.equals("SPAY")){ + 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); @@ -2080,8 +2100,8 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP //세금계산서,현금영수증 자동발행 체크 / 자동발행 'N'이며 10만원 이상 결제시 현금영수증 의무발행 //String uniqId = mberManageDAO.selectUniqId(mjonPayVO.getUserId()); MberManageVO mberManageVO = mberManageDAO.selectMber(mjonPayVO.getUserId()); //멤버ID에서 유니크ID로 수정 필요 - // 세금계산서 자동발행이고,카드결제가 아닐경우에만 자동발행 - if(("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) && !"CARD".equals(mjonPayVO.getPayMethod())) { + // 세금계산서 자동발행이고,카드결제, 간편결제가 아닐경우에만 자동발행 + if(("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) && !"CARD".equals(mjonPayVO.getPayMethod()) && !"SPAY".equals(mjonPayVO.getPayMethod())) { TaxVO taxVO = new TaxVO(); /*발행타입 1:소득공제 현금영수증 2:지출증빙 현금영수증 9:세금계산서*/ @@ -2121,7 +2141,7 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP } } //세금계산서 자동발행 설정이 아니면서, 결제금액이 10만원 이상인 경우 현금영수증 의무발행 데이터 등록 필요 - if("N".equals(mberManageVO.getTaxbillAuto()) && Integer.parseInt(mjonPayVO.getAmt()) >= 100000 && !"CARD".equals(mjonPayVO.getPayMethod())) { + if("N".equals(mberManageVO.getTaxbillAuto()) && Integer.parseInt(mjonPayVO.getAmt()) >= 100000 && !"CARD".equals(mjonPayVO.getPayMethod()) && !"SPAY".equals(mjonPayVO.getPayMethod())) { //결제금액이 10만원 넘는 경우 : 현금영수증 의무발행 요청 등록 TaxVO taxVO = new TaxVO();