From 0d53424a0dd4f33ebbe5cab45b92c9513301f861 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Wed, 25 Jun 2025 08:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E7=A7=8D=E7=BA=B8?=
 =?UTF-8?q?=E5=8E=8B=E7=97=95=E5=B7=A5=E8=89=BA=EF=BC=8C=E6=95=B0=E7=A0=81?=
 =?UTF-8?q?=E5=88=AE=E5=88=AE=E5=8D=A1=E8=86=9C=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lingtao/net/service/ProductService.java   | 12 ++++++++++-
 src/main/webapp/views/product/coupon.jsp      | 20 +++++++++++++------
 .../webapp/views/product/specialCard2.jsp     |  9 +++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index fe1c6e5..0cc7e13 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -2887,7 +2887,17 @@ public class ProductService {
                         price = fixPrice + (num - 1) * zhang + designFee + cutFee;
                     }
                     if ("刮刮卡".equals(dto.getKind())) {
-                        price = price + 0.2 * count * number;
+                        List<String> size1 = new ArrayList();
+                        size1.add("70*50");
+                        size1.add("35*58");
+                        size1.add("41*72");
+                        size1.add("60*25");
+                        size1.add("15*48");
+                        double sizePrice = 0.2 * count * number;
+                        if (size1.contains(dto.getSize1())) {
+                            sizePrice = Math.max(sizePrice, 5);
+                        }
+                        price = price + sizePrice;
                     }
                     Product dto2 = new Product();
                     dto2.setCount(count);
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index ce994cb..86b113a 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -328,12 +328,20 @@
                         </p>
                         <select name="size1" id="size2" class="select">
                             <option value="6*18">6*18 mm</option>
-                            <option value="6*22">6*22 mm</option>
-                            <option value="6*26">6*26 mm</option>
-<%--                            <option value="8*26">8*26 mm</option>--%>
-                            <option value="8*30">8*30 mm</option>
-                            <option value="48*15">48*15 mm</option>
-                            <option value="60*25">60*25 mm</option>
+								<option value="6*22">6*22 mm</option>
+								<option value="6*26">6*26 mm</option>
+								<option value="8*26">8*26 mm</option>
+								<option value="8*30">8*30 mm</option>
+								<option value="15*15">15*15mm</option>
+								<option value="18*18">18*18mm</option>
+								<option value="20*20">20*20mm</option>
+								<option value="18*32">18*32 mm</option>
+								<option value="15*48">15*48 mm</option>
+								<option value="8*36">8*36 mm</option>
+                                <option value="70*50">70*50 mm</option>
+                                <option value="60*25" selected>60*25 mm</option>
+                                <option value="35*58">35*58 mm</option>
+                                <option value="41*72">41*72 mm</option>
                         </select>
                         <p>
                             <span style="font-size:14px;color:red">同个客户下单多款，其中一款数量在200张以上请全部按照印刷报价<br/>200张以上车间贴，200张以下客户自己贴</span>
diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp
index 167310d..6c36b37 100644
--- a/src/main/webapp/views/product/specialCard2.jsp
+++ b/src/main/webapp/views/product/specialCard2.jsp
@@ -165,6 +165,7 @@
                            class="">
 
                 </span>
+                <input type="checkbox" name="craft" lay-filter="switch" value="压痕" title="压痕">
 
             </div>
             <div id="mianka" style="display: none">
@@ -486,6 +487,7 @@
                 });
                 return false;
             }
+
             if (craft_list.indexOf("击凸") > -1 || craft_list.indexOf("压凹") > -1) {
                 $("#color_type").show();
                 $("#color_type").find("select").attr("disabled", false);
@@ -527,6 +529,13 @@
                 });
                 return false;
             }
+            if (craft_list.indexOf("压痕") > -1 && craft_list.indexOf("异形模切") > -1) {
+                $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                $(data.elem).prop("checked", false);
+                layer.msg("压痕 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
             $("#dakong").removeAttr('disabled');
             $("#craft_mo").removeAttr('disabled');
             $(".newCraft").children().removeAttr('disabled');