diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index f90d883..393bf3f 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -4417,8 +4417,12 @@ public class ProductService { return priceList; case "帆布": priceList = new PriceUtils().getFbPrice(dto, number, width, length, count, priceList); + List carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft()); for (Product product : priceList) { if (product.getCount() != null && number != null) { + if (carftList.contains("伸缩杆70-120CM")) { + product.setPrice(product.getPrice() + 2 * Math.max(dto.getPcount(), 1)); + } product.setWeight(df.format(0.28 * width * length * product.getCount() / 10000 * number)); } } diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java index dce8efa..35f323a 100644 --- a/src/main/java/lingtao/net/util/PriceUtils.java +++ b/src/main/java/lingtao/net/util/PriceUtils.java @@ -3692,7 +3692,7 @@ public class PriceUtils { if (area < 7.5) { basePrice = 90; } else { - basePrice = 70; + basePrice = 80; } return Math.max(Math.ceil(area * basePrice * 1.2), 50); diff --git a/src/main/webapp/views/product/canvas.jsp b/src/main/webapp/views/product/canvas.jsp index 9fe6b17..91b3548 100644 --- a/src/main/webapp/views/product/canvas.jsp +++ b/src/main/webapp/views/product/canvas.jsp @@ -1,330 +1,366 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -Insert title here - <%@include file="/views/common.jsp"%> + + Insert title here + <%@include file="/views/common.jsp" %> -
-
-

帆布

-
-
- -
- - -
-

- 材质 -

-
- -
-
-

- 尺寸(CM/厘米) 输入格式: 长 * 宽 - -

-
- -
-
+
+
+ + +
+

计算结果- + +

+
+ + <%@include file="../acountExpressFee.jsp" %> +
+
+
+
+ +
+
+ +
+
-<%@include file="/views/copyResult.jsp"%> +<%@include file="/views/copyResult.jsp" %> \ No newline at end of file