From 949fe99610d321b089923b0ab62e4d2e89bc73a1 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Tue, 29 Jul 2025 15:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=8F=96=E6=B6=88=E5=8D=95?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=B0=E5=88=B7=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=A1?=
 =?UTF-8?q?=E5=B9=85=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/util/PriceUtils.java |  7 +++++--
 src/main/webapp/views/product/coupon.jsp       |  3 +--
 src/main/webapp/views/product/waterGauge.jsp   | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index ef98959..2d5620b 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -3542,11 +3542,14 @@ public class PriceUtils {
             }
         }
         if (startIndex == endIndex && startIndex == 0) {
-            price = price_list[endIndex];
+            price = price_list[endIndex] * area;
         } else if (startIndex == endIndex) {
             price = (price_list[endIndex] * areas[endIndex] / areas[endIndex]) * area;
         } else {
-            price = (price_list[startIndex] * areas[startIndex] + price_list[endIndex] * areas[endIndex]) / (areas[startIndex] + areas[endIndex]) * area;
+            double end_price = price_list[endIndex]*areas[endIndex];
+            double start_price = price_list[startIndex]*areas[startIndex];
+            price = ((areas[endIndex] - area) / (areas[endIndex] - areas[startIndex])) * start_price + ((area - areas[startIndex]) / (areas[endIndex] - areas[startIndex])) * end_price;
+
         }
         price = islast ? last_price * area : price;
         return Math.ceil(price);
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index 86b113a..6c16618 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -532,8 +532,7 @@
                         工艺
                     </p>
                     <div class="layui-input-block">
-                        <input type="radio" name="craftShua" value="单面印刷" title="单面印刷" checked>
-                        <input type="radio" name="craftShua" value="双面印刷" title="双面印刷">
+                        <input type="radio" name="craftShua" value="双面印刷" title="双面印刷" checked>
                         <span class="zhijiaoCard">
                             <input type="checkbox" name="craft" lay-filter="switchCraft" value="直角" title="直角"
                                    lay-skin="primary" class="zhijiaoCraft">
diff --git a/src/main/webapp/views/product/waterGauge.jsp b/src/main/webapp/views/product/waterGauge.jsp
index e961654..f6a086d 100644
--- a/src/main/webapp/views/product/waterGauge.jsp
+++ b/src/main/webapp/views/product/waterGauge.jsp
@@ -74,8 +74,8 @@
                 </div>
                 <div class="layui-input-block" style="display:inline-block;">
                     裁切工艺：
-                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
-                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切">
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切">
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切" checked>
                 </div>
             </div>
             <hr>
@@ -206,16 +206,16 @@
                 });
                 return false;
             }
-            /*if ((size.split("*")[0] < 5 || size.split("*")[1] < 4.5) && (size.split("*")[0] < 4.5 || size.split("*")[1] < 5)) {
-                layer.msg("【PET透卡】尺寸不能小于5*4.5 cm", {offset: ['300px', '300px']}, function () {
+            if ((size.split("*")[0] < 4 || size.split("*")[1] < 4)) {
+                layer.msg("【水标】尺寸不能小于4*4 cm", {offset: ['300px', '300px']}, function () {
                 });
                 return false;
             }
-            if ((size.split("*")[0] > 58.7 || size.split("*")[1] > 42.4) && (size.split("*")[0] > 42.4 || size.split("*")[1] > 58.7)) {
-                layer.msg("【PET透卡】尺寸不能大于58.7*42.4 cm", {offset: ['300px', '300px']}, function () {
+            if ((size.split("*")[0] > 30 || size.split("*")[1] > 30)) {
+                layer.msg("【水标】尺寸不能大于30*30 cm", {offset: ['300px', '300px']}, function () {
                 });
                 return false;
-            }*/
+            }
             $("input:checkbox[name='craft']:checked").each(function (i) {
                 // 没有被禁用的工艺加到arr中
                 if (!$(this).is(':disabled')) {