From 8c067d81780b4824fd68a9e2950f4645a976f3d6 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Wed, 14 May 2025 11:21:17 +0800
Subject: [PATCH] edit

---
 src/main/java/lingtao/net/service/ProductService.java | 11 ++++++-----
 src/main/webapp/views/product/poster.jsp              |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index ee4c25e..04dcfdc 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -1366,7 +1366,7 @@ public class ProductService {
                         double desFee = 0;
                         if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                             if (dto.getP() == 1) {
-                                desFee = 0.6* (number - 1);
+                                desFee = 0.6 * (number - 1);
                             } else {
                                 if (number == 2) {
                                     desFee = 5.5;
@@ -3211,9 +3211,10 @@ public class ProductService {
                                     if (number > 3) {
                                         desFee = 11 + 11 + 11 * (number - 3);
                                     }
-                                    for (Product product : priceList) {
-                                        product.setPrice(Math.ceil(product.getPrice() + desFee));
-                                    }
+                                }
+
+                                for (Product product : priceList) {
+                                    product.setPrice(Math.ceil(product.getPrice() + desFee));
                                 }
                             } else {
                                 if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
@@ -4537,7 +4538,7 @@ public class ProductService {
             double desFee = 0;
             if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                 if (dto.getP() == 1) {
-                    desFee = 0.6* (number - 1);
+                    desFee = 0.6 * (number - 1);
                 } else {
                     if (number == 2) {
                         desFee = 3.5;
diff --git a/src/main/webapp/views/product/poster.jsp b/src/main/webapp/views/product/poster.jsp
index 9e992e7..2de72ba 100644
--- a/src/main/webapp/views/product/poster.jsp
+++ b/src/main/webapp/views/product/poster.jsp
@@ -537,7 +537,7 @@
 </body>
 <%@include file="/views/copyResult.jsp" %>
 <script>
-    setNumberOptions();
+    //setNumberOptions();
     function setNumberOptions() {
         let html = '';
         if (window.parent.system_isPdd) {
@@ -555,6 +555,7 @@
         }
         $("#desType").empty().append(html);
     }
+
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -572,7 +573,7 @@
             var number = $("#number").val();
             let number_kindValue = $("input[name='kindValue']:checked").val();
             let number_kind2Value = $("select[name='kind2Value'] option:selected").val();
-            if ( number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
+            if (window.parent.system_isPdd && number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -1662,7 +1663,7 @@
 
 
                         if (number > 1) {
-                            if ($("#ui_des").css("display") != "none") {
+                            if (window.parent.system_isPdd && $("#ui_des").css("display") != "none") {
                                 let numberType = $("#desType option:selected").text();
                                 span_result += "款数：" + number + "-" + numberType + "\n";
                             }