|
|
@@ -207,7 +207,7 @@ public class PosterPrice {
|
|
|
case "8":
|
|
|
// 根据面积得到单价
|
|
|
areas = new double[]{1, 2, 5, 10};
|
|
|
- prices = new double[]{70, 68, 65, 63};
|
|
|
+ prices = new double[]{80, 68, 65, 63};
|
|
|
last_price = 60;
|
|
|
min_price += 50;
|
|
|
break;
|
|
|
@@ -311,18 +311,18 @@ public class PosterPrice {
|
|
|
if (width * length < 40 * 50) {
|
|
|
area_jis = area_jis * number;
|
|
|
}
|
|
|
- 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]) {
|
|
|
- danjia = prices[i];
|
|
|
- break;
|
|
|
- }
|
|
|
+// 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]) {
|
|
|
+ danjia = prices[i];
|
|
|
+ break;
|
|
|
}
|
|
|
- price = Math.max(area_jis * danjia, min_price);
|
|
|
}
|
|
|
+ price = Math.max(area_jis * danjia, min_price);
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
Product pro = new Product();
|
|
|
@@ -332,7 +332,7 @@ public class PosterPrice {
|
|
|
if (number > 1 && width * length >= 40 * 50) {
|
|
|
pro.setPrice(Math.ceil(price * number));
|
|
|
} else {
|
|
|
- pro.setPrice(Math.ceil(price));
|
|
|
+ pro.setPrice(Math.ceil(price ));
|
|
|
}
|
|
|
pro.setWeight(weight);
|
|
|
list.add(pro);
|