|
|
@@ -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 ("8".equals(kind2) && 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();
|
|
|
@@ -404,14 +404,14 @@ public class PosterPrice {
|
|
|
// 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;
|
|
|
- }
|
|
|
+ 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<Product> list = new ArrayList<Product>();
|
|
|
@@ -588,14 +588,14 @@ public class PosterPrice {
|
|
|
// 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;
|
|
|
- }
|
|
|
+ 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);
|
|
|
// }
|
|
|
}
|
|
|
|