From d1249e517351faa9f4ed42b9137b31969d3bb72b Mon Sep 17 00:00:00 2001 From: zhuyiyi <649091362@qq.com> Date: Mon, 29 Jun 2026 15:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=B9=B2=E8=83=B6?= =?UTF-8?q?=E6=8B=BC=E5=A4=9A=E5=A4=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingtao/net/service/ProductService.java | 7 ++++++ .../webapp/views/product/fridgeMagnet.jsp | 5 +++- src/main/webapp/views/product/keychain.jsp | 24 ++++++++++++------- src/main/webapp/views/product/stickers.jsp | 11 +++++++++ 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 674321e..9feeade 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -6550,6 +6550,13 @@ public class ProductService { pro.setPrice(Math.ceil(price + card_price)); priceList.add(pro); + if (role.contains("1045")) { + for (Product product : priceList) { + product.setPrice(Math.ceil(pro.getPrice() * 0.85)); + } + } + + return priceList; } diff --git a/src/main/webapp/views/product/fridgeMagnet.jsp b/src/main/webapp/views/product/fridgeMagnet.jsp index dab8827..e52ff8c 100644 --- a/src/main/webapp/views/product/fridgeMagnet.jsp +++ b/src/main/webapp/views/product/fridgeMagnet.jsp @@ -74,7 +74,7 @@ class="layui-input">

- 工艺一套为一款 + 工艺

@@ -250,6 +250,7 @@ $(".xhbeika").find("input").prop("disabled", true) $("input[name='craft'][value='现货背卡']").parent().hide(); $("input[name='craft'][value='现货背卡']").find("input").prop("disabled", true); + $("#craft_tip").hide(); if (kindValue == "对联冰箱贴") { $("input[name='craft'][value='现货背卡']").parent().show(); $("input[name='craft'][value='现货背卡']").find("input").prop("disabled", false); @@ -265,6 +266,7 @@ $(".beika").find("input").prop("disabled", true) $(".xhbeika").show(); $(".xhbeika").find("input").prop("disabled", false) + $("#craft_tip").show(); } $("#cailiao").empty(); $("#cailiao").append(cailiaoHtml); @@ -484,6 +486,7 @@ if (window.parent.system_isGai) { span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); //计算完自动复制文本 diff --git a/src/main/webapp/views/product/keychain.jsp b/src/main/webapp/views/product/keychain.jsp index 696dc3c..59b1673 100644 --- a/src/main/webapp/views/product/keychain.jsp +++ b/src/main/webapp/views/product/keychain.jsp @@ -77,18 +77,26 @@ diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp index cb17c0c..b96c1ca 100644 --- a/src/main/webapp/views/product/stickers.jsp +++ b/src/main/webapp/views/product/stickers.jsp @@ -2001,6 +2001,17 @@ if (window.parent.system_isGai) { span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + if ((kindValue == "15" || kindValue == "树纹纸") && window.parent.system_isPddPrice) { + let padCraft = false; + craft_list.forEach(item => { + if (item == "彩色印刷") { + padCraft = true; + } + }) + if (padCraft) { + span_result += "\n\n亲亲 当天15点之前定稿 可以当天发货哦!" + } + } addLog(span_result); $("#span_result").val(span_result); if (stickerKind == "封口贴") {