From 3e430345ab79afc29e8ed68c0f6ee976030c5ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=9A=B1?= Date: Fri, 10 Apr 2026 16:56:21 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EB=A3=8C(=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=EB=B6=80)=20=EA=B3=84=EC=82=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcone/goods/purchs/service/BOOrderService.java | 8 ++++---- .../gcone/goods/purchs/service/BOPurchsService.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java index f72c9ad0..7871967d 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java @@ -375,8 +375,8 @@ public class BOOrderService { // 금액 조건 if ("Y".equals(itemAmtCndUseAt)) { - // subSlepric(금액)이 무료배송 금액조건보다 클 경우 [상품 기준] - if (subSlepric.compareTo(itemAmtCndAditAmt) > 0) { + // subSlepric(금액)이 무료배송 금액조건보다 크거나 같을 경우 [상품 기준] + if (subSlepric.compareTo(itemAmtCndAditAmt) >= 0) { itemDlvyAmt = new BigDecimal(0); } } @@ -385,8 +385,8 @@ public class BOOrderService { if ("Y".equals(itemCntCndUseAt)) { BigDecimal qy = new BigDecimal(String.valueOf(goodsMap.get("qy"))); // 수량 - // qy(수량)이 무료배송 수량조건보다 클 경우 [상품 기준] - if (qy.compareTo(itemCntCndAditAmt) > 0) { + // qy(수량)이 무료배송 수량조건보다 크거나 같을 경우 [상품 기준] + if (qy.compareTo(itemCntCndAditAmt) >= 0) { itemDlvyAmt = new BigDecimal(0); } } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java index 97c16c63..c8cd875d 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java @@ -2215,7 +2215,7 @@ public class BOPurchsService { // BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액 BigDecimal slepric = (BigDecimal) goodsMap.get("subSlepric"); // 판매가 * 수량 - if (slepric.compareTo(amtCndAditAmt) > 0) { + if (slepric.compareTo(amtCndAditAmt) >= 0) { dlvyAmt = new BigDecimal(0); } // else { @@ -2229,7 +2229,7 @@ public class BOPurchsService { // BigDecimal cntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 금액조건 추가금액 BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량 - if (qy.compareTo(cntCndAditAmt) > 0) { + if (qy.compareTo(cntCndAditAmt) >= 0) { dlvyAmt = new BigDecimal(0); } // else { @@ -2519,7 +2519,7 @@ public class BOPurchsService { BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액 BigDecimal slepric = (BigDecimal) goodsMap.get("subSlepric"); // 판매가 * 수량 - if (slepric.compareTo(amtCndAditAmt) > 0) { + if (slepric.compareTo(amtCndAditAmt) >= 0) { dlvyAmt = new BigDecimal(0); } } @@ -2528,7 +2528,7 @@ public class BOPurchsService { BigInteger cntCndAditAmt = (BigInteger) shippingGrouping.get("cntCndAditAmt"); // 금액조건 추가금액 BigInteger qy = (BigInteger) goodsMap.get("qy"); // 수량 - if (cntCndAditAmt.intValue() < qy.intValue()) { + if (cntCndAditAmt.intValue() <= qy.intValue()) { dlvyAmt = new BigDecimal(0); } } @@ -2544,7 +2544,7 @@ public class BOPurchsService { if (bundleDlvyCndAmt != null && bundleDlvyCndAmt.intValue() > 0) { BigDecimal subSlepric = goodsByDlvyGroupList.stream().map(o -> (BigDecimal) o.get("subSlepric")).reduce(BigDecimal.ZERO, BigDecimal::add); // 합 (판매가 * 수량) - if (subSlepric.compareTo(bundleDlvyCndAmt) > 0) { + if (subSlepric.compareTo(bundleDlvyCndAmt) >= 0) { dlvyAmt = new BigDecimal(0); } }