diff --git a/src/main/java/lingtao/net/util/PosterPrice.java b/src/main/java/lingtao/net/util/PosterPrice.java index fbd398a..0eb82e5 100644 --- a/src/main/java/lingtao/net/util/PosterPrice.java +++ b/src/main/java/lingtao/net/util/PosterPrice.java @@ -417,18 +417,18 @@ public class PosterPrice { weight = String.valueOf(DecimalFormat.format(area * 0.24 * number)); break; } -// if (width * length < 40 * 50) { -// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); -// } else { - danjia = last_price; - for (int i = 0; i < areas.length; i++) { - if (area <= areas[i]) { - danjia = prices[i]; - break; + if (width * length < 40 * 50) { + price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); + } else { + danjia = last_price; + for (int i = 0; i < areas.length; i++) { + if (area <= areas[i]) { + danjia = prices[i]; + break; + } } + price = Math.max(area * danjia, min_price); } - price = Math.max(area * danjia, min_price); -// } Product pro = new Product(); List list = new ArrayList(); pro.setCount(count); @@ -601,18 +601,18 @@ public class PosterPrice { break; } if (!"7".equals(kind2) && !"10".equals(kind2)) { -// if (width * length < 40 * 50) { -// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); -// } else { - danjia = last_price; - for (int i = 0; i < areas.length; i++) { - if (area <= areas[i]) { - danjia = prices[i]; - break; + if (width * length < 40 * 50) { + price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); + } else { + danjia = last_price; + for (int i = 0; i < areas.length; i++) { + if (area <= areas[i]) { + danjia = prices[i]; + break; + } } + price = Math.max(area * danjia, min_price); } - price = Math.max(area * danjia, min_price); -// } } diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java index 20a4125..4594cc5 100644 --- a/src/main/java/lingtao/net/util/PriceUtils.java +++ b/src/main/java/lingtao/net/util/PriceUtils.java @@ -3242,18 +3242,18 @@ public class PriceUtils { } -// if (width * length < 40 * 50) { -// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); -// } else { - dj = last_price; - for (int i = 0; i < areas.length; i++) { - if (area <= areas[i]) { - dj = prices[i]; - break; + if (width * length < 40 * 50) { + price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); + } else { + dj = last_price; + for (int i = 0; i < areas.length; i++) { + if (area <= areas[i]) { + dj = prices[i]; + break; + } } + price = Math.max(area * dj, min_price); } - price = Math.max(area * dj, min_price); -// } if (number > 1 && width * length >= 40 * 50) { pro.setPrice(Math.ceil(price * number)); diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp index 6c36b37..2158497 100644 --- a/src/main/webapp/views/product/specialCard2.jsp +++ b/src/main/webapp/views/product/specialCard2.jsp @@ -186,7 +186,7 @@