This commit is contained in:
2025-05-15 09:50:04 +08:00
szülő 8c067d8178
commit bb97693578
2 fájl változott, egészen pontosan 16 új sor hozzáadva és 9 régi sor törölve
@@ -3212,7 +3212,6 @@ public class ProductService {
desFee = 11 + 11 + 11 * (number - 3); desFee = 11 + 11 + 11 * (number - 3);
} }
} }
for (Product product : priceList) { for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + desFee)); product.setPrice(Math.ceil(product.getPrice() + desFee));
} }
@@ -26,6 +26,10 @@ public class PosterPrice {
double price = 0.0; double price = 0.0;
String weight = "0"; String weight = "0";
DecimalFormat DecimalFormat = new DecimalFormat("#.#####"); DecimalFormat DecimalFormat = new DecimalFormat("#.#####");
double areas = area;
if (area < 40 * 50 / 10000.0) {
areas = area * number;
}
switch (kind2) { switch (kind2) {
// 室内写真裱冷板 // 室内写真裱冷板
case "0": case "0":
@@ -37,7 +41,7 @@ public class PosterPrice {
} else { } else {
danjia = 52; danjia = 52;
} }
price = area * danjia > 72 ? area * danjia : 72; price = Math.max(areas * danjia, 72);
break; break;
// 室内写真对裱冷板 // 室内写真对裱冷板
@@ -50,7 +54,7 @@ public class PosterPrice {
} else { } else {
danjia = 80; danjia = 80;
} }
price = area * danjia > 95 ? area * danjia : 95; price = Math.max(areas * danjia, 95);
break; break;
// 室内写真裱冷板装小C边 // 室内写真裱冷板装小C边
case "3": case "3":
@@ -62,7 +66,7 @@ public class PosterPrice {
} else { } else {
danjia = 75; danjia = 75;
} }
price = area * danjia > 90 ? area * danjia : 90; price = Math.max(areas * danjia, 90);
break; break;
// 户外写真裱冷板 // 户外写真裱冷板
case "6": case "6":
@@ -74,7 +78,7 @@ public class PosterPrice {
} else { } else {
danjia = 75; danjia = 75;
} }
price = area * danjia > 90 ? area * danjia : 90; price = Math.max(areas * danjia, 90);
break; break;
// 户外写真对裱冷板 // 户外写真对裱冷板
case "7": case "7":
@@ -86,7 +90,7 @@ public class PosterPrice {
} else { } else {
danjia = 85; danjia = 85;
} }
price = area * danjia > 90 ? area * danjia : 90; price = Math.max(areas * danjia, 90);
break; break;
// 户外写真裱冷板装小C边 // 户外写真裱冷板装小C边
case "8": case "8":
@@ -98,7 +102,7 @@ public class PosterPrice {
} else { } else {
danjia = 90; danjia = 90;
} }
price = area * danjia > 90 ? area * danjia : 90; price = Math.max(areas * danjia, 90);
break; break;
// 背胶单裱3mmPVC(户内高清) // 背胶单裱3mmPVC(户内高清)
case "12": case "12":
@@ -110,7 +114,7 @@ public class PosterPrice {
} else { } else {
danjia = 95; danjia = 95;
} }
price = area * danjia > 105 ? area * danjia : 105; price = Math.max(areas * danjia, 105);
break; break;
} }
Product pro = new Product(); Product pro = new Product();
@@ -295,6 +299,10 @@ public class PosterPrice {
break; break;
} }
if (!"24".equals(kind2)) { if (!"24".equals(kind2)) {
double area_jis = area;
if (width * length < 40 * 50) {
area_jis = area_jis * number;
}
if ("8".equals(kind2) && width * length < 40 * 50) { if ("8".equals(kind2) && 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 {
@@ -305,7 +313,7 @@ public class PosterPrice {
break; break;
} }
} }
price = Math.max(area * danjia, min_price); price = Math.max(area_jis * danjia, min_price);
} }
} }