From ee17035e69da97082dfe4641f4f0c5d421e09ccf Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 6 Apr 2026 16:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=B0=E7=AE=B1=E8=B4=B4?=
 =?UTF-8?q?=E9=9B=95=E5=88=BB=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lingtao/net/service/ProductService.java   | 15 +++++++++----
 .../webapp/views/product/fridgeMagnet.jsp     | 22 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 2f7ffc3..2cdc3e7 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -1319,10 +1319,10 @@ public class ProductService {
                             if (!("6".equals(kind) && "无".equals(kind2))) {
                                 if (num == 1) {
                                     product.setPrice(Math.floor(product.getPrice() * 1.3));
-                                }
-                                if (num == 2) {
+                                } else {
                                     product.setPrice(Math.floor(product.getPrice() * 1.2));
                                 }
+
                             }
                             if ("4".equals(kind)) {
                                 product.setPrice(Math.floor(product.getPrice() * 1.3));
@@ -5653,6 +5653,9 @@ public class ProductService {
                 last_price = 1100;
             }
             price = PriceUtils.TableUnitPrice(area, prices, areas, last_price);
+            if (carft_list.contains("激光") && carft_list.contains("滴胶")) {
+                price = price * 1.3;
+            }
             price = Math.max(price, min_price) + ((dto.getNumber() - 1) * 8);
             weight = df.format(width * length * 4.17 * dto.getCount() * 0.1 * number / 1000 * Double.parseDouble(cailiao));
         }
@@ -5677,7 +5680,11 @@ public class ProductService {
             if ("2.3滴塑".equals(cailiao)) {
                 cailiao = "2.3";
             }
-            price = Math.ceil(Math.max((basePrice * count * number), min_price) + 8 * number);
+            price = basePrice * count * number;
+            if (carft_list.contains("激光") && carft_list.contains("滴胶")) {
+                price = price * 1.3;
+            }
+            price = Math.ceil(Math.max((price), min_price) + 8 * number);
             weight = df.format(width * length * 4.17 * dto.getCount() * number * 0.1 / 100000 * Double.parseDouble(cailiao));
         }
 
@@ -6242,7 +6249,7 @@ public class ProductService {
                 {79, 79, 79, 79, 79, 79, 79, 79, 79, 91, 92, 92, 95, 125, 135, 139, 152, 186, 340, 345, 435, 450},
                 {97, 97, 97, 97, 97, 97, 97, 97, 97, 114, 115, 116, 118, 158, 162, 162, 185, 194, 358, 363, 459, 465},
                 {153, 153, 153, 153, 153, 153, 153, 153, 153, 169, 171, 172, 175, 234, 251, 256, 286, 291, 480, 490, 620, 635},
-                {250, 250, 250, 250, 250, 250, 250, 250, 250, 266, 273, 275, 278, 330, 360, 370, 429, 442, 640, 655, 825, 877},
+                {250, 250, 250, 250, 250, 250, 250, 250, 250, 266, 273, 275, 278, 330, 380, 390, 429, 442, 640, 655, 825, 877},
                 {370, 370, 370, 370, 370, 370, 370, 370, 370, 371, 372, 373, 375, 480, 500, 515, 545, 632, 800, 886, 1030, 1240},
                 {510, 510, 510, 510, 510, 510, 510, 510, 510, 589, 600, 605, 610, 750, 800, 820, 932, 1022, 1160, 1458, 1488, 2000},
                 {945, 945, 945, 945, 945, 945, 945, 945, 945, 1030, 1040, 1045, 1050, 1200, 1440, 1460, 1798, 2000, 2400, 2950, 3012, 4000},
diff --git a/src/main/webapp/views/product/fridgeMagnet.jsp b/src/main/webapp/views/product/fridgeMagnet.jsp
index 3cd87ca..c6d95f9 100644
--- a/src/main/webapp/views/product/fridgeMagnet.jsp
+++ b/src/main/webapp/views/product/fridgeMagnet.jsp
@@ -82,8 +82,14 @@
                     <input type="checkbox" name="craft" lay-filter="ui_craft" value="单面" title="单面" checked>
                 </div>
                 <div class="layui-input-block">
-                    工艺：
+                    雕刻工艺：
                     <input type="checkbox" name="craft" lay-filter="ui_craft" value="激光" title="激光" checked>
+                    <div class="layui-inline jiguang_select" style="width: 120px">
+                        <select name="craft" class="select">
+                            <option value="标准">标准</option>
+                            <option value="滴胶">滴胶</option>
+                        </select>
+                    </div>
                     <input type="checkbox" name="craft" lay-filter="ui_craft" value="CNC" title="CNC">
                 </div>
                 <div style="font-size: 14px; color: red">现货背卡尺寸：115*95mm</div>
@@ -333,6 +339,14 @@
                     $(".xhbeika").find("input").prop("disabled", false)
                 }
             }
+            if (data.value == "激光") {
+                $(".jiguang_select").hide();
+                $(".jiguang_select").find("select").prop("disabled", true)
+                if (data.elem.checked) {
+                    $(".jiguang_select").show();
+                    $(".jiguang_select").find("select").prop("disabled", false)
+                }
+            }
             form.render();
         })
 
@@ -406,6 +420,12 @@
                 });
                 return false;
             }
+            if (craft.includes("激光")) {
+                let jiguang_select = $(".jiguang_select select[name='craft'] option:selected").val();
+                if (jiguang_select != "标准") {
+                    craft.push(jiguang_select);
+                }
+            }
             $.ajax({
                 url: "${path}/getThanSum",
                 type: "GET",