From c89eb69f414bc9ad0ed34c200570be8de11a83cd Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Tue, 1 Jul 2025 09:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E7=89=B9=E7=A7=8D=E7=BA=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/lingtao/net/util/PosterPrice.java    | 40 +++++++++----------
 .../java/lingtao/net/util/PriceUtils.java     | 20 +++++-----
 .../webapp/views/product/specialCard2.jsp     |  2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/java/lingtao/net/util/PosterPrice.java b/src/main/java/lingtao/net/util/PosterPrice.java
index fbd398a..0eb82e5 100644
--- a/src/main/java/lingtao/net/util/PosterPrice.java
+++ b/src/main/java/lingtao/net/util/PosterPrice.java
@@ -417,18 +417,18 @@ public class PosterPrice {
                 weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
                 break;
         }
-//        if (width * length < 40 * 50) {
-//            price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
-//        } else {
-        danjia = last_price;
-        for (int i = 0; i < areas.length; i++) {
-            if (area <= areas[i]) {
-                danjia = prices[i];
-                break;
+        if (width * length < 40 * 50) {
+            price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
+        } else {
+            danjia = last_price;
+            for (int i = 0; i < areas.length; i++) {
+                if (area <= areas[i]) {
+                    danjia = prices[i];
+                    break;
+                }
             }
+            price = Math.max(area * danjia, min_price);
         }
-        price = Math.max(area * danjia, min_price);
-//        }
         Product pro = new Product();
         List<Product> list = new ArrayList<Product>();
         pro.setCount(count);
@@ -601,18 +601,18 @@ public class PosterPrice {
                 break;
         }
         if (!"7".equals(kind2) && !"10".equals(kind2)) {
-//            if (width * length < 40 * 50) {
-//                price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
-//            } else {
-            danjia = last_price;
-            for (int i = 0; i < areas.length; i++) {
-                if (area <= areas[i]) {
-                    danjia = prices[i];
-                    break;
+            if (width * length < 40 * 50) {
+                price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
+            } else {
+                danjia = last_price;
+                for (int i = 0; i < areas.length; i++) {
+                    if (area <= areas[i]) {
+                        danjia = prices[i];
+                        break;
+                    }
                 }
+                price = Math.max(area * danjia, min_price);
             }
-            price = Math.max(area * danjia, min_price);
-//            }
         }
 
 
diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index 20a4125..4594cc5 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -3242,18 +3242,18 @@ public class PriceUtils {
 
         }
 
-//        if (width * length < 40 * 50) {
-//            price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
-//        } else {
-        dj = last_price;
-        for (int i = 0; i < areas.length; i++) {
-            if (area <= areas[i]) {
-                dj = prices[i];
-                break;
+        if (width * length < 40 * 50) {
+            price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
+        } else {
+            dj = last_price;
+            for (int i = 0; i < areas.length; i++) {
+                if (area <= areas[i]) {
+                    dj = prices[i];
+                    break;
+                }
             }
+            price = Math.max(area * dj, min_price);
         }
-        price = Math.max(area * dj, min_price);
-//        }
 
         if (number > 1 && width * length >= 40 * 50) {
             pro.setPrice(Math.ceil(price * number));
diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp
index 6c36b37..2158497 100644
--- a/src/main/webapp/views/product/specialCard2.jsp
+++ b/src/main/webapp/views/product/specialCard2.jsp
@@ -186,7 +186,7 @@
             <input type="checkbox" name="craft" lay-filter="mianka" value="单面烫金" title="单面烫金">
             <input type="checkbox" name="craft" lay-filter="mianka" value="双面烫金" title="双面烫金">
             <div id="tang_type" class="layui-inline" style="display: none;width: 90px">
-                <select name="craft" class="select">
+                <select name="craft" class="select" disabled>
                     <option value="烫金" selected>烫金</option>
                     <option value="烫银">烫银</option>
                     <option value="烫蓝">烫蓝</option>