diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index c89d496..6769967 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -4795,11 +4795,20 @@ public class ProductService { double wei = 0; // 价格按照大纸裁 priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, dto.getCraft(), dto, role); + List roleList = Arrays.asList("1045"); + boolean isIn = false; + for (String s : roleList) { + if (role.indexOf(s) > -1) { + isIn = true; + } + } for (Product product : priceList) { if (craft_list.contains("菜品夹")) { product.setPrice(Math.ceil(product.getPrice() + dto.getStickNum() * 2)); } - + if (isIn) { + product.setPrice(Math.ceil(product.getPrice() * 1.2)); + } if (dto.getKindValue().equals("1") || dto.getKindValue().equals("2") || dto.getKindValue().equals("3")) { wei = 0.38; } else if (dto.getKindValue().equals("4") || dto.getKindValue().equals("5") || dto.getKindValue().equals("6")) { diff --git a/src/main/webapp/views/product/coaster.jsp b/src/main/webapp/views/product/coaster.jsp index adee79a..1986151 100644 --- a/src/main/webapp/views/product/coaster.jsp +++ b/src/main/webapp/views/product/coaster.jsp @@ -987,6 +987,13 @@ return false; } } + if (kindValue == "18") { + if (count < 5) { + layer.msg("数量大于等于5", {offset: ['300px', '300px']}, function () { + }); + return false; + } + } const carft6 = carft_list6.filter(craft => arr.includes(craft)); if (carft6.length == 0 && (kindValue == 20)) { layer.msg("常见工艺必须选择", {offset: ['300px', '300px']}, function () {