|
@@ -295,9 +295,9 @@ public class PosterPrice {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
if (!"24".equals(kind2)) {
|
|
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;
|
|
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) {
|
|
|
|
|
- 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;
|
|
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) {
|
|
|
|
|
- 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;
|
|
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);
|
|
|
- }
|
|
|
|
|
|
|
+// }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|