From e04daac2ed5ce9aa8150fa01068e87b5dd701874 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Wed, 28 May 2025 15:18:42 +0800
Subject: [PATCH] edit

---
 .../lingtao/net/service/ProductService.java   | 30 ++++++++++---------
 src/main/webapp/views/product/handBag.jsp     |  6 ++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 23861ff..c5320ac 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -532,20 +532,7 @@ public class ProductService {
                         }
                     }
                 }
-                double huaxianPrice = 0.0;
-                if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
-                    //宽度大于50  长度185-500
-                    for (Product product : stickersList) {
-                        if ("0".equals(dto.getKindValue())) {
-                            if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
-                                huaxianPrice = Math.max(0.1 * product.getCount(), 50);
-                            }
-                        } else {
-                            huaxianPrice = Math.max(0.2 * product.getCount(), 50);
-                        }
-                        product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
-                    }
-                }
+
                 if ("0".equals(dto.getKindValue()) && !"专版打印".contentEquals(dto.getStickerKind())) {
 
 
@@ -556,6 +543,21 @@ public class ProductService {
                     }
                 }
 
+                double huaxianPrice = 0.0;
+                if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
+                    //宽度大于50  长度185-500
+                    for (Product product : stickersList) {
+                        if ("0".equals(dto.getKindValue())) {
+                            if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
+                                huaxianPrice = Math.max(0.1 * product.getCount() * number, 50);
+                            }
+                        } else {
+                            huaxianPrice = Math.max(0.12 * product.getCount() * number, 50);
+                        }
+                        product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
+                    }
+                }
+
                 return priceList;
             case "1":
                 dto.setWidth(width);
diff --git a/src/main/webapp/views/product/handBag.jsp b/src/main/webapp/views/product/handBag.jsp
index a2bd7e3..603edb8 100644
--- a/src/main/webapp/views/product/handBag.jsp
+++ b/src/main/webapp/views/product/handBag.jsp
@@ -325,14 +325,14 @@
                         <option value="37">小7号袋（宽210*高230*厚110）</option>
                         <option value="8">8号袋（宽210*高265*厚140）</option>
                         <option value="38">小8号袋（宽210*高210*厚140）</option>
-                        <option value="9">9号袋（宽250*高270*厚170）</option>`;
+                        <option value="9">9号袋（宽250*高250*厚170）</option>`;
                 $("#spec").append(html);
             }
             //饮品外卖
             if (data.value == 2) {
-                html = `<option value="5" selected>5号袋（宽110*高250*厚100）</option>
+                html = `<option value="5" selected>5号袋（宽130*高260*厚95）</option>
                         <option value="7">7号袋（宽210*高270*厚110）</option>
-                        <option value="9">9号袋（宽250*高270*厚170）</option>`;
+                        <option value="9">9号袋（宽250*高250*厚170）</option>`;
                 $("#spec").append(html);
             }
             //礼品购物