From 4d3b80fcc24b697acdb27ad0ccebeb54b518a470 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Tue, 8 Apr 2025 16:08:05 +0800
Subject: [PATCH] edit

---
 .../lingtao/net/service/ProductService.java    | 17 +++++++++++++++++
 src/main/webapp/views/product/stickers.jsp     | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 04fa2dd..3fd9bce 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -532,13 +532,30 @@ public class ProductService {
                         }
                     }
                 }
+                double huaxianPrice = 0.0;
+                if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
+                    //宽度大于50  长度185-500
+                    if ("0".equals(dto.getKindValue())) {
+                        if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
+                            huaxianPrice = Math.max(0.13 * count, 50);
+                        }
+                    } else {
+                        huaxianPrice = Math.max(0.26 * count, 50);
+                    }
+                    for (Product product : stickersList) {
+                        product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
+                    }
+                }
                 if ("0".equals(dto.getKindValue()) && !"专版打印".contentEquals(dto.getStickerKind())) {
+
+
                     if (number > 1) {
                         for (Product product : stickersList) {
                             product.setPrice(product.getPrice() * number);
                         }
                     }
                 }
+
                 return priceList;
             case "1":
                 dto.setWidth(width);
diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp
index 41a6b24..dc15a0b 100644
--- a/src/main/webapp/views/product/stickers.jsp
+++ b/src/main/webapp/views/product/stickers.jsp
@@ -324,7 +324,11 @@
                     <input type="text" placeholder="尺寸" autocomplete="off" name="n_mq_size"
                            class="layui-input">
                 </span>
+                <span class="huaxian" style="display: none">
+                    <input type="checkbox" name="craftQieType" value="划线" title="划线">
+                </span>
             </div>
+
             <div class="layui-form-item tj">
                 <span style="float:left;margin-top:12px">烫金 ： </span>
                 <input type="checkbox" name="craftTang" lay-filter="switch" class="pvcHide tang" value="纯烫金" title="纯烫金"
@@ -486,6 +490,7 @@
             //$('input[class = pvcHide]').prop('checked', false);
 
             $(".ui_guagua").hide();
+            $(".huaxian").hide();
             $(".ui_guagua2").hide();
             $(".ui_guagua").prop('disabled', 'disabled');
             $(".ui_guagua2").prop('disabled', 'disabled');
@@ -901,12 +906,21 @@
 
             if (data.value == "0") {
                 $(".ui_guagua").show();
+
                 $(".ui_guagua").removeAttr('disabled');
             } else {
                 $(".ui_guagua").hide();
+
                 $(".ui_guagua").prop('disabled', 'disabled');
                 $(".ui_guaguasize").hide();
             }
+            if (data.value == 0 || data.value == 1) {
+                $(".huaxian").show();
+                $(".huaxian").removeAttr('disabled');
+            } else {
+                $(".huaxian").hide();
+                $(".huaxian").prop('disabled', 'disabled');
+            }
 
             $(".peishua").show();
             $(".peishua").find(":input").attr("disabled", false);
@@ -1690,6 +1704,9 @@
                                 craft_list.push(yinbai)
                             }
                         }
+                        if ($("input[name='craftQieType']:checked").val() != null) {
+                            craft_list.push($("input[name='craftQieType']:checked").val())
+                        }
                         var yaqian = ''
                         if (stickerKind == "插旗") {
                             if ($("input[name='craft']:checked").val() != null) {
@@ -1698,7 +1715,6 @@
                             yaqian = $("select[name='toothpick_size'] option:selected").val() + '厘米';
                             craft_list.push(yaqian)
                         }
-                        craft_list.push(...yinbai)
                         craft_list.push(...craftMo)
                         craft_list.push(...aotu)
                         craft_list.push(...tangjin)