edit

src/main/java/lingtao/net/service/ProductService.java

@@ -1089,7 +1089,9 @@ public class ProductService {
 
                         for (Product product : priceList) {
                             // 服装吊牌里面的600克吊牌把价格*1.3倍
-                            product.setPrice(Math.floor(product.getPrice() * 1.3));
+                            if (!("6".equals(kind) && "无".equals(kind2) && area <= 0.00486)) {
+                                product.setPrice(Math.floor(product.getPrice() * 1.3));
+                            }
                             if ("4".equals(kind)) {
                                 // 服装吊牌里面的900克吊牌把价格
                                 if (product.getCount() <= 2000) {

src/main/java/lingtao/net/util/PosterPrice.java

@@ -30,6 +30,7 @@ public class PosterPrice {
         if (area < 40 * 50 / 10000.0) {
             areas = area * number;
         }
+        double miniprice = 0;
         switch (kind2) {
             // 室内写真裱冷板
             case "0":
@@ -41,7 +42,8 @@ public class PosterPrice {
                 } else {
                     danjia = 52;
                 }
-                price = Math.max(areas * danjia, 72);
+                miniprice += 72;
+                price = Math.max(areas * danjia, miniprice);
 
                 break;
             // 室内写真对裱冷板
@@ -54,7 +56,8 @@ public class PosterPrice {
                 } else {
                     danjia = 80;
                 }
-                price = Math.max(areas * danjia, 95);
+                miniprice += 95;
+                price = Math.max(areas * danjia, miniprice);
                 break;
             // 室内写真裱冷板装小C边
             case "3":
@@ -66,7 +69,8 @@ public class PosterPrice {
                 } else {
                     danjia = 75;
                 }
-                price = Math.max(areas * danjia, 90);
+                miniprice += 90;
+                price = Math.max(areas * danjia, miniprice);
                 break;
             // 户外写真裱冷板
             case "6":
@@ -78,7 +82,8 @@ public class PosterPrice {
                 } else {
                     danjia = 75;
                 }
-                price = Math.max(areas * danjia, 90);
+                miniprice += 90;
+                price = Math.max(areas * danjia, miniprice);
                 break;
             // 户外写真对裱冷板
             case "7":
@@ -90,7 +95,8 @@ public class PosterPrice {
                 } else {
                     danjia = 85;
                 }
-                price = Math.max(areas * danjia, 90);
+                miniprice += 90;
+                price = Math.max(areas * danjia, miniprice);
                 break;
             // 户外写真裱冷板装小C边
             case "8":
@@ -102,7 +108,8 @@ public class PosterPrice {
                 } else {
                     danjia = 90;
                 }
-                price = Math.max(areas * danjia, 90);
+                miniprice += 90;
+                price = Math.max(areas * danjia, miniprice);
                 break;
             // 背胶单裱3mmPVC(户内高清）
             case "12":
@@ -114,7 +121,8 @@ public class PosterPrice {
                 } else {
                     danjia = 95;
                 }
-                price = Math.max(areas * danjia, 105);
+                miniprice += 105;
+                price = Math.max(areas * danjia, miniprice);
                 break;
         }
         Product pro = new Product();
@@ -158,7 +166,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10, 20, 50};
                 prices = new double[]{50, 45, 32, 28, 25};
                 last_price = 23;
-                min_price = 50;
+                min_price += 50;
                 // 根据面积得到单价
                 break;
             // pp纸(室内)
@@ -166,7 +174,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10};
                 prices = new double[]{62, 45, 35};
                 last_price = 28;
-                min_price = 70;
+                min_price += 70;
 
                 weight = String.valueOf(DecimalFormat.format(area * 0.113 * number));
                 break;
@@ -176,7 +184,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10};
                 prices = new double[]{70, 55, 45};
                 last_price = 40;
-                min_price = 100;
+                min_price += 100;
                 weight = String.valueOf(DecimalFormat.format(area * 0.113 * number));
                 break;
             // 高精室内相纸
@@ -185,7 +193,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10};
                 prices = new double[]{70, 60, 45};
                 last_price = 40;
-                min_price = 90;
+                min_price += 90;
                 break;
             // 单透
             case "7":
@@ -193,7 +201,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10};
                 prices = new double[]{75, 65, 55};
                 last_price = 45;
-                min_price = 100;
+                min_price += 100;
                 break;
             // 静电贴
             case "8":
