zhuyiyi 7 months ago
parent
commit
66c8b1be0d

+ 18 - 18
src/main/java/lingtao/net/util/PosterPrice.java

@@ -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);
 //            }
         }
 

+ 4 - 2
src/main/webapp/views/product/stickers.jsp

@@ -906,7 +906,6 @@
 
             if (data.value == "0") {
                 $(".ui_guagua").show();
-
                 $(".ui_guagua").removeAttr('disabled');
             } else {
                 $(".ui_guagua").hide();
@@ -966,7 +965,9 @@
                 $(".ui_guaguasize2").hide();
                 $(".ui_toothpick").hide();
             }
-
+            if (data.value == 0) {
+                $(".caiqie").show();
+            }
             if (data.value == "美纹纸") {
                 $(".meiwenzhiQie").show();
             } else {
@@ -1718,6 +1719,7 @@
                             yaqian = $("select[name='toothpick_size'] option:selected").val() + '厘米';
                             craft_list.push(yaqian)
                         }
+                        craft_list.push($("input[name='craftQie']:checked").val())
                         craft_list.push(...craftMo)
                         craft_list.push(...aotu)
                         craft_list.push(...tangjin)