diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index babc242..f687edf 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -538,10 +538,10 @@ public class ProductService {
for (Product product : stickersList) {
if ("0".equals(dto.getKindValue())) {
if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
- huaxianPrice = Math.max(0.13 * product.getCount(), 50);
+ huaxianPrice = Math.max(0.1 * product.getCount(), 50);
}
} else {
- huaxianPrice = Math.max(0.26 * product.getCount(), 50);
+ huaxianPrice = Math.max(0.2 * product.getCount(), 50);
}
product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
}
@@ -1368,15 +1368,8 @@ public class ProductService {
if (dto.getP() == 1) {
desFee = 0.6 * (number - 1);
} else {
- if (number == 2) {
- desFee = 5.5;
- }
- if (number == 3) {
- desFee = 5.5 + 3.5;
- }
- if (number > 3) {
- desFee = 5.5 + 3.5 + 2.5 * (number - 3);
- }
+ desFee = 5.5 * (number - 1);
+
}
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + desFee));
@@ -2723,26 +2716,10 @@ public class ProductService {
designFee = 0.6 * (number - 1);
} else {
if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单")) {
- if (number == 2) {
- designFee = 5.5;
- }
- if (number == 3) {
- designFee = 5.5 + 3.5;
- }
- if (number > 3) {
- designFee = 5.5 + 3.5 + 2.5 * (number - 3);
- }
+ designFee = 5.5 * (number - 1);
}
if (dto.getProTypeLabel().equals("菜单") || dto.getProTypeLabel().equals("婚礼报纸")) {
- if (number == 2) {
- designFee = 17;
- }
- if (number == 3) {
- designFee = 17 + 17;
- }
- if (number > 3) {
- designFee = 17 + 17 + 12 * (number - 3);
- }
+ designFee = 17 * (number - 1);
}
}
@@ -2764,20 +2741,20 @@ public class ProductService {
} else if (dto.getP() == 5) {
desFee = 2;
} else {
- desFee = 18;
- int min = getNumAdd((length - 4) / 10, (width - 4) / 10);
- if (min == 1) {
- desFee = 7;
- }
- if (min == 2) {
- desFee = 10;
- }
- if (min == 3) {
- desFee = 14;
- }
- if (min == 4) {
- desFee = 18;
- }
+ desFee = 5.5;
+// int min = getNumAdd((length - 4) / 10, (width - 4) / 10);
+// if (min == 1) {
+// desFee = 7;
+// }
+// if (min == 2) {
+// desFee = 10;
+// }
+// if (min == 3) {
+// desFee = 14;
+// }
+// if (min == 4) {
+// desFee = 18;
+// }
}
for (Product product : priceList) {
@@ -3202,15 +3179,8 @@ public class ProductService {
if (dto.getP() == 1) {
desFee = 0.6 * (number - 1);
} else {
- if (number == 2) {
- desFee = 11;
- }
- if (number == 3) {
- desFee = 11 + 11;
- }
- if (number > 3) {
- desFee = 11 + 11 + 11 * (number - 3);
- }
+ desFee = 11 * (number - 1);
+
}
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + desFee));
@@ -4539,15 +4509,7 @@ public class ProductService {
if (dto.getP() == 1) {
desFee = 0.6 * (number - 1);
} else {
- if (number == 2) {
- desFee = 3.5;
- }
- if (number == 3) {
- desFee = 3.5 + 2.5;
- }
- if (number > 3) {
- desFee = 3.5 + 2.5 + 1.5 * (number - 3);
- }
+ desFee = 3.5 * (number - 1);
}
} else {
if (dto.getP() == 1) {
diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index fb9602c..96d2231 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -1997,7 +1997,9 @@ public class PriceUtils {
price = num * 25;
}
price += 10 * craft.size() * num;
-
+ if (dto.getN_mq_num() > 0) {
+ price += 10 * dto.getN_mq_num();
+ }
if (number > 1) {
price *= 1.3;
}
@@ -3251,14 +3253,14 @@ public class PriceUtils {
// if (width * length < 40 * 50) {
// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
// } else {
- dj = last_price;
- for (int i = 0; i < areas.length; i++) {
- if (area <= areas[i]) {
- dj = prices[i];
- break;
- }
+ dj = last_price;
+ for (int i = 0; i < areas.length; i++) {
+ if (area <= areas[i]) {
+ dj = prices[i];
+ break;
}
- price = Math.max(area * dj, min_price);
+ }
+ price = Math.max(area * dj, min_price);
// }
if (number > 1 && width * length >= 40 * 50) {
diff --git a/src/main/java/lingtao/net/util/ZsPrice.java b/src/main/java/lingtao/net/util/ZsPrice.java
index 0441ff7..364ec20 100644
--- a/src/main/java/lingtao/net/util/ZsPrice.java
+++ b/src/main/java/lingtao/net/util/ZsPrice.java
@@ -73,15 +73,16 @@ public class ZsPrice {
if (dto.getP() == 1) {
desFee = 0.6 * (number - 1);
} else {
- if (number == 2) {
- desFee = 5.75;
- }
- if (number == 3) {
- desFee = 5.75 + 3.75;
- }
- if (number > 3) {
- desFee = 5.75 + 3.75 + 2.75 * (number - 3);
- }
+ desFee = 8* (number - 1);
+// if (number == 2) {
+// desFee = 5.75;
+// }
+// if (number == 3) {
+// desFee = 5.75 + 3.75;
+// }
+// if (number > 3) {
+// desFee = 5.75 + 3.75 + 2.75 * (number - 3);
+// }
}
price += desFee;
} else {
diff --git a/src/main/webapp/views/product/disu.jsp b/src/main/webapp/views/product/disu.jsp
index 343d350..f2ceb3e 100644
--- a/src/main/webapp/views/product/disu.jsp
+++ b/src/main/webapp/views/product/disu.jsp
@@ -66,6 +66,15 @@
+
+
+ 个数 ：
+
+ 尺寸(CM/厘米) 输入格式: 长 * 宽
+
+
@@ -109,6 +118,16 @@
ins = carousel.render({});
+ form.on('checkbox(nmq)', (data) => {
+ if (data.elem.checked) {
+ $(".n_mq_input").css("display", "flex")
+ $(".n_mq_input input").prop("disabled", false);
+ } else {
+ $(".n_mq_input").hide()
+ $(".n_mq_input input").prop("disabled", true);
+ }
+ getProductImage(kValue)
+ })
function getProductImage(craft) {
$("#carousel").empty();
@@ -175,6 +194,34 @@
});
return false;
}
+ let n_moq_num = $('input[name="n_mq_num"]').val()
+ let n_moq_size = $("input[name='n_mq_size']").val()
+ let nmq = $("#nmq:checked").val();
+ if (nmq == '内部模切' && n_moq_num == 0) {
+ layer.msg('请输入内模切个数！', {offset: ['300px', '300px']}, function () {
+ });
+ return false;
+ }
+ if (n_moq_num > 0 && n_moq_size == "") {
+ layer.msg('请输入内模切尺寸！', {offset: ['300px', '300px']}, function () {
+ });
+ return false;
+ }
+ if (n_moq_num > 0 && n_moq_size.indexOf("*") == -1) {
+ layer.msg('请输入内模切正确尺寸！', {offset: ['300px', '300px']}, function () {
+ });
+ return false;
+ }
+ if (n_moq_num > 0) {
+ let main_size = size.split("*");
+ let moq_size = n_moq_size.split("*");
+
+ let max_number = Math.max(Math.floor(main_size[0] * 10 / (moq_size[0] * 10 + 3)) * Math.floor(main_size[1] * 10 / (moq_size[1] * 10 + 3)), Math.floor(main_size[1] * 10 / (moq_size[0] * 10 + 3)) * Math.floor(main_size[0] * 10 / (moq_size[1] * 10 + 3)))
+ if (max_number < n_moq_num) {
+ layer.msg('内模切尺寸超出范围！', {offset: ['300px', '300px']})
+ return false;
+ }
+ }
$.ajax({
url: "${path}/getThanSum",
type: "GET",