diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index dc1194f..a09f673 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -437,12 +437,13 @@ public class ProductService { } } - if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind)) { + if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind) && !("插旗".equals(dto.getStickerKind()) && "铜版纸不干胶".equals(kind))) { for (Product product : priceList) { product.setPrice(Math.ceil(product.getPrice() * 1.2)); } } + if (priceList.size() >= 3) { priceList = priceList.subList(0, 3); } @@ -506,6 +507,11 @@ public class ProductService { } } } + if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind) && "铜版纸不干胶".equals(kind)) { + for (Product product : priceList) { + product.setPrice(Math.ceil(product.getPrice() * 1.3)); + } + } } if (!StringUtils.isEmpty(dto.getCraft())) { diff --git a/src/main/webapp/views/product/chaqi.jsp b/src/main/webapp/views/product/chaqi.jsp index 43cfbb4..5584660 100644 --- a/src/main/webapp/views/product/chaqi.jsp +++ b/src/main/webapp/views/product/chaqi.jsp @@ -421,6 +421,7 @@ <%@include file="/views/copyResult.jsp" %>