zhuyiyi hace 7 meses
padre
commit
bb97693578

+ 0 - 1
src/main/java/lingtao/net/service/ProductService.java

@@ -3212,7 +3212,6 @@ public class ProductService {
                                         desFee = 11 + 11 + 11 * (number - 3);
                                     }
                                 }
-
                                 for (Product product : priceList) {
                                     product.setPrice(Math.ceil(product.getPrice() + desFee));
                                 }

+ 16 - 8
src/main/java/lingtao/net/util/PosterPrice.java

@@ -26,6 +26,10 @@ public class PosterPrice {
         double price = 0.0;
         String weight = "0";
         DecimalFormat DecimalFormat = new DecimalFormat("#.#####");
+        double areas = area;
+        if (area < 40 * 50 / 10000.0) {
+            areas = area * number;
+        }
         switch (kind2) {
             // 室内写真裱冷板
             case "0":
@@ -37,7 +41,7 @@ public class PosterPrice {
                 } else {
                     danjia = 52;
                 }
-                price = area * danjia > 72 ? area * danjia : 72;
+                price = Math.max(areas * danjia, 72);
 
                 break;
             // 室内写真对裱冷板
@@ -50,7 +54,7 @@ public class PosterPrice {
                 } else {
                     danjia = 80;
                 }
-                price = area * danjia > 95 ? area * danjia : 95;
+                price = Math.max(areas * danjia, 95);
                 break;
             // 室内写真裱冷板装小C边
             case "3":
@@ -62,7 +66,7 @@ public class PosterPrice {
                 } else {
                     danjia = 75;
                 }
-                price = area * danjia > 90 ? area * danjia : 90;
+                price = Math.max(areas * danjia, 90);
                 break;
             // 户外写真裱冷板
             case "6":
@@ -74,7 +78,7 @@ public class PosterPrice {
                 } else {
                     danjia = 75;
                 }
-                price = area * danjia > 90 ? area * danjia : 90;
+                price = Math.max(areas * danjia, 90);
                 break;
             // 户外写真对裱冷板
             case "7":
@@ -86,7 +90,7 @@ public class PosterPrice {
                 } else {
                     danjia = 85;
                 }
-                price = area * danjia > 90 ? area * danjia : 90;
+                price = Math.max(areas * danjia, 90);
                 break;
             // 户外写真裱冷板装小C边
             case "8":
@@ -98,7 +102,7 @@ public class PosterPrice {
                 } else {
                     danjia = 90;
                 }
-                price = area * danjia > 90 ? area * danjia : 90;
+                price = Math.max(areas * danjia, 90);
                 break;
             // 背胶单裱3mmPVC(户内高清)
             case "12":
@@ -110,7 +114,7 @@ public class PosterPrice {
                 } else {
                     danjia = 95;
                 }
-                price = area * danjia > 105 ? area * danjia : 105;
+                price = Math.max(areas * danjia, 105);
                 break;
         }
         Product pro = new Product();
@@ -295,6 +299,10 @@ public class PosterPrice {
                 break;
         }
         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) {
                 price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
             } else {
@@ -305,7 +313,7 @@ public class PosterPrice {
                         break;
                     }
                 }
-                price = Math.max(area * danjia, min_price);
+                price = Math.max(area_jis * danjia, min_price);
             }
         }