From 7650802c30aa60fc70d4a16c92d9a73cee71e2fd Mon Sep 17 00:00:00 2001 From: zhuyiyi <649091362@qq.com> Date: Thu, 8 May 2025 17:15:55 +0800 Subject: [PATCH] edit --- .../lingtao/net/service/ProductService.java | 208 +- src/main/java/lingtao/net/util/ZsPrice.java | 33 +- src/main/webapp/views/main.jsp | 1735 +++++++++-------- src/main/webapp/views/product/chaqi.jsp | 16 +- src/main/webapp/views/product/coupon.jsp | 16 +- src/main/webapp/views/product/deskSticker.jsp | 2 +- src/main/webapp/views/product/lsz.jsp | 4 +- src/main/webapp/views/product/poster.jsp | 4 +- src/main/webapp/views/product/pvcfigure.jsp | 7 +- .../webapp/views/product/specialCard2.jsp | 8 +- src/main/webapp/views/product/stickers.jsp | 10 +- src/main/webapp/views/readme.jsp | 1 + 12 files changed, 1094 insertions(+), 950 deletions(-) diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 33b8407..5c75c34 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -399,7 +399,7 @@ public class ProductService { // 选择少数量/打印不干胶按钮 if ("少数量".contentEquals(dto.getStickerKind()) || "专版打印".contentEquals(dto.getStickerKind())) { - stickersList = lessSticker(dto, kind, number, width, length, count, stickersList); + stickersList = lessSticker(dto, kind, number, width, length, count, stickersList, role); if (stickersList.get(0) == null) { return null; @@ -1364,20 +1364,37 @@ public class ProductService { //第二款开始的设计费按照式设计内容 if (number > 1) { double desFee = 0; - if (dto.getP() == 1) { - desFee = 0.6; - } else if (dto.getP() == 2 || dto.getP() == 3) { - desFee = 0.8; - } else if (dto.getP() == 4) { - desFee = 1.2; - } else if (dto.getP() == 5) { - desFee = 2; + if (role.indexOf("1045") == -1) { + if (number == 2) { + desFee = 5.5; + } + if (number == 3) { + desFee = 5.5 + 3.5; + } + if (number > 3) { + desFee = 5.5 + 3.5 + 2.5 * (number - 3); + } + for (Product product : priceList) { + product.setPrice(Math.ceil(product.getPrice() + desFee)); + } } else { - desFee = 5; - } - for (Product product : priceList) { - product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); + + if (dto.getP() == 1) { + desFee = 0.6; + } else if (dto.getP() == 2 || dto.getP() == 3) { + desFee = 0.8; + } else if (dto.getP() == 4) { + desFee = 1.2; + } else if (dto.getP() == 5) { + desFee = 2; + } else { + desFee = 5; + } + for (Product product : priceList) { + product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); + } } + } return priceList; } else { @@ -2320,7 +2337,6 @@ public class ProductService { } else { priceList = new PriceUtils().UVStickerPrice(length, width, count, number, dto.getCraftMo(), dto.getCraft()); } - if (priceList.get(0).getCount() != count) { priceList.get(0).setCount(count); } @@ -2655,37 +2671,69 @@ public class ProductService { } } } + if (role.indexOf("1045") == -1) { + if (number > 1) { + double designFee = 0; + if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单")) { + if (number == 2) { + designFee = 5.5; + } + if (number == 3) { + designFee = 5.5 + 3.5; + } + if (number > 3) { + designFee = 5.5 + 3.5 + 2.5 * (number - 3); + } + } + if (dto.getProTypeLabel().equals("菜单") || dto.getProTypeLabel().equals("婚礼报纸")) { + if (number == 2) { + designFee = 17; + } + if (number == 3) { + designFee = 17 + 17; + } + if (number > 3) { + designFee = 17 + 17 + 12 * (number - 3); + } + } - //第二款开始的设计费按照式设计内容 - if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单") && number > 1) { - double desFee = 0; - if (dto.getP() == 1) { - desFee = 0.6; - } else if (dto.getP() == 2 || dto.getP() == 3) { - desFee = 0.8; - } else if (dto.getP() == 4) { - desFee = 1.2; - } else if (dto.getP() == 5) { - desFee = 2; - } else { - desFee = 18; - int min = getNumAdd((length - 4) / 10, (width - 4) / 10); - if (min == 1) { - desFee = 7; - } - if (min == 2) { - desFee = 10; - } - if (min == 3) { - desFee = 14; - } - if (min == 4) { - desFee = 18; + for (Product product : priceList) { + product.setPrice(Math.ceil(product.getPrice() + designFee)); } } + } else { - for (Product product : priceList) { - product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); + //第二款开始的设计费按照式设计内容 + if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单") && number > 1) { + double desFee = 0; + if (dto.getP() == 1) { + desFee = 0.6; + } else if (dto.getP() == 2 || dto.getP() == 3) { + desFee = 0.8; + } else if (dto.getP() == 4) { + desFee = 1.2; + } else if (dto.getP() == 5) { + desFee = 2; + } else { + desFee = 18; + int min = getNumAdd((length - 4) / 10, (width - 4) / 10); + if (min == 1) { + desFee = 7; + } + if (min == 2) { + desFee = 10; + } + if (min == 3) { + desFee = 14; + } + if (min == 4) { + desFee = 18; + } + } + + for (Product product : priceList) { + product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); + } } } @@ -3101,19 +3149,35 @@ public class ProductService { if (("0".equals(kind) && "0".equals(kind2)) || ("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) { double desFee = 0; - if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) { - desFee = 3; - } else if (dto.getP() == 4) { - desFee = 5; - } else if (dto.getP() == 5) { - desFee = 6; + if (role.indexOf("1045") == -1) { + if (number == 2) { + desFee = 11; + } + if (number == 3) { + desFee = 11 + 11; + } + if (number > 3) { + desFee = 11 + 11 + 11 * (number - 3); + } + for (Product product : priceList) { + product.setPrice(Math.ceil(product.getPrice() + desFee)); + } } else { - desFee = 11; + if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) { + desFee = 3; + } else if (dto.getP() == 4) { + desFee = 5; + } else if (dto.getP() == 5) { + desFee = 6; + } else { + desFee = 11; + } + + for (Product product : priceList) { + product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); + } } - for (Product product : priceList) { - product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1))); - } } } @@ -3319,7 +3383,7 @@ public class ProductService { * if (priceList.size() >= 4) { priceList = priceList.subList(0, 4); } */ String[] ztCraft = {"背胶"}; - priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, ztCraft, dto); + priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, ztCraft, dto, role); for (Product product : priceList) { if (dto.getKindValue().equals("0") || dto.getKindValue().equals("10")) { wei = 0.38; @@ -3792,7 +3856,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); } } else {// 打印的价格和pvc不干胶打印价格一样--23.8.17更新后取消这个 - priceList = lessSticker(dto, proType, number, width, length, count, priceList); + priceList = lessSticker(dto, proType, number, width, length, count, priceList, role); return priceList; } // 重量 @@ -3932,7 +3996,7 @@ public class ProductService { return priceList; case "数码PVC": // 价格按照大纸裁 - priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, dto.getCraft(), dto); + priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, dto.getCraft(), dto, role); for (Product product : priceList) { if (dto.getKindValue().equals("1") || dto.getKindValue().equals("2") || dto.getKindValue().equals("3")) { wei = 0.38; @@ -4348,7 +4412,7 @@ public class ProductService { } private List lessSticker(Product dto, String kind, Integer number, Double width, Double length, - int count, List stickersList) { + int count, List stickersList, String role) { double price = 0.0; // 一张大纸收费 double addPrice = 0.0; @@ -4418,22 +4482,36 @@ public class ProductService { } if (number > 1) { double desFee = 0; - if (dto.getP() == 1) { - desFee = 0.6; - } else if (dto.getP() == 2 || dto.getP() == 3) { - desFee = 0.8; - } else if (dto.getP() == 4) { - desFee = 1.2; - } else if (dto.getP() == 5) { - desFee = 2; + if (role.indexOf("1045") == -1) { + if (number == 2) { + desFee = 3.5; + } + if (number == 3) { + desFee = 3.5 + 2.5; + } + if (number > 3) { + desFee = 3.5 + 2.5 + 1.5 * (number - 3); + } } else { - desFee = 5; + if (dto.getP() == 1) { + desFee = 0.6; + } else if (dto.getP() == 2 || dto.getP() == 3) { + desFee = 0.8; + } else if (dto.getP() == 4) { + desFee = 1.2; + } else if (dto.getP() == 5) { + desFee = 2; + } else { + desFee = 5; + } + desFee = desFee * number; } + for (Product product : stickersList) { if ("0".equals(kind) && "纯烫金".equals(dto.getCraftTang())) { product.setPrice(product.getPrice() * number); } else { - product.setPrice(Math.floor(product.getPrice() + desFee * number)); + product.setPrice(Math.ceil(product.getPrice() + desFee)); } } diff --git a/src/main/java/lingtao/net/util/ZsPrice.java b/src/main/java/lingtao/net/util/ZsPrice.java index 03499d7..18a82ec 100644 --- a/src/main/java/lingtao/net/util/ZsPrice.java +++ b/src/main/java/lingtao/net/util/ZsPrice.java @@ -36,7 +36,7 @@ public class ZsPrice { return list; } - public static List getSmPrice(int count, Double length, Double width, List list, Integer number, String[] craft, Product dto) { + public static List getSmPrice(int count, Double length, Double width, List list, Integer number, String[] craft, Product dto, String role) { double price = 60; double l = 438.0; double w = 304.0; @@ -68,18 +68,33 @@ public class ZsPrice { if (number > 1) { double desFee = 0; - if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) { - desFee = 3; - } else if (dto.getP() == 4) { - desFee = 5; - } else if (dto.getP() == 5) { - desFee = 6; + + if (role.indexOf("1045") == -1) { + if (number == 2) { + desFee = 5.75; + } + if (number == 3) { + desFee = 5.75 + 3.75; + } + if (number > 3) { + desFee = 5.75 + 3.75 + 2.75 * (number - 3); + } + price += desFee; } else { - desFee = 8; + if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) { + desFee = 3; + } else if (dto.getP() == 4) { + desFee = 5; + } else if (dto.getP() == 5) { + desFee = 6; + } else { + desFee = 8; + } + price += desFee * (number - 1); } - price += desFee * (number - 1); } + Product pro = new Product(); pro.setPrice(Math.ceil(price)); pro.setCount(count); diff --git a/src/main/webapp/views/main.jsp b/src/main/webapp/views/main.jsp index f9958d6..6e8ee83 100644 --- a/src/main/webapp/views/main.jsp +++ b/src/main/webapp/views/main.jsp @@ -1,766 +1,806 @@ <%@ 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" %> - -领淘报价网 - - - - - - + /* animation-fill-mode: forwards; */ + animation: rise 2s forwards, fly1 6s 4s ease-in-out infinite; + } + + .balloon:nth-child(1):before { + border-color: transparent rgba(182, 15, 97, 0.7) transparent transparent; + } + + .balloon:nth-child(2) { + background: rgba(45, 181, 167, 0.7); + box-shadow: inset 10px 10px 10px rgba(35, 140, 129, 0.7); + + animation: rise 3s forwards, fly4 6s 3s ease-in-out infinite; + } + + .balloon:nth-child(2):before { + border-color: transparent rgba(45, 181, 167, 0.7) transparent transparent; + } + + .balloon:nth-child(3) { + background: rgba(190, 61, 244, 0.7); + box-shadow: inset 10px 10px 10px rgba(173, 14, 240, 0.7); + + animation: rise 3.5s forwards, fly1 3s 3s ease-in-out infinite; + } + + .balloon:nth-child(3):before { + border-color: transparent rgba(190, 61, 244, 0.7) transparent transparent; + } + + .balloon:nth-child(4) { + background: rgba(180, 224, 67, 0.7); + box-shadow: inset 10px 10px 10px rgba(158, 206, 34, 0.7); + + animation: rise 5s forwards, fly3 5s 5s ease-in-out infinite; + } + + .balloon:nth-child(4):before { + border-color: transparent rgba(180, 224, 67, 0.7) transparent transparent; + } + + .balloon:nth-child(5) { + background: rgba(242, 194, 58, 0.7); + box-shadow: inset 10px 10px 10px rgba(234, 177, 15, 0.7); + + animation: rise 4s forwards, fly2 4s 4s ease-in-out infinite; + } + + .balloon:nth-child(5):before { + border-color: transparent rgba(242, 194, 58, 0.7) transparent transparent; + } + + .balloon:nth-child(6) { + background: rgba(242, 112, 45, 0.7); + box-shadow: inset 10px 10px 10px rgba(222, 85, 14, 0.7); + + animation: rise 3s forwards, fly2 6s 5s ease-in-out infinite; + } + + .balloon:nth-child(6):before { + border-color: transparent rgba(242, 112, 45, 0.7) transparent transparent; + } + + /* 气球上升 */ + @keyframes rise { + 100% { + transform: rotate(45deg) translate(0, 0); + } + } + + /* 气球运动轨迹,4种 */ + @keyframes fly1 { + 0%, 100% { + transform: rotate(45deg) translateY(0); + } + 50% { + transform: rotate(53deg) translateY(-20px); + } + } + + @keyframes fly2 { + 0%, 100% { + transform: rotate(45deg) translateY(0); + } + 50% { + transform: rotate(37deg) translateY(-30px); + } + } + + @keyframes fly3 { + 0%, 100% { + transform: rotate(45deg) translateY(0); + } + 50% { + transform: rotate(37deg) translate(-20px, -30px); + } + } + + @keyframes fly4 { + 0%, 100% { + transform: rotate(45deg) translateY(0); + } + 50% { + transform: rotate(55deg) translate(-15px, -10px); + } + } + + @keyframes maskedAnimation { + 0% { + background-position: 0 0; + } + 100% { + background-position: -100% 0; + } + } + + #tong { + width: 100%; + height: 100%; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url("../images/birthDay.png"); + } + + #view { + position: absolute; + left: 650px; + top: 250px; + } + - -
-
- - <%-- --%> - - - - <%-- --%> -
- - - - - - - -
- -
-
-
- - -
- -
- -
-
    - -
- -
-
- -
-
-
-
- - -
-
+ +
+
+ + <%-- --%> + + + + <%-- --%> +
+ + + + + + + +
+ +
+
+
+ + +
+ +
+ +
+
    + +
+ +
+
+ +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/webapp/views/product/chaqi.jsp b/src/main/webapp/views/product/chaqi.jsp index 28594f0..7aa8a91 100644 --- a/src/main/webapp/views/product/chaqi.jsp +++ b/src/main/webapp/views/product/chaqi.jsp @@ -342,12 +342,12 @@ lay-skin="primary"> -
+ +
@@ -460,7 +460,7 @@ }); $("#number").on("input", function (e) { var number = e.delegateTarget.value; - if ($("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) { + if (window.parent.system_isPdd && $("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) { $("#ui_des").show(); } else { $("#ui_des").hide(); @@ -566,7 +566,7 @@ $(".ui_cq").find(":input").attr("disabled", true); $(".normal").hide(); $('.normal input').prop("checked", false); - if ($("#number").val() > 1) { + if (window.parent.system_isPdd && $("#number").val() > 1) { $("#ui_des").show(); } $(".ui_sm").hide(); @@ -1567,7 +1567,7 @@ if (kindValue == "拉丝金" || kindValue == "拉丝银" || kindValue == "PP合成纸") { craftMo = "" } - if (number > 1) { + if (window.parent.system_isPdd && number > 1) { if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) { layer.msg('请选择设计内容!', {offset: ['300px', '300px']}, function () { }); @@ -1733,7 +1733,7 @@ span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n'; if (number > 1) { - if (stickerKind == "专版打印") { + if (window.parent.system_isPdd && stickerKind == "专版打印") { let numberType = $("#desType option:selected").text(); span_result += "款数:" + number + "-" + numberType + "\n"; } diff --git a/src/main/webapp/views/readme.jsp b/src/main/webapp/views/readme.jsp index abf8e79..20e6d7f 100644 --- a/src/main/webapp/views/readme.jsp +++ b/src/main/webapp/views/readme.jsp @@ -116,6 +116,7 @@ {{# }); }}