diff --git a/src/main/java/lingtao/net/util/PosterPrice.java b/src/main/java/lingtao/net/util/PosterPrice.java index a692ed7..f12cd8a 100644 --- a/src/main/java/lingtao/net/util/PosterPrice.java +++ b/src/main/java/lingtao/net/util/PosterPrice.java @@ -295,9 +295,9 @@ public class PosterPrice { break; } if (!"24".equals(kind2)) { - if (width * length < 40 * 50) { - price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); - } else { +// 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]) { @@ -306,7 +306,7 @@ public class PosterPrice { } } price = Math.max(area * danjia, min_price); - } +// } } Product pro = new Product(); @@ -401,9 +401,9 @@ 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 { +// 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]) { @@ -412,7 +412,7 @@ public class PosterPrice { } } price = Math.max(area * danjia, min_price); - } +// } Product pro = new Product(); List list = new ArrayList(); pro.setCount(count); @@ -585,9 +585,9 @@ 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 { +// 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]) { @@ -596,7 +596,7 @@ public class PosterPrice { } } 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 fbe42fd..fb9602c 100644 --- a/src/main/java/lingtao/net/util/PriceUtils.java +++ b/src/main/java/lingtao/net/util/PriceUtils.java @@ -1008,7 +1008,7 @@ public class PriceUtils { int count_index = Arrays.binarySearch(count_list, count_item); price = 0; if (count_index >= 0) { - price = new PriceUtils().TablePrice(area * 1000, prices[count_index], areas); + price = new PriceUtils().TablePrice(area * 10000, prices[count_index], areas); } Product product = new Product(); product.setCount(count_item); @@ -3248,9 +3248,9 @@ public class PriceUtils { } - if (width * length < 40 * 50) { - price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); - } else { +// 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]) { @@ -3259,7 +3259,7 @@ public class PriceUtils { } } price = Math.max(area * dj, min_price); - } +// } if (number > 1 && width * length >= 40 * 50) { pro.setPrice(Math.ceil(price * number));