胶带新增材质

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

@@ -818,20 +818,21 @@ public class ProductService {
                         }
                         return priceList;
                     }
-
-                    if (!"7".equals(dto.getKind()) && !"8".equals(dto.getKind()) && !"1".equals(dto.getKind())) {
-                        if ((length < 4 || width < 4)) {
-                            for (int i = 0; i < dto.getCraft().length; i++) {
-                                if ("直角裁切".equals(dto.getCraft()[i])) {
-                                    dto.getCraft()[i] = "模切";
-                                }
-                            }
-                        }
-                    }
                     int min = getNum(length, width);
                     String[] kind_list = {"3", "4", "5", "7"};
                     dto.setD("");
-                    priceList = getHekaPrice(min, dto, priceList, count);
+                    if (!"7".equals(dto.getKind()) && !"8".equals(dto.getKind()) && !"1".equals(dto.getKind())) {
+                        if ((length < 4 || width < 4)) {
+                            Product product = new Product();
+                            product.setProTypeValue("3");
+                            product.setCount(dto.getCount());
+                            product.setKindValue("0");
+                            priceList = productMapper.getThanPrice(product);
+                        }
+                    }
+                    if (priceList.size() == 0) {
+                        priceList = getHekaPrice(min, dto, priceList, count);
+                    }
                     boolean isyaofeng = false;
 
                     double moqiePrice = 0;
@@ -4900,6 +4901,25 @@ public class ProductService {
             };
             count_list = new int[]{10, 20, 30, 40, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000};
         }
+        if ("4".equals(dto.getKind())) {
+            prices = new double[][]{
+                    {362, 678},
+                    {423, 802},
+                    {507, 980},
+                    {545, 1033},
+                    {643, 1225},
+            };
+            if (carftList.contains("满底全彩")) {
+                prices = new double[][]{
+                        {422, 832},
+                        {472, 922},
+                        {534, 1072},
+                        {575, 1160},
+                        {665, 1363},
+                };
+            }
+            count_list = new int[]{50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000};
+        }
         List<Product> list = new ArrayList<>();
         double last_price = 0;
         int last_count = 0;