From ba14bb9f0da272b00ddaba2358244c8321f4793f Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 8 Jan 2026 14:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E5=B1=9E=E5=BE=BD?=
 =?UTF-8?q?=E7=AB=A0=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 5160732..184784d 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -4829,7 +4829,7 @@ public class ProductService {
         priceList = getAreaCenterPrice(counts, count, width * length, prices, areas, number);
 
         for (Product product : priceList) {
-            if("2".equals(dto.getKind())){
+            if ("2".equals(dto.getKind())) {
                 product.setPrice(Math.ceil(product.getPrice() * 1.1));
             }
             product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.3));
@@ -5564,6 +5564,10 @@ public class ProductService {
             if (width <= 4 && length <= 4) {
                 base_price = 4;
             }
+            if (width > 6 || length > 6) {
+                base_price = 5.5;
+                mo_price = 300;
+            }
             if (base_price < 4.5) {
                 if (count > 100 && count <= 500) {
                     base_price = 3.5;
diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp
index 33bc67c..cee6925 100644
--- a/src/main/webapp/views/product/stickers.jsp
+++ b/src/main/webapp/views/product/stickers.jsp
@@ -1560,6 +1560,13 @@
                     });
                     return false;
                 }
+                if(kindValue == "15"){
+                    if ((size.split("*")[0] > 42 || size.split("*")[1] > 28.5) && (size.split("*")[0] > 28.5 || size.split("*")[1] > 42)) {
+                        layer.msg("草香纸不干胶-彩色印刷尺寸不能超过42*28.5 cm", {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                }
                 if (kindValue == "16" && TJValue == "彩色印刷") {
                     if ((size.split("*")[0] > 42 || size.split("*")[1] > 28) && (size.split("*")[0] > 28 || size.split("*")[1] > 42)) {
                         layer.msg("草香纸不干胶-彩色印刷尺寸不能超过42*28 cm", {offset: ['300px', '300px']}, function () {