From 9e4cd87a59b28881017d4e367c8a81d12d410422 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 26 Jan 2026 10:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87=E6=89=93?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=B9=E5=B7=BE=E5=B0=BA?=
 =?UTF-8?q?=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lingtao/net/service/ProductService.java | 8 +++++++-
 src/main/webapp/views/product/coupon.jsp              | 5 ++---
 src/main/webapp/views/product/handkerchiefPaper.jsp   | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 10d1b99..3ffd2bf 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -7341,8 +7341,14 @@ public class ProductService {
                 } else {
                     danjia = 0.1;
                 }
+                if (dto.getMaxian() == 3) {
+                    danjia = 0.1 * 2;
+                }
                 if (dto.getPcount() == 3) {
-                    danjia = 0.5;
+                    danjia = 0.8;
+                    if (dto.getMaxian() > 1) {
+                        danjia = danjia * dto.getMaxian();
+                    }
                 }
                 if ("上下编码".equals(dto.getBianma())) {
                     for (Product product : priceList) {
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index 369eafe..6ad55c6 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -521,14 +521,13 @@
                                         <span style="flex-shrink: 0">码数:</span>
                                         <select name="pcount" class="select" lay-filter="mashu">
                                             <option value="7" selected>7</option>
-                                            <option value="3">3</option>
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline edge damaHide" style="width:100px;display:none">
                                     <div style="display: flex;align-items: center">
                                         <span style="flex-shrink: 0">个数:</span>
-                                        <select name="dama" class="select dama" lay-filter="dama">
+                                        <select name="maxian" class="select dama" lay-filter="dama">
                                             <option value="1" selected>1</option>
                                             <option value="2">2</option>
                                             <option value="3">3</option>
@@ -3119,7 +3118,7 @@
 
                         if (kindValue2 != 10) {
                             if ($(this).val() === '打码') {
-                                arr.push($(this).val() + '(' + $(".dama").val() + '组' + $("select[name='pcount'] option:selected").val() + $("select[name='macolor'] option:selected").val() + ')');
+                                arr.push($(this).val() + '(' + $(".dama").val() + '个' + $("select[name='pcount'] option:selected").val() + '位' + $("select[name='macolor'] option:selected").val() + ')');
                             }
                             if (kind != 1 && ($(this).val() === '单面烫金' || $(this).val() === '双面烫金')) {
                                 $(".sizeTang").find(":input").attr("disabled", false);
diff --git a/src/main/webapp/views/product/handkerchiefPaper.jsp b/src/main/webapp/views/product/handkerchiefPaper.jsp
index ffab8bc..7813940 100644
--- a/src/main/webapp/views/product/handkerchiefPaper.jsp
+++ b/src/main/webapp/views/product/handkerchiefPaper.jsp
@@ -255,14 +255,14 @@
                 });
                 return false;
             }
-            if (size == "27*27") {
+            if (size == "23*23") {
                 if (count < 3) {
-                    layer.msg("23*23、27*27尺寸3箱起做", {offset: ['300px', '300px']}, function () {
+                    layer.msg("23*23尺寸3箱起做", {offset: ['300px', '300px']}, function () {
                     });
                     return false;
                 }
             }
-            if (size == "23*23") {
+            if (size == "27*27") {
                 if (count < 5) {
                     layer.msg("23*23尺寸5箱起做", {offset: ['300px', '300px']}, function () {
                     });