|
|
@@ -1368,9 +1368,7 @@ public class ProductService {
|
|
|
} else if ("素芸".equals(kind)) {
|
|
|
int[] count_list = {100, 200, 400, 500, 1000, 2000, 3000, 5000, 10000};
|
|
|
double[] prices = {};
|
|
|
- if (craft_list.size() == 0 || craft_list.contains("异形模切")) {
|
|
|
- prices = new double[]{144, 272, 528, 660, 1280, 2560, 3840, 6400, 12800};
|
|
|
- }
|
|
|
+
|
|
|
if (craft_list.contains("圆角") && !craft_list.contains("击凸") && !craft_list.contains("压凹") && !craft_list.contains("单面烫金") && !craft_list.contains("双面烫金")) {
|
|
|
prices = new double[]{146, 276, 536, 670, 1300, 2600, 3900, 6500, 13000};
|
|
|
}
|
|
|
@@ -1386,7 +1384,9 @@ public class ProductService {
|
|
|
if (!craft_list.contains("圆角") && (craft_list.contains("单面烫金") || craft_list.contains("双面烫金"))) {
|
|
|
prices = new double[]{214, 362, 658, 810, 1530, 3060, 4590, 7650, 15300};
|
|
|
}
|
|
|
-
|
|
|
+ if (prices.length == 0 || craft_list.size() == 0 || craft_list.contains("异形模切")) {
|
|
|
+ prices = new double[]{144, 272, 528, 660, 1280, 2560, 3840, 6400, 12800};
|
|
|
+ }
|
|
|
priceList = new ArrayList<>();
|
|
|
Product dto2 = null;
|
|
|
|