现在银平光吃吃

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

@@ -1453,10 +1453,10 @@ public class ProductService {
                 double addPrice = 5;
 
                 List<String> craft_list = dto.getCraft() != null ? new ArrayList<>(Arrays.asList(dto.getCraft())) : new ArrayList<>();
-                if (craft_list.contains("压痕") && ((width <= 10 && length <= 7) || (width <= 7 && length <= 10))) {
+//                if (craft_list.contains("压痕") && ((width <= 10 && length <= 7) || (width <= 7 && length <= 10))) {
-                    craft_list.remove("压痕");
+//                    craft_list.remove("压痕");
-                    craft_list.add("异形模切");
+//                    craft_list.add("异形模切");
-                }
+//                }
                 if (!craft_list.isEmpty()) {
                     dto.setCraft(craft_list.toArray(new String[craft_list.size()]));
                 }
@@ -4729,6 +4729,68 @@ public class ProductService {
 
                 return priceList;
             case "定制衫":
+                return getClotherPrice(dto, width, length);
+            case "手绘":
+                return getShouhuiPrice(dto, width, length);
+            case "奖牌":
+                return getMedalPrice(dto, width, length);
+            case "防伪标":
+                return getantiLabelPrice(dto, width, length);
+            case "透卡":
+                return getPETPrice(dto, width, length);
+            case "澜达海报":
+                return getDalanPrice(dto, width, length);
+            case "水标":
+                return getShuibiaoPrice(dto, length, width);
+            case "镭射吊牌":
+                return getLeiseDiaoPrice(dto, length, width);
+            case "刻字车贴":
+                return getCheTiePrice(dto, length, width);
+            case "胶带":
+                return getJiadaoPrice(dto, length, width);
+            case "特光不干胶":
+                return getLightPrice(dto, length, width);
+            case "淋膜纸":
+                return getLingmoPrice(dto, width, length);
+            case "香薰卡":
+                return getaromatherapyPrice(dto, width, length);
+            case "金属微章":
+                return getbadgePrice(dto, width, length);
+            case "冰箱贴":
+                return getfridgePrice(dto, width, length, role);
+            case "帆布袋":
+                return getCanvasBagPrice(dto, width, length);
+            case "外卖盒":
+                return getTakeoutBoxPrice(dto, width, length);
+            case "方巾纸":
+                return getHandkerPrice(dto, width, length);
+            case "鼠标垫":
+                return getMousePadPrice(dto, width, length);
+            case "手环":
+                return getWristBandPrice(dto, width, length);
+            case "手提塑料袋":
+                return getPlasticBagPrice(dto, width, length);
+            case "纸碗":
+                return getPaperBowlPrice(dto, width, length);
+            case "挂画":
+                return getWallPaintingPrice(dto, width, length);
+            case "电线胶":
+                return getWireTapePrice(dto, width, length);
+            case "包装纸":
+                return getWrappingPaper(dto, width, length);
+            case "撕撕乐":
+                return getTearingJoyPrice(dto, width, length);
+            default:
+                break;
+        }
+        return null;
+    }
+
+    private List<Product> getClotherPrice(Product dto, Double width, Double length) {
+        List<String> craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+        List<Product> priceList = new ArrayList<>();
+        int count = dto.getCount();
+        int number = dto.getNumber();
         double basePrice = 0;
         double banfei = 0;
         if ("YP".equals(dto.getKindValue())) {
@@ -4784,12 +4846,18 @@ public class ProductService {
         }
         count = dto.getCount();
 
-                pro = new Product();
+        Product pro = new Product();
         pro.setCount(count);
         pro.setPrice(Math.max(basePrice * count * number, 30) + banfei);
         priceList.add(pro);
         return priceList;
-            case "手绘":
+    }
+
+    private List<Product> getShouhuiPrice(Product dto, Double width, Double length) {
+        List<String> craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+        List<Product> priceList = new ArrayList<>();
+        int count = dto.getCount();
+        int number = dto.getNumber();
         double price = 0;
         if ("1".equals(dto.getKindValue())) {
             if (number >= 1 && number <= 4) {
@@ -4839,63 +4907,11 @@ public class ProductService {
             price = 150;
         }
 
-                pro = new Product();
+        Product pro = new Product();
         pro.setCount(count);
         pro.setPrice(price * number);
         priceList.add(pro);
         return priceList;
-            case "奖牌":
-                return getMedalPrice(dto, width, length);
-            case "防伪标":
-                return getantiLabelPrice(dto, width, length);
-            case "透卡":
-                return getPETPrice(dto, width, length);
-            case "澜达海报":
-                return getDalanPrice(dto, width, length);
-            case "水标":
-                return getShuibiaoPrice(dto, length, width);
-            case "镭射吊牌":
-                return getLeiseDiaoPrice(dto, length, width);
-            case "刻字车贴":
-                return getCheTiePrice(dto, length, width);
-            case "胶带":
-                return getJiadaoPrice(dto, length, width);
-            case "特光不干胶":
-                return getLightPrice(dto, length, width);
-            case "淋膜纸":
-                return getLingmoPrice(dto, width, length);
-            case "香薰卡":
-                return getaromatherapyPrice(dto, width, length);
-            case "金属微章":
-                return getbadgePrice(dto, width, length);
-            case "冰箱贴":
-                return getfridgePrice(dto, width, length, role);
-            case "帆布袋":
-                return getCanvasBagPrice(dto, width, length);
-            case "外卖盒":
-                return getTakeoutBoxPrice(dto, width, length);
-            case "方巾纸":
-                return getHandkerPrice(dto, width, length);
-            case "鼠标垫":
-                return getMousePadPrice(dto, width, length);
-            case "手环":
-                return getWristBandPrice(dto, width, length);
-            case "手提塑料袋":
-                return getPlasticBagPrice(dto, width, length);
-            case "纸碗":
-                return getPaperBowlPrice(dto, width, length);
-            case "挂画":
-                return getWallPaintingPrice(dto, width, length);
-            case "电线胶":
-                return getWireTapePrice(dto, width, length);
-            case "包装纸":
-                return getWrappingPaper(dto, width, length);
-            case "撕撕乐":
-                return getTearingJoyPrice(dto, width, length);
-            default:
-                break;
-        }
-        return null;
     }
 
     private List<Product> getWarmStickerPrice(Product dto, Double width, Double length) {

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

@@ -1640,6 +1640,13 @@
                 });
                 return false;
             }
+            if (kindValue == "银平光" && stickerKind == '常用种类') {
+                if ((size.split("*")[0] > 30 || size.split("*")[1] > 30)) {
+                    layer.msg("【银平光】尺寸不能超过30*30 cm", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
             if (stickerKind[0] != "插旗" && stickerKind[0] != "双面印刷不干胶") {
                 if (!stickerKind[0]) {
                     layer.msg('请选择品种！', {offset: ['300px', '300px']}, function () {