zyy/quote_price
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
zhuyiyi
2025-05-08 17:15:55 +08:00
parent f929755e73
commit 7650802c30
12 changed files with 1094 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/lingtao/net/service/ProductService.java
+143 -65
View File
@@ -399,7 +399,7 @@ public class ProductService {
// 选择少数量/打印不干胶按钮
if ("少数量".contentEquals(dto.getStickerKind()) || "专版打印".contentEquals(dto.getStickerKind())) {
stickersList = lessSticker(dto, kind, number, width, length, count, stickersList);
stickersList = lessSticker(dto, kind, number, width, length, count, stickersList, role);
if (stickersList.get(0) == null) {
return null;
@@ -1364,20 +1364,37 @@ public class ProductService {
//第二款开始的设计费按照式设计内容
if (number > 1) {
double desFee = 0;
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} else if (dto.getP() == 5) {
desFee = 2;
if (role.indexOf("1045") == -1) {
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);
}
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + desFee));
}
} else {
desFee = 5;
}
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} else if (dto.getP() == 5) {
desFee = 2;
} else {
desFee = 5;
}
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
}
}
}
return priceList;
} else {
@@ -2320,7 +2337,6 @@ public class ProductService {
} else {
priceList = new PriceUtils().UVStickerPrice(length, width, count, number, dto.getCraftMo(), dto.getCraft());
}
if (priceList.get(0).getCount() != count) {
priceList.get(0).setCount(count);
}
@@ -2655,37 +2671,69 @@ public class ProductService {
}
}
}
if (role.indexOf("1045") == -1) {
if (number > 1) {
double designFee = 0;
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);
}
}
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);
}
}
//第二款开始的设计费按照式设计内容
if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单") && number > 1) {
double desFee = 0;
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} 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;
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + designFee));
}
}
} else {
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
//第二款开始的设计费按照式设计内容
if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单") && number > 1) {
double desFee = 0;
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} 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;
}
}
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
}
}
}
@@ -3101,19 +3149,35 @@ public class ProductService {
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;
} else if (dto.getP() == 4) {
desFee = 5;
} else if (dto.getP() == 5) {
desFee = 6;
if (role.indexOf("1045") == -1) {
if (number == 2) {
desFee = 11;
}
if (number == 3) {
desFee = 11 + 11;
}
if (number > 3) {
desFee = 11 + 11 + 11 * (number - 3);
}
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() + desFee));
}
} else {
desFee = 11;
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
desFee = 3;
} else if (dto.getP() == 4) {
desFee = 5;
} else if (dto.getP() == 5) {
desFee = 6;
} else {
desFee = 11;
}
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
}
}
for (Product product : priceList) {
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
}
}
}
@@ -3319,7 +3383,7 @@ public class ProductService {
* if (priceList.size() >= 4) { priceList = priceList.subList(0, 4); }
*/
String[] ztCraft = {"背胶"};
priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, ztCraft, dto);
priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, ztCraft, dto, role);
for (Product product : priceList) {
if (dto.getKindValue().equals("0") || dto.getKindValue().equals("10")) {
wei = 0.38;
@@ -3792,7 +3856,7 @@ public class ProductService {
product.setPrice(Math.floor(product.getPrice() * number));
}
} else {// 打印的价格和pvc不干胶打印价格一样--23.8.17更新后取消这个
priceList = lessSticker(dto, proType, number, width, length, count, priceList);
priceList = lessSticker(dto, proType, number, width, length, count, priceList, role);
return priceList;
}
// 重量
@@ -3932,7 +3996,7 @@ public class ProductService {
return priceList;
case "数码PVC":
// 价格按照大纸裁
priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, dto.getCraft(), dto);
priceList = ZsPrice.getSmPrice(count, length, width, priceList, number, dto.getCraft(), dto, role);
for (Product product : priceList) {
if (dto.getKindValue().equals("1") || dto.getKindValue().equals("2") || dto.getKindValue().equals("3")) {
wei = 0.38;
@@ -4348,7 +4412,7 @@ public class ProductService {
}
private List<Product> lessSticker(Product dto, String kind, Integer number, Double width, Double length,
int count, List<Product> stickersList) {
int count, List<Product> stickersList, String role) {
double price = 0.0;
// 一张大纸收费
double addPrice = 0.0;
@@ -4418,22 +4482,36 @@ public class ProductService {
}
if (number > 1) {
double desFee = 0;
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} else if (dto.getP() == 5) {
desFee = 2;
if (role.indexOf("1045") == -1) {
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);
}
} else {
desFee = 5;
if (dto.getP() == 1) {
desFee = 0.6;
} else if (dto.getP() == 2 || dto.getP() == 3) {
desFee = 0.8;
} else if (dto.getP() == 4) {
desFee = 1.2;
} else if (dto.getP() == 5) {
desFee = 2;
} else {
desFee = 5;
}
desFee = desFee * number;
}
for (Product product : stickersList) {
if ("0".equals(kind) && "纯烫金".equals(dto.getCraftTang())) {
product.setPrice(product.getPrice() * number);
} else {
product.setPrice(Math.floor(product.getPrice() + desFee * number));
product.setPrice(Math.ceil(product.getPrice() + desFee));
}
}
src/main/java/lingtao/net/util/ZsPrice.java
+24 -9
View File
@@ -36,7 +36,7 @@ public class ZsPrice {
return list;
}
public static List<Product> getSmPrice(int count, Double length, Double width, List<Product> list, Integer number, String[] craft, Product dto) {
public static List<Product> getSmPrice(int count, Double length, Double width, List<Product> list, Integer number, String[] craft, Product dto, String role) {
double price = 60;
double l = 438.0;
double w = 304.0;
@@ -68,18 +68,33 @@ public class ZsPrice {
if (number > 1) {
double desFee = 0;
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
desFee = 3;
} else if (dto.getP() == 4) {
desFee = 5;
} else if (dto.getP() == 5) {
desFee = 6;
if (role.indexOf("1045") == -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 {
desFee = 8;
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
desFee = 3;
} else if (dto.getP() == 4) {
desFee = 5;
} else if (dto.getP() == 5) {
desFee = 6;
} else {
desFee = 8;
}
price += desFee * (number - 1);
}
price += desFee * (number - 1);
}
Product pro = new Product();
pro.setPrice(Math.ceil(price));
pro.setCount(count);
src/main/webapp/views/main.jsp
+888 -847
View File
File diff suppressed because it is too large Load Diff
src/main/webapp/views/product/chaqi.jsp
+8 -8
View File
@@ -342,12 +342,12 @@
lay-skin="primary">
<!--<input type="checkbox" name="aotu" lay-filter="switch" value="印2色+凹凸" title="印2色+凹凸" class="aotu" lay-skin="primary">-->
</div>
<hr class="layui-bg-orange">
</form>
<form class="layui-form cq" style="display: none;">
<p>
工艺
</p>
<%-- <p>--%>
<%-- 工艺--%>
<%-- </p>--%>
<div class="layui-form-item yq">
<span class="ui_craftShua">
|&nbsp;&nbsp;&nbsp;&nbsp;
@@ -454,7 +454,7 @@
});
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
if ($("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
if (window.parent.system_isPdd && $("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -559,7 +559,7 @@
$(".ui_cq").find(":input").attr("disabled", true);
$(".normal").hide();
$('.normal input').prop("checked", false);
if ($("#number").val() > 1) {
if (window.parent.system_isPdd && $("#number").val() > 1) {
$("#ui_des").show();
}
$(".ui_sm").hide();
@@ -1545,7 +1545,7 @@
if (kindValue == "拉丝金" || kindValue == "拉丝银" || kindValue == "PP合成纸") {
craftMo = ""
}
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
});
@@ -1705,7 +1705,7 @@
span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n';
if (number > 1) {
if (stickerKind == "专版打印") {
if (window.parent.system_isPdd && stickerKind == "专版打印") {
let numberType = $("#desType option:selected").text();
span_result += "款数：" + number + "-" + numberType + "\n";
}
src/main/webapp/views/product/coupon.jsp
+9 -7
View File
@@ -980,7 +980,7 @@
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
var kind = $("input[name='kind']:checked").val();
if ($("input[name='couponKind']:checked").val() == "少数量" && number > 1 && kind != "婚礼报纸" && kind != "菜单") {
if (window.parent.system_isPdd && $("input[name='couponKind']:checked").val() == "少数量" && number > 1 && kind != "婚礼报纸" && kind != "菜单") {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -1176,7 +1176,9 @@
if (kind != "婚礼报纸" || kind != "菜单") {
$("#ui_des").hide();
} else {
$("#ui_des").show();
if (window.parent.system_isPdd) {
$("#ui_des").show();
}
}
form.render();
} else {
@@ -1764,7 +1766,7 @@
$(".ui_tzmp").find(":input").attr("disabled", true);
$(".kindValue6").hide();
$(".kindValue6").find(":input").attr("disabled", true);
if ($("#number").val() > 1) {
if (window.parent.system_isPdd && $("#number").val() > 1) {
$("#ui_des").show();
}
$("#kindValueForm").show();
@@ -1846,7 +1848,7 @@
$(".lessCountHideCraft").find(":input").attr("disabled", true);
$(".ui_yh").hide();
$(".ui_tz_yh").show();
if ($("#number").val() > 1) {
if (window.parent.system_isPdd && $("#number").val() > 1) {
$("#ui_des").show();
}
@@ -2941,7 +2943,7 @@
return false;
}
} else if (kind == 3 || kind == 4 || kind == 5 || kind == 7) {
if (min >= 6 && !(kindValue2 == 10 && kind == 3 )) {
if (min >= 6 && !(kindValue2 == 10 && kind == 3)) {
if ($('input[class = mq]:checked').val() == "模切") {
layer.msg("超过6位异形模切卡片请以[ 腰封 - 异形模切]报价！", {offset: ['300px', '300px']}, function () {
});
@@ -3031,7 +3033,7 @@
return false;
}
}
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
if (kind != "婚礼报纸" && kind != "菜单") {
layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
@@ -3297,7 +3299,7 @@
}
if (number > 1) {
if (couponKind == "少数量") {
if (window.parent.system_isPdd && couponKind == "少数量") {
let numberType = $("#desType option:selected").text();
span_result += "款数：" + number + "-" + numberType + "\n";
}
src/main/webapp/views/product/deskSticker.jsp
+1 -1
View File
@@ -192,7 +192,7 @@
});
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
$("#ui_des").show();
} else {
$("#ui_des").hide();
src/main/webapp/views/product/lsz.jsp
+2 -2
View File
@@ -171,7 +171,7 @@
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
if (number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
if (window.parent.system_isPdd && number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -262,7 +262,7 @@
});
return false;
}
if (number > 1 && stickerKind == "专版打印") {
if (window.parent.system_isPdd && number > 1 && stickerKind == "专版打印") {
if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
});
src/main/webapp/views/product/poster.jsp
+2 -2
View File
@@ -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 == 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();
@@ -1644,7 +1644,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";
}
src/main/webapp/views/product/pvcfigure.jsp
+6 -1
View File
@@ -223,7 +223,7 @@
})
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -257,6 +257,11 @@
});
return false;
}
if ((length < 2 || width < 2)) {
layer.msg("尺寸不能小于2*2 cm", {offset: ['300px', '300px']}, function () {
});
return false;
}
}
var kindValueData = {
1: "0.38mm亮光",
src/main/webapp/views/product/specialCard2.jsp
+5 -3
View File
@@ -225,7 +225,7 @@
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
var kind = $("input[name='kind']:checked").val();
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -609,8 +609,10 @@
var span_result = '特种纸名片（不配绳子）' + "-不覆膜-" + kindValueSelect + "-" + size
+ "厘米-(同款内容) \n" + "工艺 :" + arr + "\n"
if (number > 1) {
let numberType = $("#desType option:selected").text();
span_result += "款数：" + number + "-" +numberType+ "\n";
if (window.parent.system_isPdd) {
let numberType = $("#desType option:selected").text();
span_result += "款数：" + number + "-" + numberType + "\n";
}
for (let i = 0; i < data.length; i++) {
span_result += number + '款 各' + data[i].count + "张，共" + data[i].price + "元" + '\n'
data[i].number = number;
src/main/webapp/views/product/stickers.jsp
+5 -5
View File
@@ -348,7 +348,6 @@
lay-skin="primary">
<!--<input type="checkbox" name="aotu" lay-filter="switch" value="印2色+凹凸" title="印2色+凹凸" class="aotu" lay-skin="primary">-->
</div>
<hr class="layui-bg-orange">
</form>
<form class="layui-form cq" style="display: none;">
<p>
@@ -391,6 +390,7 @@
<input type="radio" name="craftshua" value="模切(切穿排废)" title="模切(切穿排废)" checked>
</div>
</form>
<form class="layui-form">
<div class="layui-form-item">
<button class="layui-btn" lay-submit="" lay-filter="acount_btn" id="queryCondBtn">计算</button>
@@ -460,7 +460,7 @@
});
$("#number").on("input", function (e) {
var number = e.delegateTarget.value;
if ($("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
if (window.parent.system_isPdd && $("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
$("#ui_des").show();
} else {
$("#ui_des").hide();
@@ -566,7 +566,7 @@
$(".ui_cq").find(":input").attr("disabled", true);
$(".normal").hide();
$('.normal input').prop("checked", false);
if ($("#number").val() > 1) {
if (window.parent.system_isPdd && $("#number").val() > 1) {
$("#ui_des").show();
}
$(".ui_sm").hide();
@@ -1567,7 +1567,7 @@
if (kindValue == "拉丝金" || kindValue == "拉丝银" || kindValue == "PP合成纸") {
craftMo = ""
}
if (number > 1) {
if (window.parent.system_isPdd && number > 1) {
if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
});
@@ -1733,7 +1733,7 @@
span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n';
if (number > 1) {
if (stickerKind == "专版打印") {
if (window.parent.system_isPdd && stickerKind == "专版打印") {
let numberType = $("#desType option:selected").text();
span_result += "款数：" + number + "-" + numberType + "\n";
}
src/main/webapp/views/readme.jsp
+1
View File
@@ -116,6 +116,7 @@
{{# }); }}
</script>
<script>
console.log(window.parent.system_isPdd)
/* function videoClick(){
//iframe层
layer.open({