diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 8248132..c543e8d 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/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("模切"); diff --git a/src/main/java/lingtao/net/util/ZsPrice.java b/src/main/java/lingtao/net/util/ZsPrice.java index 88732c4..7ce5079 100644 --- a/src/main/java/lingtao/net/util/ZsPrice.java +++ b/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) { - desFee = 3; + if (dto.getP() == 1) { + 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); } diff --git a/src/main/webapp/views/product/mousePad.jsp b/src/main/webapp/views/product/mousePad.jsp index 114aa74..040c0f2 100644 --- a/src/main/webapp/views/product/mousePad.jsp +++ b/src/main/webapp/views/product/mousePad.jsp @@ -80,7 +80,9 @@