|
@@ -2637,7 +2637,7 @@ public class ProductService {
|
|
|
|
|
|
|
|
product.setPrice(Math.ceil(product.getPrice() + (number - 1) * 0.5));
|
|
product.setPrice(Math.ceil(product.getPrice() + (number - 1) * 0.5));
|
|
|
|
|
|
|
|
- product.setWeight(df.format((width + 0.6) * (length + 0.6) * product.getCount() * number / 10000 * 0.5));
|
|
|
|
|
|
|
+ product.setWeight(df.format((width + 0.6) * (length + 0.6) * product.getCount() * number / 10000 * 0.5 + 0.5));
|
|
|
if (product.getPrice() < apprise) {
|
|
if (product.getPrice() < apprise) {
|
|
|
product.setPrice(apprise);
|
|
product.setPrice(apprise);
|
|
|
}
|
|
}
|
|
@@ -2708,7 +2708,7 @@ public class ProductService {
|
|
|
// double base = number < 6 && number > 1 ? 5 : 0;
|
|
// double base = number < 6 && number > 1 ? 5 : 0;
|
|
|
double apprise = 0;
|
|
double apprise = 0;
|
|
|
for (Product product : priceList) {
|
|
for (Product product : priceList) {
|
|
|
- product.setWeight(df.format((width + 0.6) * (length + 0.6) * product.getCount() * number / 10000 * 0.5));
|
|
|
|
|
|
|
+ product.setWeight(df.format((width + 0.6) * (length + 0.6) * product.getCount() * number / 10000 * 0.5 + 0.5));
|
|
|
if (apprise > product.getPrice()) {
|
|
if (apprise > product.getPrice()) {
|
|
|
product.setPrice(apprise);
|
|
product.setPrice(apprise);
|
|
|
}
|
|
}
|
|
@@ -5821,7 +5821,7 @@ public class ProductService {
|
|
|
}
|
|
}
|
|
|
Product pro = new Product();
|
|
Product pro = new Product();
|
|
|
pro.setCount(itemCount);
|
|
pro.setCount(itemCount);
|
|
|
- pro.setPrice(Math.ceil(prices[sizeIndex][i] * number));
|
|
|
|
|
|
|
+ pro.setPrice(Math.ceil(prices[sizeIndex][i] * number * 1.2));
|
|
|
pro.setNumber(number);
|
|
pro.setNumber(number);
|
|
|
priceList.add(pro);
|
|
priceList.add(pro);
|
|
|
}
|
|
}
|
|
@@ -7173,8 +7173,7 @@ public class ProductService {
|
|
|
return priceList;
|
|
return priceList;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private List<Product> getAreaCenterPrice(int[] count_list, int count, double area, int[][] prices,
|
|
|
|
|
- double[] areas, int number) {
|
|
|
|
|
|
|
+ private List<Product> getAreaCenterPrice(int[] count_list, int count, double area, int[][] prices, double[] areas, int number) {
|
|
|
List<Product> priceList = new ArrayList<>();
|
|
List<Product> priceList = new ArrayList<>();
|
|
|
for (int i = 0; i < count_list.length; i++) {
|
|
for (int i = 0; i < count_list.length; i++) {
|
|
|
int count_item = count_list[i];
|
|
int count_item = count_list[i];
|