@@ -201,7 +209,7 @@ public class PosterPrice {
                 areas = new double[]{1, 2, 5, 10};
                 prices = new double[]{70, 68, 65, 63};
                 last_price = 60;
-                min_price = 50;
+                min_price += 50;
                 break;
             // 软膜
             case "14":
@@ -209,7 +217,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{70, 65};
                 last_price = 60;
-                min_price = 100;
+                min_price += 100;
                 weight = String.valueOf(DecimalFormat.format(area * 0.113 * number));
                 break;
             // 地贴（复防滑膜）
@@ -218,7 +226,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{75, 65};
                 last_price = 55;
-                min_price = 100;
+                min_price += 100;
 
                 weight = String.valueOf(DecimalFormat.format(area * 0.113 * number));
                 break;
@@ -228,7 +236,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{160, 150};
                 last_price = 140;
-                min_price = 160;
+                min_price += 160;
 
                 break;
             // UV高透车贴（不含白墨）
@@ -237,7 +245,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{150, 140};
                 last_price = 130;
-                min_price = 160;
+                min_price += 160;
 
                 break;
             // 高透贴
@@ -246,7 +254,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{110, 100};
                 last_price = 90;
-                min_price = 130;
+                min_price += 130;
 
                 break;
             // 防撞条腰线UV透明喷膜（含白墨）
@@ -255,7 +263,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{130, 130};
                 last_price = 110;
-                min_price = 80;
+                min_price += 80;
 
                 break;
             // 防撞条腰线UV磨砂贴（含白墨）
@@ -264,7 +272,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{140, 130};
                 last_price = 120;
-                min_price = 80;
+                min_price += 80;
 
                 break;
             // 防撞条腰线粗哑膜磨砂贴（不含白墨）
@@ -273,7 +281,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{115, 105};
                 last_price = 100;
-                min_price = 80;
+                min_price += 80;
 
                 break;
             // 防撞条腰线磨砂镂空（粗哑膜刻字）
@@ -282,7 +290,7 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{150, 140};
                 last_price = 130;
-                min_price = 100;
+                min_price += 100;
 
                 break;
             // 防撞条腰线即时贴刻字
@@ -291,11 +299,11 @@ public class PosterPrice {
                 areas = new double[]{5, 10};
                 prices = new double[]{120, 110};
                 last_price = 100;
-                min_price = 70;
+                min_price += 70;
 
                 break;
             case "24":
-                price = area * 380 > 380 ? area * 380 : 380;
+                price = area * 380 > 380 + 15 ? area * 380 : 380 + 15;
                 break;
         }
         if (!"24".equals(kind2)) {
@@ -356,7 +364,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 7, 8, 10, 20, 50};
                 prices = new double[]{55, 45, 40, 37, 31, 29, 27};
                 last_price = 26;
-                min_price = 50;
+                min_price += 50 + 15;
                 // 根据面积得到单价
                 weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
                 break;
@@ -366,7 +374,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 7, 8, 10, 20, 50};
                 prices = new double[]{55, 45, 40, 37, 31, 29, 27};
                 last_price = 26;
-                min_price = 50;
+                min_price += 50 + 15;
                 weight = String.valueOf(DecimalFormat.format(area * 0.25 * number));
                 break;
             // 户外写真可移白胶、黑胶
@@ -375,7 +383,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10,};
                 prices = new double[]{60, 55, 50};
                 last_price = 35;
-                min_price = 50;
+                min_price += 50 + 15;
 
                 weight = String.valueOf(DecimalFormat.format(area * 0.14 * number));
                 break;
@@ -385,7 +393,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10,};
                 prices = new double[]{65, 50, 45};
                 last_price = 35;
-                min_price = 80;
+                min_price += 80;
 
                 break;
             // 户外写真灯片
@@ -394,7 +402,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10,};
                 prices = new double[]{68, 50, 40};
                 last_price = 30;
-                min_price = 90;
+                min_price += 90;
 
 
                 break;
@@ -404,7 +412,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10,};
                 prices = new double[]{50, 40, 30};
                 last_price = 25;
-                min_price = 80;
+                min_price += 80;
 
                 weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
                 break;
@@ -481,7 +489,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 10,};
                 prices = new double[]{30, 28, 25};
                 last_price = 23;
-                min_price = 50;
+                min_price = 50 + 15;
 
                 break;
             // 双喷布
@@ -504,7 +512,7 @@ public class PosterPrice {
                 } else {
                     danjia = 65;
                 }
-                price = area * danjia > 50 ? area * danjia : 50;
+                price = area * danjia > 50 + 15 ? area * danjia : 50 + 15;
 
                 // 挂轴 每米12元
                 if ("挂轴".equals(craftBu)) {

src/main/java/lingtao/net/util/PriceUtils.java

@@ -3234,19 +3234,19 @@ public class PriceUtils {
             areas = new double[]{5, 10,};
             prices = new double[]{20, 18};
             last_price = 17;
-            min_price = 55;
+            min_price = 55 + 15;
 
         } else if ("12".equals(kind)) {
             areas = new double[]{5, 10,};
             prices = new double[]{16, 12};
             last_price = 10;
-            min_price = 50;
+            min_price = 50 + 15;
 
         } else {
             areas = new double[]{5, 10,};
             prices = new double[]{24, 20};
             last_price = 18;
-            min_price = 60;
+            min_price = 60 + 15;
 
         }
 

src/main/webapp/views/product/poster.jsp

@@ -1066,7 +1066,7 @@
                 $(".dengxiang").find(":input").attr("disabled", false);
             }
             $(".zdt_xiezhen").hide();
-            if (data.value == 8) {
+            if (kindValue == 1 && data.value == 8) {
                 $(".zdt_xiezhen").show();
             }
             form.render();