素芸新增打孔工艺

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

@@ -1652,7 +1652,11 @@ public class ProductService {
                             priceList.add(dto2);
                         }
                     }
-
+                    for (Product product : priceList) {
+                        if (craft_list.contains("打孔")) {
+                            product.setPrice(Math.ceil(product.getPrice() + 0.2 * product.getCount() * number));
+                        }
+                    }
                     return priceList;
                 } else if ("草香".equals(kind) || "芳怡".equals(kind)) {
                     int[] count_list = {200, 500, 1000, 2000, 5000, 10000};

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

@@ -193,7 +193,7 @@
                         <option value="白色">白色</option>
                     </select>
                     <span class="printColor" style="display: none;align-items: center;">
-                        <input type="checkbox" name="craft" lay-filter="mianka" value="印刷颜色" title="印刷颜色" checked>
+                        <input type="checkbox" name="craft" lay-filter="mianka" value="印刷颜色" title="印刷颜色" checked disabled>
                         <input type="text" name="co_number" class="layui-input" value="1">
                     </span>
                 </div>
@@ -228,6 +228,7 @@
                         </select>
                     </div>
                     <input type="checkbox" name="craft" lay-filter="mianka" value="打点线" title="打点线">
+                    <input type="checkbox" name="craft" lay-filter="mianka" value="打孔" title="打孔">
                     <span style="display: none">
                         <input type="checkbox" name="craft" lay-filter="mianka" value="压痕" title="压痕">
                     </span>
@@ -617,7 +618,7 @@
                     return false;
                 }
             }
-            if (craft_list.indexOf("印刷颜色") == -1 && kindValueSelect == "素芸") {
+            if (craft_list.indexOf("印刷颜色") == -1 && kindValueSelect == "素芸" && kindValue == "300克") {
                 $(data.elem).prop("checked", true);
                 layer.msg("印刷颜色无法取消", {offset: ['300px', '300px']}, function () {
                 });