修改pvc数码设计费

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

@@ -4771,8 +4771,24 @@ public class ProductService {
                 item.setSizes(Arrays.asList(dto.getWidthUV() * 10, dto.getLengthVU() * 10));
                 list.add(item);
             }
+
         }
-        if (width < 5.4 || length < 5.4) {
+        boolean ismoqie = false;
+        if (craft_list.contains("模切")) {
+            HuaFangPriceProcessItemsVo item = new HuaFangPriceProcessItemsVo();
+            item.setProcessName("模切");
+            item.setProcessValue("模切");
+            list.add(item);
+            ismoqie = true;
+        }
+        if (!ismoqie && craft_list.contains("圆角")) {
+            HuaFangPriceProcessItemsVo item = new HuaFangPriceProcessItemsVo();
+            item.setProcessName("模切");
+            item.setProcessValue("模切");
+            list.add(item);
+            ismoqie = true;
+        }
+        if (!ismoqie && (width < 5.4 || length < 5.4)) {
             HuaFangPriceProcessItemsVo item = new HuaFangPriceProcessItemsVo();
             item.setProcessName("模切");
             item.setProcessValue("模切");

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

@@ -71,14 +71,18 @@ public class ZsPrice {
         if (number > 1) {
             double desFee = 0;
 
-            if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
+            if (dto.getP() == 1) {
-                desFee = 3;
+                desFee = 0.5;
+            } else if (dto.getP() == 2) {
+                desFee = 2;
+            } else if (dto.getP() == 3) {
+                desFee = 1;
             } else if (dto.getP() == 4) {
-                desFee = 5;
+                desFee = 3;
             } else if (dto.getP() == 5) {
-                desFee = 6;
+                desFee = 3.5;
             } else {
-                desFee = 10;
+                desFee = 5;
             }
             price += desFee * (number - 1);
         }

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

@@ -80,7 +80,9 @@
                 </div>
                 <div class="layui-input-block">
                     裁切工艺：
-                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="圆角" title="圆角" checked>
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="圆角" title="圆角">
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="圆形" title="圆形">
                     <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切">
                 </div>
 
@@ -140,7 +142,7 @@
         var remark = " ";
         const carft_list1 = ["单面", "双面"];
 
-        const carft_list2 = ["圆角", "异形模切"];
+        const carft_list2 = ["圆角","圆形","直角裁切", "异形模切"];
 
         const carft_list3 = ["锁边", "不锁边"];