From 174657ac2c53b6cc2cef7057dac0e16dbb29a603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Mon, 27 Apr 2026 11:51:18 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=94=84=EB=A1=9C=EB=AA=A8=EC=85=98?= =?UTF-8?q?=20>=20=ED=95=A0=EC=9D=B8=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D/=EB=B3=B5=EC=82=AC/=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=98=9C=ED=83=9D=20(=ED=95=A0?= =?UTF-8?q?=EC=9D=B8)=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 739cd09e1a6f436ee1958825d32db630e97b9505) --- .../purchs/service/BOPurchsEvtService.java | 17 +- .../controller/PurchsEvtController.java | 8 - .../gcone/promtn/purchs/BOPurchsMapper.xml | 167 +++++++++--------- .../mngr/promtn/purchs/PurchsEvtDtlUpdtU.jsp | 8 +- 4 files changed, 87 insertions(+), 113 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java index 89209b00..9576b7b1 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/service/BOPurchsEvtService.java @@ -309,22 +309,8 @@ public class BOPurchsEvtService { } } - // 사은품 이벤트 + // 사은품 이벤트 } else if ("02".equals(purchsEvtVO.getEvtDv())) { - - -/* - if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteGiftList()))) { - log.debug(" 삭제 리스트 확인 purchsEvtVO . get getDeleteGiftList : {}", purchsEvtVO.getDeleteGiftList()); - for (String deleteGiftInnb : purchsEvtVO.getDeleteGiftList()) { - log.debug("deleteGiftInnb : {}", deleteGiftInnb); - purchsEvtVO.setDeleteGiftInnb(Integer.parseInt(deleteGiftInnb)); - mapper.deleteBOPurchsEvtGiftDel(purchsEvtVO); - } - } -*/ - - if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteBnefList()))) { log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", (Object) purchsEvtVO.getDeleteBnefList()); for (String deleteBnefInnb : purchsEvtVO.getDeleteBnefList()) { @@ -334,7 +320,6 @@ public class BOPurchsEvtService { } } - if (purchsEvtVO.getDiscountBnefVOList() != null && !purchsEvtVO.getDiscountBnefVOList().isEmpty()) { log.debug("사은품 혜택 진입"); for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) { diff --git a/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java b/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java index 222ac8ff..03b3cf4e 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/promtn/purchs/controller/PurchsEvtController.java @@ -393,14 +393,6 @@ public class PurchsEvtController { tempVO.setEndAmt(null); } - if ("01".equals(purchsEvtVO.getDscntBnefDvCd())) { - tempVO.setBgnAmt("0"); - tempVO.setEndAmt("0"); - } else if ("02".equals(purchsEvtVO.getDscntBnefDvCd())) { - tempVO.setBgnCnt("0"); - tempVO.setEndCnt("0"); - } - } for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) { diff --git a/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml index 3f6240d1..a9963bce 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml @@ -374,106 +374,103 @@ SOPMAL_CD, EVT_INNB, ]]> - - BGN_CNT, - - - END_CNT, - - - BGN_AMT, - - - END_AMT, - - - PROVD_CNT, - - - ADIT_DSCNT_CD, - - - ADIT_DSCNT_AMT, - - - DSCNT_MXMM_AMT, - - - MLG_ACCML_CD, - - - MLG_ACCML_AMT, - - - MLG_VALID_MT_CNT, - - + BGN_CNT, + + + END_CNT, + + + BGN_AMT, + + + END_AMT, + + + PROVD_CNT, + + + ADIT_DSCNT_CD, + + + ADIT_DSCNT_AMT, + + + DSCNT_MXMM_AMT, + + + MLG_ACCML_CD, + + + MLG_ACCML_AMT, + + + MLG_VALID_MT_CNT, + + - - REPLACE(#{bgnCnt}, ',', ''), - - - REPLACE(#{endCnt}, ',', ''), - - - REPLACE(#{bgnAmt}, ',', ''), - - - REPLACE(#{endAmt}, ',', ''), - - - #{provdCnt}, - - - #{aditDscntCd}, - - - REPLACE(#{aditDscntAmt}, ',', ''), - - - REPLACE(#{dscntMxmmAmt}, ',', ''), - - - #{mlgAccmlCd}, - - - REPLACE(#{mlgAccmlAmt}, ',', ''), - - - REPLACE(#{mlgValidMtCnt}, ',', ''), - + REPLACE(#{bgnCnt}, ',', ''), + + REPLACE(#{endCnt}, ',', ''), + + + REPLACE(#{bgnAmt}, ',', ''), + + + REPLACE(#{endAmt}, ',', ''), + + + #{provdCnt}, + + + #{aditDscntCd}, + + + REPLACE(#{aditDscntAmt}, ',', ''), + + + REPLACE(#{dscntMxmmAmt}, ',', ''), + + + #{mlgAccmlCd}, + + + REPLACE(#{mlgAccmlAmt}, ',', ''), + + + REPLACE(#{mlgValidMtCnt}, ',', ''), + diff --git a/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtDtlUpdtU.jsp b/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtDtlUpdtU.jsp index 4c230421..49aee211 100644 --- a/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtDtlUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtDtlUpdtU.jsp @@ -1998,18 +1998,18 @@ since : 2024-01-30 추지훈 최초 생성 - 개 이상 ~ - 개 미만 - ${curUnit} 이상 ~ - ${curUnit} 미만