zhuyiyi 10 месяцев назад
Родитель
Сommit
6a3a71e03a

+ 1 - 1
src/main/java/lingtao/net/service/ProductService.java

@@ -3012,7 +3012,7 @@ public class ProductService {
                     }
                     if (number > 1 && width * length * 10000 < 40 * 50) {
 
-                        if (("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
+                        if (("0".equals(kind) && "0".equals(kind2)) || ("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
                             double desFee = 0;
                             if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
                                 desFee = 3;

+ 5 - 1
src/main/java/lingtao/net/util/PosterPrice.java

@@ -119,7 +119,11 @@ public class PosterPrice {
         pro.setWeight(weight);
         pro.setCount(count);
         // 价格 = 面积 * 单价 + (款数-1) * 40
-        pro.setPrice(Math.ceil(price * number));
+        if (number > 1 && area >= 40 * 50 / 10000.0) {
+            pro.setPrice(Math.ceil(price * number));
+        } else {
+            pro.setPrice(Math.ceil(price));
+        }
         list.add(pro);
         return list;
     }

+ 1 - 1
src/main/webapp/views/product/poster.jsp

@@ -554,7 +554,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 == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
+            if (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();