diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 9883ff9..79fa6fe 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -2842,24 +2842,21 @@ public class ProductService { } maxPrice = 60; } - price = Math.max(Math.ceil((length * width * count * unitPrice) / 10000), maxPrice);//价格计算尺寸*数量*200/10000 + price = Math.max(Math.ceil((length * width * count * unitPrice) / 10000) * number, maxPrice);//价格计算尺寸*数量*200/10000 if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("编码")) {//起步价10 - price += Math.max(count * 0.5, 10); + price += Math.max(count * 0.5 * number, 10); } if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("打孔")) { - price += Math.max(count * 0.2, 10); + price += Math.max(count * 0.2 * number, 10); } if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("手撕线")) { - price += Math.max(count * 0.2, 10); + price += Math.max(count * 0.2 * number, 10); } if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("压痕")) { - price += Math.max(count * 0.2, 10); + price += Math.max(count * 0.2 * number, 10); } - price = price * number;//款数翻倍 - price = Math.max(price, 50); - if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("装opp袋")) { price += Math.ceil(Math.max(count * 0.15 * number, 5)); } @@ -3206,7 +3203,7 @@ public class ProductService { if (dto.getP() == 1) { desFee = 0.6; } else if (dto.getP() == 2 || dto.getP() == 3) { - desFee = 0.8; + desFee = 1; } else if (dto.getP() == 4) { desFee = 1.2; } else if (dto.getP() == 5) { @@ -5393,7 +5390,11 @@ public class ProductService { } else if (count <= 2000) { rate_item = 0.85; } - price = Math.ceil(result.getData().getPrice() / (1 - 0.7) / base_count * count * rate_item); + if ("18".equals(dto.getKindValue()) && count < 10) { + price = 150; + } else { + price = Math.ceil(result.getData().getPrice() / (1 - 0.7) / base_count * count * rate_item); + } } else { for (int i = 0; i < counts.length; i++) { if (counts[i] < count) {