这个提交包含在:
2025-04-09 10:34:35 +08:00
父节点 8250ce13d1
当前提交 11c1d3edfa
修改 2 个文件,包含 17 行新增17 行删除
+12 -12
查看文件
@@ -295,9 +295,9 @@ public class PosterPrice {
break; break;
} }
if (!"24".equals(kind2)) { if (!"24".equals(kind2)) {
if (width * length < 40 * 50) { // if (width * length < 40 * 50) {
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); // price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
} else { // } else {
danjia = last_price; danjia = last_price;
for (int i = 0; i < areas.length; i++) { for (int i = 0; i < areas.length; i++) {
if (area <= areas[i]) { if (area <= areas[i]) {
@@ -306,7 +306,7 @@ public class PosterPrice {
} }
} }
price = Math.max(area * danjia, min_price); price = Math.max(area * danjia, min_price);
} // }
} }
Product pro = new Product(); Product pro = new Product();
@@ -401,9 +401,9 @@ public class PosterPrice {
weight = String.valueOf(DecimalFormat.format(area * 0.24 * number)); weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
break; break;
} }
if (width * length < 40 * 50) { // if (width * length < 40 * 50) {
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); // price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
} else { // } else {
danjia = last_price; danjia = last_price;
for (int i = 0; i < areas.length; i++) { for (int i = 0; i < areas.length; i++) {
if (area <= areas[i]) { if (area <= areas[i]) {
@@ -412,7 +412,7 @@ public class PosterPrice {
} }
} }
price = Math.max(area * danjia, min_price); price = Math.max(area * danjia, min_price);
} // }
Product pro = new Product(); Product pro = new Product();
List<Product> list = new ArrayList<Product>(); List<Product> list = new ArrayList<Product>();
pro.setCount(count); pro.setCount(count);
@@ -585,9 +585,9 @@ public class PosterPrice {
break; break;
} }
if (!"7".equals(kind2) && !"10".equals(kind2)) { if (!"7".equals(kind2) && !"10".equals(kind2)) {
if (width * length < 40 * 50) { // if (width * length < 40 * 50) {
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); // price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
} else { // } else {
danjia = last_price; danjia = last_price;
for (int i = 0; i < areas.length; i++) { for (int i = 0; i < areas.length; i++) {
if (area <= areas[i]) { if (area <= areas[i]) {
@@ -596,7 +596,7 @@ public class PosterPrice {
} }
} }
price = Math.max(area * danjia, min_price); price = Math.max(area * danjia, min_price);
} // }
} }
@@ -1008,7 +1008,7 @@ public class PriceUtils {
int count_index = Arrays.binarySearch(count_list, count_item); int count_index = Arrays.binarySearch(count_list, count_item);
price = 0; price = 0;
if (count_index >= 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 product = new Product();
product.setCount(count_item); product.setCount(count_item);
@@ -3248,9 +3248,9 @@ public class PriceUtils {
} }
if (width * length < 40 * 50) { // if (width * length < 40 * 50) {
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price); // price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
} else { // } else {
dj = last_price; dj = last_price;
for (int i = 0; i < areas.length; i++) { for (int i = 0; i < areas.length; i++) {
if (area <= areas[i]) { if (area <= areas[i]) {
@@ -3259,7 +3259,7 @@ public class PriceUtils {
} }
} }
price = Math.max(area * dj, min_price); price = Math.max(area * dj, min_price);
} // }
if (number > 1 && width * length >= 40 * 50) { if (number > 1 && width * length >= 40 * 50) {
pro.setPrice(Math.ceil(price * number)); pro.setPrice(Math.ceil(price * number));