diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index bc52c9c..c16f037 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -5927,6 +5927,9 @@ public class ProductService { for (Product product : stickersList) { product.setPrice(Math.ceil(product.getPrice() * 1.5)); } + if ("印白墨".equals(dto.getYinbai())) { + stickersList = PriceUtils.getYinBaiPrice(stickersList, width, length); + } break; } } else { @@ -6196,6 +6199,9 @@ public class ProductService { product.setPrice(Math.ceil(product.getPrice() * 1.1)); } } + if ("印白墨".equals(dto.getYinbai())) { + stickersList = PriceUtils.getYinBaiPrice(stickersList, width, length); + } break; } } @@ -6271,7 +6277,7 @@ public class ProductService { // } // } - if ("印白墨".equals(dto.getYinbai()) && !"6".equals(kind) && !"拉丝银".equals(kind)) { + if ("印白墨".equals(dto.getYinbai()) && !"6".equals(kind) && !"拉丝银".equals(kind) && !"银平光".equals(kind)) { stickersList = new PVCStickersPrice().acountYinbaiPrice(length, width, stickersList); } // 价格*款数 铜版纸放到外面执行 diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp index e11f527..179b9f9 100644 --- a/src/main/webapp/views/product/stickers.jsp +++ b/src/main/webapp/views/product/stickers.jsp @@ -961,7 +961,7 @@ $('.at').prop('disabled', 'disabled'); } // 透明不干胶带白墨工艺 - if (data.value == 2 || data.value == 13 || data.value == 6 || data.value == "拉丝银") { + if (data.value == 2 || data.value == 13 || data.value == 6 || data.value == "拉丝银" || data.value == "银平光") { // 复选框的disabled $(".yb").show(); $(".yb").find(":input").attr("disabled", false); @@ -1813,7 +1813,7 @@ var yaqian = '' if ($("input[name='yinbai']:checked").val() != "") { yaqian = $("input[name='yinbai']:checked").val(); - if (kindValue == 6 || kindValue == "拉丝银") { + if (kindValue == 6 || kindValue == "拉丝银" || kindValue == "银平光") { craft_list.push(yaqian) } }