This commit is contained in:
2025-05-21 17:29:11 +08:00
parent bb97693578
commit dfc3947e9b
4 changed files with 90 additions and 78 deletions
@@ -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) {