diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index bee8446..5894300 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -2483,7 +2483,7 @@ public class ProductService { double baseCount = Math.max(Math.ceil(dto.getCount() * dto.getNumber() / num), 1); double countNum = Math.max(Math.ceil(dto.getNumber() / num), 1); - int coNumber = dto.getCo_number(); + int coNumber = dto.getCo_number() == null ? 1 : dto.getCo_number(); if (coNumber <= 0) { coNumber = 1; } diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java index f53a7b9..74f10b1 100644 --- a/src/main/java/lingtao/net/util/PriceUtils.java +++ b/src/main/java/lingtao/net/util/PriceUtils.java @@ -1568,7 +1568,7 @@ public class PriceUtils { } if (!StringUtils.isEmpty(zhuan)) { - if ("烫金".equals(zhuan[0]) || "烫银".equals(zhuan[0]) || "烫蓝".equals(zhuan[0]) || "烫红".equals(zhuan[0]) || "烫黑".equals(zhuan[0]) || "玫瑰金".equals(zhuan[0])) { + if ("烫金".equals(zhuan[0]) || "烫银".equals(zhuan[0]) || "烫蓝".equals(zhuan[0]) || "烫红".equals(zhuan[0]) || "烫黑".equals(zhuan[0]) || "玫瑰金".equals(zhuan[0]) || "镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0])) { // 起步价+58元 price = price + (40 * area); price = price > 80 ? price : 80; @@ -1579,9 +1579,6 @@ public class PriceUtils { } else if ("双面贴".equals(zhuan[0])) { price = price + (40 * area); price = price > 80 ? price : 80; - } else if ("镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0])) { - price = price + (50 * area); - price = price > 80 ? price : 80; } } Product pro = new Product(); @@ -1596,7 +1593,7 @@ public class PriceUtils { int oldCount = count; - if (!StringUtils.isEmpty(zhuan) && ("专金".equals(zhuan[0]) || "专银".equals(zhuan[0]) || "印刷+烫金".equals(zhuan[0]) || "印刷+烫银".equals(zhuan[0]) || "镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0])) && count < 100) { + if (!StringUtils.isEmpty(zhuan) && ("专金".equals(zhuan[0]) || "专银".equals(zhuan[0]) || "印刷+烫金".equals(zhuan[0]) || "印刷+烫银".equals(zhuan[0])) && count < 100) { // 烫金100个起 count = 100; } @@ -3636,10 +3633,13 @@ public class PriceUtils { if (count > 0) { if (count <= 5) { price += 200; - } else if (count < 100) { + } else if (count < 75) { price += 14 * count + banfei; } else { - price += 12 * count; + if (count < 89) { + count = 89; + } + price += 14 * count; } } diff --git a/src/main/webapp/views/product/antifake.jsp b/src/main/webapp/views/product/antifake.jsp index 6a7d6e3..de7037d 100644 --- a/src/main/webapp/views/product/antifake.jsp +++ b/src/main/webapp/views/product/antifake.jsp @@ -25,6 +25,7 @@