|
|
@@ -1566,6 +1566,9 @@ public class ProductService {
|
|
|
if (craft_list.contains("异形模切") && !(craft_list.contains("击凸") || craft_list.contains("压凹") || (craft_list.contains("单面烫金") || craft_list.contains("双面烫金") || craft_list.contains("烫镭射银")))) {
|
|
|
mqPrice = Math.ceil(15 * 0.01 * product.getCount() + 50);
|
|
|
}
|
|
|
+ if (craft_list.contains("打点线")) {
|
|
|
+ mqPrice += (35 + 0.2 * product.getCount()) * number;
|
|
|
+ }
|
|
|
product.setPrice(Math.floor(product.getPrice() * number * min + mqPrice));
|
|
|
product.setWeight(df.format(number * (length) / 100 * (width) / 100 * product.getCount() * 0.5));
|
|
|
}
|
|
|
@@ -1577,13 +1580,15 @@ public class ProductService {
|
|
|
if ((width <= 9 && length <= 5.4) || (length <= 9 && width <= 5.4)) {
|
|
|
|
|
|
} else if (width < 10 && length < 10) {
|
|
|
-
|
|
|
prices = new double[]{128, 256, 512, 640, 1280, 2560, 3840, 6400, 12800};
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
+ } else if ((width <= 10 && length <= 15) || (length <= 10 && width <= 15)) {
|
|
|
prices = new double[]{185, 370, 740, 925, 1850, 3700, 5550, 9250, 18500};
|
|
|
|
|
|
+ } else if (width < 15 && length < 15) {
|
|
|
+ prices = new double[]{300, 600, 1200, 1500, 3000, 6000, 9000, 15000, 30000};
|
|
|
+ // ((width <= 20 && length <= 15) || (length <= 20 && width <= 15))
|
|
|
+ } else {
|
|
|
+ prices = new double[]{450, 900, 1800, 2250, 4500, 9000, 13500, 22500, 45000};
|
|
|
}
|
|
|
|
|
|
priceList = new ArrayList<>();
|
|
|
@@ -1615,6 +1620,12 @@ public class ProductService {
|
|
|
if (craft_list.contains("异形模切")) {
|
|
|
craft_price += 60 + 0.1 * itemCount;
|
|
|
}
|
|
|
+ if (craft_list.contains("压痕")) {
|
|
|
+ craft_price += 35 + 0.2 * itemCount;
|
|
|
+ }
|
|
|
+ if (craft_list.contains("打点线")) {
|
|
|
+ craft_price += 35 + 0.2 * itemCount;
|
|
|
+ }
|
|
|
|
|
|
if (craft_list.contains("击凸") || craft_list.contains("压凹")) {
|
|
|
craft_price += 52 + 0.1 * itemCount;
|