From 9b9f867c71a59ead7b9385149b52eeaf56427d6f Mon Sep 17 00:00:00 2001 From: rosewiper Date: Tue, 6 Feb 2024 14:55:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=9B=84=EB=B6=88=EC=A0=9C=EA=B3=A0?= =?UTF-8?q?=EA=B0=9D=20=ED=98=91=EC=9D=98=20=EB=8B=A8=EA=B0=80=EA=B0=80=20?= =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=ED=8F=AC=EC=9D=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=81=EB=A6=BD=EC=9D=B4=20=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/impl/MjonPayServiceImpl.java | 6 ++++ .../let/mjo/pay/web/MjonPayController.java | 18 ++++++++++ .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 1 + .../WEB-INF/jsp/web/pay/PayUserSWList.jsp | 36 ++++++++++++++++--- 4 files changed, 57 insertions(+), 4 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 252dd2b6..55d612d8 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 @@ -31,6 +31,7 @@ import itn.let.mjo.event.service.MjonEventVO; 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; @@ -59,6 +60,9 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP @Resource(name="taxDAO") private TaxDAO taxDAO; + + @Resource(name="MjonMsgDataDAO") + private MjonMsgDataDAO mjonMsgDataDAO; @Resource(name = "egovMjonCashIdGnrService") private EgovIdGnrService idgenMjonCashId; @@ -2571,6 +2575,8 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP umVO.setMberId(mjVO.getUserId()); umVO.setCash((float)mjVO.getCash()); + MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId()); + // point 값 넣기 mjonPayVO = this.setAdvPointVO(umVO); diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index dfefc82b..152a69cc 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2675,6 +2675,24 @@ public class MjonPayController { 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); + } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 9520f659..c7716bb3 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -2120,6 +2120,7 @@ , 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 diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp index c3bad9a2..28ac2512 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp @@ -308,7 +308,14 @@ function fnRevDetailPop03(msgGroupId){

포인트

- + + + + + + 0 + + 원

@@ -331,7 +338,14 @@ function fnRevDetailPop03(msgGroupId){

포인트

- + + + + + + 0 + + 원

@@ -354,7 +368,14 @@ function fnRevDetailPop03(msgGroupId){

포인트

- + + + + + + 0 + + 원

@@ -381,7 +402,14 @@ function fnRevDetailPop03(msgGroupId){

포인트

- + + + + + + 0 + + 원

From 1e2c13dca75d5937db26db0d42c74e486a6bed9d Mon Sep 17 00:00:00 2001 From: rosewiper Date: Tue, 6 Feb 2024 15:57:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=9B=84=EB=B6=88=EC=A0=9C=20=ED=98=91?= =?UTF-8?q?=EC=9D=98=EB=8B=A8=EA=B0=80=20=ED=9A=8C=EC=9B=90=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EC=A0=81=EB=A6=BD=20=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/impl/MjonPayServiceImpl.java | 43 ++++++++++++++++--- 1 file changed, 36 insertions(+), 7 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 55d612d8..454aac10 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 @@ -2574,17 +2574,46 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP UserManageVO umVO = new UserManageVO(); umVO.setMberId(mjVO.getUserId()); umVO.setCash((float)mjVO.getCash()); + + /* + * 후불고객 포인트 적립 기능 변경 + * 후불고객 중 협의단가를 적용받는 고객은 포인트 적립을 받지 않는다고 함 (장건영 팀장) + * 2024.02.06일 변경처리 우영두 + * + * */ + + //회원 협의 단가 정보 조회 MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(mjVO.getUserId()); - // point 값 넣기 - mjonPayVO = this.setAdvPointVO(umVO); - - //POINT 테이블 - mjonPayDAO.insertPoint(mjonPayVO); + 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); + + } - //회원정보 POINT 업데이트 - mjonPayDAO.updateMemberPoint(mjonPayVO); } /** From 24c49361449fbd35dde8f8432f51a362b2ada733 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Tue, 6 Feb 2024 16:44:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=2020?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EB=8F=99=EB=AC=B8=EC=9E=90=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC=20=20?= =?UTF-8?q?-=20=EC=B5=9C=EA=B7=BC=20=EB=B0=9C=EC=86=A1=EB=82=B4=EC=97=AD,?= =?UTF-8?q?=20=EC=9E=90=EC=A3=BC=EB=B3=B4=EB=82=B4=EB=8A=94=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EB=A1=9D=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgcampain/web/MjonMsgCampainTWDataController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java index f1041ed3..838763ae 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java @@ -530,7 +530,7 @@ public class MjonMsgCampainTWDataController { model.addAttribute("symbolList", symbolList); //최근 전송 내역 - Calendar cal = Calendar.getInstance(); + /*Calendar cal = Calendar.getInstance(); Date now = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); @@ -542,11 +542,11 @@ public class MjonMsgCampainTWDataController { 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 */