From 8f649d572e81366df6826320fa2a5ff55a34832d Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 29 Sep 2025 09:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87=E5=B0=BA?=
 =?UTF-8?q?=E5=AF=B8=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/lingtao/net/service/ProductService.java    | 13 +------------
 src/main/webapp/views/product/coupon.jsp            |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 2e1599c..54bbf3e 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -821,18 +821,7 @@ public class ProductService {
                     int min = getNum(length, width);
                     String[] kind_list = {"3", "4", "5", "7"};
                     dto.setD("");
-                    if (!"7".equals(dto.getKind()) && !"8".equals(dto.getKind()) && !"1".equals(dto.getKind())) {
-                        if ((length < 4 || width < 4)) {
-                            Product product = new Product();
-                            product.setProTypeValue("3");
-                            product.setCount(dto.getCount());
-                            product.setKindValue("0");
-                            priceList = productMapper.getThanPrice(product);
-                        }
-                    }
-                    if (priceList.size() == 0) {
-                        priceList = getHekaPrice(min, dto, priceList, count);
-                    }
+                    priceList = getHekaPrice(min, dto, priceList, count);
                     boolean isyaofeng = false;
 
                     double moqiePrice = 0;
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index 9d96ac6..9f0df3d 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -3286,7 +3286,7 @@
                 var w2 = Math.ceil(size.split("*")[0] / 5.4);
                 var min = Math.min(l1 * w1, l2 * w2);
                 if (couponKind == '常用种类') {
-                    if (kind ==1) {
+                    if (kind != 7 && kind != 8) {
                         if ((size.split("*")[0] <= 9 && size.split("*")[1] <= 5.4) || (size.split("*")[0] <= 5.4 && size.split("*")[1] <= 9)) {
                             if ((size.split("*")[0] < 4 || size.split("*")[1] < 4)) {
                                 layer.msg("[ 卡片 ]9*5.4 cm以内,尺寸小于4 cm请以 [ 插卡 - 异形插牌 ] 报价!", {offset: ['300px', '300px']}, function () {